3 files changed, 20 insertions, 22 deletions
diff --git a/python/pybluez/pybluez.SlackBuild b/python/pybluez/pybluez.SlackBuild
index 21761fa498..44a8f754b4 100644
--- a/python/pybluez/pybluez.SlackBuild
+++ b/python/pybluez/pybluez.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for pybluez
 
-# Copyright 2009-2010 Heinz Wiesinger, Amsterdam, The Netherlands
+# Copyright 2009-2017 Heinz Wiesinger, Amsterdam, The Netherlands
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,15 +23,13 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=pybluez
-VERSION=0.18
+VERSION=${VERSION:-0.22}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-SRCNAM=PyBluez
-
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -42,8 +40,8 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -58,23 +56,23 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $SRCNAM-$VERSION
-tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
-cd $SRCNAM-$VERSION
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 python setup.py install --root=$PKG
 
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+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
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a CHANGELOG COPYING PKG-INFO README $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a CHANGELOG COPYING README README.rst $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/python/pybluez/pybluez.info b/python/pybluez/pybluez.info
index d55efa9f7c..5213a79c43 100644
--- a/python/pybluez/pybluez.info
+++ b/python/pybluez/pybluez.info
@@ -1,10 +1,10 @@
 PRGNAM="pybluez"
-VERSION="0.18"
-HOMEPAGE="http://code.google.com/p/pybluez/"
-DOWNLOAD="https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/pybluez/PyBluez-0.18.tar.gz"
-MD5SUM="be8c8ce615c3189fda1aaf3d568314b2"
+VERSION="0.22"
+HOMEPAGE="http://karulis.github.io/pybluez/"
+DOWNLOAD="https://github.com/karulis/pybluez/archive/0.22/pybluez-0.22.tar.gz"
+MD5SUM="06f71ca6d4216ace671d5e588ec85887"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES=""
+REQUIRES="python-gattlib"
 MAINTAINER="Heinz Wiesinger"
 EMAIL="pprkut@liwjatan.at"
diff --git a/python/pybluez/slack-desc b/python/pybluez/slack-desc
index df5cc7e06e..757ddd297f 100644
--- a/python/pybluez/slack-desc
+++ b/python/pybluez/slack-desc
@@ -11,7 +11,7 @@ pybluez:
 pybluez: Python extension module allowing access to system Bluetooth
 pybluez: resources.
 pybluez:
-pybluez: Homepage: http://code.google.com/p/pybluez/
+pybluez: Homepage: http://karulis.github.io/pybluez/
 pybluez:
 pybluez:
 pybluez: