3 files changed, 13 insertions, 20 deletions
diff --git a/libraries/reportlab/reportlab.SlackBuild b/libraries/reportlab/reportlab.SlackBuild
index 26b1509fb7..2b8c8a8ace 100644
--- a/libraries/reportlab/reportlab.SlackBuild
+++ b/libraries/reportlab/reportlab.SlackBuild
@@ -25,16 +25,14 @@
 # Modified by SlackBuilds.org
 
 PRGNAM=reportlab
-VERSION=${VERSION:-2.4}
+VERSION=${VERSION:-2.5}
 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
@@ -44,9 +42,6 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-SRC_PRGNAM=ReportLab
-SRC_VERSION=$(echo $VERSION | tr . _)
-
 if [ "$ARCH" = "i486" ]; then
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
@@ -54,7 +49,6 @@ elif [ "$ARCH" = "i686" ]; then
 elif [ "$ARCH" = "x86_64" ]; then
   LIBDIRSUFFIX="64"
 else
-  SLKCFLAGS="-O2"
   LIBDIRSUFFIX=""
 fi
 
@@ -69,16 +63,16 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf ${SRC_PRGNAM}_${SRC_VERSION}
-tar xvf $CWD/${SRC_PRGNAM}_${SRC_VERSION}.tar.gz || exit 1
-cd ${SRC_PRGNAM}_${SRC_VERSION}/
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
 chown -R root:root .
 chmod -R u+w,go+r-w,a-s .
 
 # Generate pdf documentation
 ( cd docs
   # workaround due to dependency loop if reportlab isn't previously installed
-  PYTHONPATH=$PYTHONPATH:$TMP/${SRC_PRGNAM}_${SRC_VERSION}/src/ python genAll.py
+  PYTHONPATH=$PYTHONPATH:$TMP/$PRGNAM-$VERSION/src/ python genAll.py
 )
 
 # Move demos, tests and tools directories into python package's home
@@ -87,8 +81,7 @@ mkdir -p $PKG/$PYTHONDIR/$PRGNAM/
 mv $OTHERPYFILES $PKG/$PYTHONDIR/$PRGNAM
 rm -f $PKG/$PYTHONDIR/$PRGNAM/tools/docco/*.pdf
 
-cd $TMP/${SRC_PRGNAM}_${SRC_VERSION}
-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 \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
diff --git a/libraries/reportlab/reportlab.info b/libraries/reportlab/reportlab.info
index d2e1494498..bde6d28f08 100644
--- a/libraries/reportlab/reportlab.info
+++ b/libraries/reportlab/reportlab.info
@@ -1,10 +1,10 @@
 PRGNAM="reportlab"
-VERSION="2.4"
+VERSION="2.5"
 HOMEPAGE="http://www.reportlab.com/software/opensource/rl-toolkit/"
-DOWNLOAD="http://www.reportlab.com/ftp/ReportLab_2_4.tar.gz"
-MD5SUM="e6dc4b0fbfb6814f7777e5960774cb5d"
+DOWNLOAD="http://www.reportlab.com/ftp/reportlab-2.5.tar.gz"
+MD5SUM="cdf8b87a6cf1501de1b0a8d341a217d3"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="LukenShiro"
 EMAIL="lukenshiro@ngi.it"
-APPROVED="dsomero"
+APPROVED="rworkman"
diff --git a/libraries/reportlab/slack-desc b/libraries/reportlab/slack-desc
index db0d8c1506..c3baefaad2 100644
--- a/libraries/reportlab/slack-desc
+++ b/libraries/reportlab/slack-desc
@@ -13,7 +13,7 @@ reportlab: PDF generating solution, suitable for web publishers, developers
 reportlab: or creative design professionals who need to quickly and easily
 reportlab: create or automate complex (even data-driven) documents.
 reportlab: It is released by ReportLab Inc., under BSD license.
-reportlab: 
+reportlab:
 reportlab: Homepage: http://www.reportlab.org
-reportlab: 
-reportlab: 
+reportlab:
+reportlab: