aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--network/skype4pidgin/skype4pidgin.SlackBuild24
-rw-r--r--network/skype4pidgin/skype4pidgin.info2
2 files changed, 7 insertions, 19 deletions
diff --git a/network/skype4pidgin/skype4pidgin.SlackBuild b/network/skype4pidgin/skype4pidgin.SlackBuild
index cafa36eb03c35..a9d9c83e629d0 100644
--- a/network/skype4pidgin/skype4pidgin.SlackBuild
+++ b/network/skype4pidgin/skype4pidgin.SlackBuild
@@ -24,31 +24,20 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
# Modified by Willy Sudiarto Raharjo <willysr@slackware-id.org>
+# Modified by Robby Workman for ARCH=i486 hardcoded
PRGNAM=skype4pidgin
-VERSION=r639
+VERSION=${VERSION:-r639}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
-if [ -z "$ARCH" ]; then
- case "$( uname -m )" in
- i?86) ARCH=i486 ;;
- arm*) ARCH=arm ;;
- *) ARCH=$( uname -m ) ;;
- esac
-fi
+ARCH=i486
CWD=$(pwd)
TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
-if [ "$ARCH" = "x86_64" ]; then
- LIBDIRSUFFIX="64"
-else
- LIBDIRSUFFIX=""
-fi
-
set -e
rm -rf $PKG
@@ -65,11 +54,10 @@ find . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \;
-mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/purple-2/
-
-mv $CWD/libskype.so $PKG/usr/lib${LIBDIRSUFFIX}/purple-2/
-mv $CWD/libskype_dbus.so $PKG/usr/lib${LIBDIRSUFFIX}/purple-2/
+mkdir -p $PKG/usr/lib/purple-2/
+mv $CWD/libskype.so $PKG/usr/lib/purple-2/
+mv $CWD/libskype_dbus.so $PKG/usr/lib/purple-2/
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
diff --git a/network/skype4pidgin/skype4pidgin.info b/network/skype4pidgin/skype4pidgin.info
index 45851c3815888..7c34de4ea063f 100644
--- a/network/skype4pidgin/skype4pidgin.info
+++ b/network/skype4pidgin/skype4pidgin.info
@@ -5,7 +5,7 @@ DOWNLOAD="https://skype4pidgin.googlecode.com/svn/downloads/libskype.so \
https://skype4pidgin.googlecode.com/svn/downloads/libskype_dbus.so"
MD5SUM="b3755b1c801da40298fd68fd5c5ac246 \
361bf21c6fa1425a4638344978d795f8"
-DOWNLOAD_x86_64=""
+DOWNLOAD_x86_64="UNSUPPORTED"
MD5SUM_x86_64=""
REQUIRES="skype"
MAINTAINER="Roberto Metere"