3 files changed, 17 insertions, 15 deletions
diff --git a/python/pycryptopp/pycryptopp.SlackBuild b/python/pycryptopp/pycryptopp.SlackBuild
index d0f37af90e842..32eb4d75b0eb4 100644
--- a/python/pycryptopp/pycryptopp.SlackBuild
+++ b/python/pycryptopp/pycryptopp.SlackBuild
@@ -27,8 +27,8 @@
 # Now maintained by Markus Reichelt <slackbuilds@mareichelt.de>, 0xCCEEF115
 
 PRGNAM=pycryptopp
-VERSION=${VERSION:-0.5.29}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-0.6.0.1206569328141510525648634803928199668821045408958}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -44,14 +44,18 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-DOCS="COPYING.GPL COPYING.TGPPL.html README.txt"
-
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -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
@@ -69,20 +73,18 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-python setup.py build || exit 1
-python setup.py install --root=$PKG || exit 1
+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 $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/slack-desc > $PKG/usr/doc/$PRGNAM-$VERSION/slack-desc
+cp -a \
+  ChangeLog COPYING.* *.rst \
+  $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 #cleanup
-rm $PKG/usr/embeddedcryptopp/extraversion.h
-rmdir $PKG/usr/embeddedcryptopp
 rm $PKG/usr/share/doc/pycryptopp/*
 cd $PKG/usr
 rmdir -p share/doc/pycryptopp
diff --git a/python/pycryptopp/pycryptopp.info b/python/pycryptopp/pycryptopp.info
index 7e9c7a1ee6696..c64a37bac5af4 100644
--- a/python/pycryptopp/pycryptopp.info
+++ b/python/pycryptopp/pycryptopp.info
@@ -1,8 +1,8 @@
 PRGNAM="pycryptopp"
-VERSION="0.5.29"
+VERSION="0.6.0.1206569328141510525648634803928199668821045408958"
 HOMEPAGE="http://pypi.python.org/pypi/pycryptopp"
-DOWNLOAD="http://pypi.python.org/packages/source/p/pycryptopp/pycryptopp-0.5.29.tar.gz"
-MD5SUM="c5b86ad1ebda0e7999bb50d72e412c6a"
+DOWNLOAD="http://pypi.python.org/packages/source/p/pycryptopp/pycryptopp-0.6.0.1206569328141510525648634803928199668821045408958.tar.gz"
+MD5SUM="ce38fbe03705d27da408c78b56eb1947"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="Markus Reichelt"
diff --git a/python/pycryptopp/slack-desc b/python/pycryptopp/slack-desc
index 9d50b393b8113..1625f52f88974 100644
--- a/python/pycryptopp/slack-desc
+++ b/python/pycryptopp/slack-desc
@@ -5,7 +5,7 @@
 # make exactly 11 lines for the formatting to be correct.  It's also
 # customary to leave one space after the ':'.
 
-          |-----handy-ruler----------------------------------------------------|
+          |-----handy-ruler------------------------------------------------------|
 pycryptopp: pycryptopp (Python wrappers for Crypto++)
 pycryptopp:
 pycryptopp: pycryptopp is a set of Python wrappers for a few of the best crypto