1 files changed, 16 insertions, 15 deletions
diff --git a/development/pysetuptools/pysetuptools.SlackBuild b/development/pysetuptools/pysetuptools.SlackBuild
index c4350bc761..14890bfb8c 100644
--- a/development/pysetuptools/pysetuptools.SlackBuild
+++ b/development/pysetuptools/pysetuptools.SlackBuild
@@ -9,42 +9,43 @@
 
 # Mofified by the SlackBuilds.org project
 
-NAME=setuptools
-PKG_NAME=pysetuptools
-VERSION=0.6c8
+PRGNAM=pysetuptools
+SRC_NAME=setuptools
+VERSION=0.6c9
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
-PKG=${PKG:-$TMP/package-$NAME}
+PKG=${PKG:-$TMP/package-$SRC_NAME}
 OUTPUT=${OUTPUT:-/tmp}
 
+set -e
+
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
-cd $TMP || exit 1
-rm -rf $NAME-$VERSION
-tar -zxvf $CWD/$NAME-$VERSION.tar.gz || exit 1
-cd $NAME-$VERSION || exit 1
+cd $TMP
+rm -rf $SRC_NAME-$VERSION
+tar xvf $CWD/$SRC_NAME-$VERSION.tar.gz
+cd $SRC_NAME-$VERSION
 chown -R root:root .
 chmod -R u+w,go+r-w,a-s .
 
-python setup.py bdist || exit 1
-tar xvf dist/$NAME-$VERSION.linux-i686.tar.gz -C $PKG || exit 1
+python setup.py install --root=$PKG
 
 ( cd $PKG
   find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
   find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
 )
 
-mkdir -p $PKG/usr/doc/$PKG_NAME-$VERSION
-cp -a PKG-INFO $PKG/usr/doc/$PKG_NAME-$VERSION
-install -m 0644 *.txt $PKG/usr/doc/$PKG_NAME-$VERSION
-cat $CWD/$PKG_NAME.SlackBuild > $PKG/usr/doc/$PKG_NAME-$VERSION/$PKG_NAME.SlackBuild
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a PKG-INFO $PKG/usr/doc/$PRGNAM-$VERSION
+install -m 0644 *.txt $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
 
 cd $PKG
-/sbin/makepkg -l y -c n -p $OUTPUT/$PKG_NAME-$VERSION-$ARCH-$BUILD$TAG.tgz
+/sbin/makepkg -l y -c n -p $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz