2 files changed, 15 insertions, 12 deletions
diff --git a/python/python-twisted/python-twisted.SlackBuild b/python/python-twisted/python-twisted.SlackBuild
index 5304f5cfee..3a40979290 100644
--- a/python/python-twisted/python-twisted.SlackBuild
+++ b/python/python-twisted/python-twisted.SlackBuild
@@ -3,6 +3,7 @@
 # Slackware build script for python-twisted.
 
 # Copyright 2009-2011 Marco Bonetti <sid77@slackware.it>
+# Copyright 2012 Markus Reichelt, Aachen, DE
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -27,7 +28,7 @@
 
 PRGNAM=python-twisted
 SRCNAM=Twisted
-VERSION=${VERSION:-12.0.0}
+VERSION=${VERSION:-12.1.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -44,14 +45,18 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-DOCS="LICENSE NEWS README"
-
 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
@@ -62,24 +67,22 @@ cd $TMP
 rm -rf $SRCNAM-$VERSION
 tar xvf $CWD/$SRCNAM-$VERSION.tar.bz2
 cd $SRCNAM-$VERSION
-
 chown -R root:root .
-
 find . \
  \( -perm 777 -o -perm 775 -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 {} \;
 
-python setup.py build
-
 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
+cp -a \
+  LICENSE NEWS README \
+  $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/python/python-twisted/python-twisted.info b/python/python-twisted/python-twisted.info
index 0dc4a88af4..9a1c808b1c 100644
--- a/python/python-twisted/python-twisted.info
+++ b/python/python-twisted/python-twisted.info
@@ -1,8 +1,8 @@
 PRGNAM="python-twisted"
-VERSION="12.0.0"
+VERSION="12.1.0"
 HOMEPAGE="http://twistedmatrix.com/"
-DOWNLOAD="http://pypi.python.org/packages/source/T/Twisted/Twisted-12.0.0.tar.bz2"
-MD5SUM="cf49a8676c21c50faf1b42b528049471"
+DOWNLOAD="http://pypi.python.org/packages/source/T/Twisted/Twisted-12.1.0.tar.bz2"
+MD5SUM="f396f1d6f5321e869c2f89b2196a9eb5"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="Markus Reichelt"