1 files changed, 7 insertions, 36 deletions
diff --git a/network/slack/slack.SlackBuild b/network/slack/slack.SlackBuild
index 2e92faf87d..5efd777db7 100644
--- a/network/slack/slack.SlackBuild
+++ b/network/slack/slack.SlackBuild
@@ -30,42 +30,13 @@ VERSION=${VERSION:-2.6.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) export ARCH=i586 ;;
-    arm*) export ARCH=arm ;;
-       *) export ARCH=$( uname -m ) ;;
-  esac
-fi
-
-DEBARCH=${DEBARCH:-$(uname -m)}
-
-case "$DEBARCH" in
-  i?86) DEBARCH="i386" ;;
-  x86_64) DEBARCH="amd64" ;;
-  *) echo "Package for $(uname -m) architecture is not available." ; exit 1 ;;
-esac
-
+ARCH=x86_64
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i586" ]; then
-  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-fi
-
 set -e
 
 rm -rf $PKG
@@ -74,7 +45,7 @@ cd $TMP
 rm -rf $PRGNAM-$VERSION
 mkdir -p $PRGNAM-$VERSION
 cd $PRGNAM-$VERSION
-ar p $CWD/${PRGNAM}-desktop-${VERSION}-${DEBARCH}.deb data.tar.xz | tar xJv
+ar p $CWD/${PRGNAM}-desktop-${VERSION}-amd64.deb data.tar.xz | tar xJv
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -89,14 +60,14 @@ rm -rf $PKG/etc/
 ## nor lintian stuff and another copy of LICENSE
 rm -rf $PKG/usr/share/{doc,lintian}
 
+# Fix path
+mv $PKG/usr/lib $PKG/usr/lib64
+( cd $PKG/usr/bin ; rm -f slack ; ln -s ../lib64/slack/slack )
+
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/
-cp -a $PKG/usr/lib/slack/LICENSE $PKG/usr/doc/$PRGNAM-$VERSION/
+cp -a $PKG/usr/lib64/slack/LICENSE $PKG/usr/doc/$PRGNAM-$VERSION/
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
-if [ "$ARCH" = "x86_64" ]; then
-   mv $PKG/usr/lib $PKG/usr/lib64
-fi
-
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh