2 files changed, 10 insertions, 13 deletions
diff --git a/libraries/decorator/decorator.SlackBuild b/libraries/decorator/decorator.SlackBuild
index 721d2a8059..24addfb754 100644
--- a/libraries/decorator/decorator.SlackBuild
+++ b/libraries/decorator/decorator.SlackBuild
@@ -2,20 +2,18 @@
 
 # Slackware build script for decorator
 
-# Written by Mikko Varri (vmj@linuxbox.fi)
+# Written by Mikko Värri (vmj@linuxbox.fi)
 # Public domain
 
 PRGNAM=decorator
-VERSION=${VERSION:-2.3.1}
+VERSION=${VERSION:-3.2.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-# Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i486 ;;
     arm*) ARCH=arm ;;
-    # Unless $ARCH is already set, use uname -m for all other archs:
        *) ARCH=$( uname -m ) ;;
   esac
 fi
@@ -31,9 +29,8 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-mkdir $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
-unzip $CWD/$PRGNAM-$VERSION.zip
 chown -R root:root .
 find . \
  \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -44,7 +41,7 @@ find . \
 python setup.py install --root=$PKG
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a CHANGES.txt README.txt documentation.* $PKG/usr/doc/$PRGNAM-$VERSION/
+cp -a README.txt documentation.* $PKG/usr/doc/$PRGNAM-$VERSION/
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/libraries/decorator/decorator.info b/libraries/decorator/decorator.info
index 5a7df8c1f1..2ee505a197 100644
--- a/libraries/decorator/decorator.info
+++ b/libraries/decorator/decorator.info
@@ -1,10 +1,10 @@
 PRGNAM="decorator"
-VERSION="2.3.1"
-HOMEPAGE="http://www.phyast.pitt.edu/~micheles/python/documentation.html"
-DOWNLOAD="http://www.phyast.pitt.edu/~micheles/python/decorator-2.3.1.zip"
-MD5SUM="40c2d7a566a5f5264ef8d2a88d9261e9"
+VERSION="3.2.0"
+HOMEPAGE="http://pypi.python.org/pypi/decorator"
+DOWNLOAD="http://pypi.python.org/packages/source/d/decorator/decorator-3.2.0.tar.gz"
+MD5SUM="6208cd51365083c168ab3a04426a646b"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-MAINTAINER="Mikko Varri"
+MAINTAINER="Mikko Värri"
 EMAIL="vmj@linuxbox.fi"
-APPROVED="rworkman"
+APPROVED="dsomero"