1 files changed, 18 insertions, 8 deletions
diff --git a/network/wire/wire.SlackBuild b/network/wire/wire.SlackBuild
index 7c80ab7427776..d0229deba701d 100644
--- a/network/wire/wire.SlackBuild
+++ b/network/wire/wire.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=wire
-VERSION=${VERSION:-2.11.2661}
+VERSION=${VERSION:-2.11.2665}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -56,12 +56,17 @@ fi
 
 set -e
 
+DEBARCH="ia32"
+if [ "$ARCH" = "x86_64" ]; then
+    DEBARCH="amd64"
+fi
+
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
 mkdir -p $PRGNAM-$VERSION && cd $PRGNAM-$VERSION
-ar p $CWD/$PRGNAM\_$VERSION\_amd64.deb data.tar.xz | tar xJv
+ar p $CWD/$PRGNAM-$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 \
@@ -70,8 +75,8 @@ find -L . \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 # Install data
-mkdir -p $PKG/opt/$PRGNAM
-cp -rf * $PKG/opt/$PRGNAM
+mkdir -p $PKG/opt/${PRGNAM^}
+cp -rf opt/${PRGNAM^}/* $PKG/opt/${PRGNAM^}
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
@@ -80,23 +85,28 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr
 mkdir -p $PKG/usr/bin
 (
  cd $PKG/usr/bin
- ln -sf /opt/$PRGNAM/usr/bin/$PRGNAM $PRGNAM
+ ln -sf /opt/${PRGNAM^}/${PRGNAM^} $PRGNAM
 )
 
 # Install .desktop file
 mkdir -p $PKG/usr/share/applications
-cat usr/share/applications/$PRGNAM.desktop > $PKG/usr/share/applications/$PRGNAM.desktop
+cat usr/share/applications/${PRGNAM^}.desktop > \
+    $PKG/usr/share/applications/${PRGNAM^}.desktop
 
 # Install .desktop icon
 mkdir -p $PKG/usr/share/pixmaps
-install -D -m0644 usr/share/pixmaps/$PRGNAM.png $PKG/usr/share/pixmaps/$PRGNAM.png
+install -D -m0644 usr/share/icons/hicolor/32x32/apps/$PRGNAM.png \
+    $PKG/usr/share/pixmaps/$PRGNAM.png
 
+gunzip usr/share/doc/$PRGNAM/changelog.gz
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a usr/share/doc/wire/copyright usr/share/wire/LICENSE $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a usr/share/doc/$PRGNAM/changelog opt/${PRGNAM^}/LICENSE \
+    $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}