1 files changed, 33 insertions, 8 deletions
diff --git a/network/slack/slack.SlackBuild b/network/slack/slack.SlackBuild
index 1948db0b41191..447434f262b71 100644
--- a/network/slack/slack.SlackBuild
+++ b/network/slack/slack.SlackBuild
@@ -26,17 +26,46 @@
 
 
 PRGNAM=slack
-VERSION=${VERSION:-2.6.3}
+VERSION=${VERSION:-2.8.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-ARCH=x86_64
+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
+
 
 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
@@ -45,7 +74,7 @@ cd $TMP
 rm -rf $PRGNAM-$VERSION
 mkdir -p $PRGNAM-$VERSION
 cd $PRGNAM-$VERSION
-ar p $CWD/${PRGNAM}-desktop-${VERSION}-amd64.deb data.tar.xz | tar xJv
+ar p $CWD/${PRGNAM}-desktop-${VERSION}-${DEBARCH}.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 \
@@ -60,12 +89,8 @@ 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/lib64/slack/LICENSE $PKG/usr/doc/$PRGNAM-$VERSION/
+cp -a $PKG/usr/lib/slack/LICENSE $PKG/usr/doc/$PRGNAM-$VERSION/
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install