2 files changed, 17 insertions, 42 deletions
diff --git a/development/django/django.SlackBuild b/development/django/django.SlackBuild
index f326eb0f9766..83381eb84d3e 100644
--- a/development/django/django.SlackBuild
+++ b/development/django/django.SlackBuild
@@ -22,12 +22,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-PKGNAM=django
-SRCNAM=Django
-VERSION=${VERSION:-1.2.1}
+PRGNAM=django
+VERSION=${VERSION:-1.2.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
+SRCNAM=Django
+
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i486 ;;
@@ -38,14 +39,16 @@ fi
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PKGNAM
+PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
+set -e
+
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PKGNAM-$VERSION
-tar xvf $CWD/$SRCNAM-$VERSION.tar.gz || exit 1
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
 cd $SRCNAM-$VERSION
 chown -R root:root .
 find . \
@@ -54,41 +57,13 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-python setup.py \
-  install \
-  --prefix=/usr \
-  --root="$PKG"
+python setup.py install --prefix=/usr --root="$PKG" 
 
-mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
-cp -a AUTHORS LICENSE README \
-  $PKG/usr/doc/$PKGNAM-$VERSION
-chmod 0644 $PKG/usr/doc/$PKGNAM-$VERSION/*
-
-# Compress and link manpages, if any:
-if [ -d $PKG/usr/man ]; then
-  ( cd $PKG/usr/man
-    for manpagedir in $(find . -type d -name "man*") ; do
-      ( cd $manpagedir
-        for eachpage in $( find . -type l -maxdepth 1) ; do
-          ln -s $( readlink $eachpage ).gz $eachpage.gz
-          rm $eachpage
-        done
-        gzip -9 *.?
-      )
-    done
-  )
-fi
-
-# Compress info files, if any:
-if [ -d $PKG/usr/info ]; then
-  ( cd $PKG/usr/info
-    rm -f dir
-    gzip -9 *
-  )
-fi
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS LICENSE README $PKG/usr/doc/$PRGNAM-$VERSION
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PKGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/development/django/django.info b/development/django/django.info
index 54090a93b5e2..bb04ef594c55 100644
--- a/development/django/django.info
+++ b/development/django/django.info
@@ -1,10 +1,10 @@
 PRGNAM="django"
-VERSION="1.2.1"
+VERSION="1.2.3"
 HOMEPAGE="http://www.djangoproject.com/"
-DOWNLOAD="http://www.djangoproject.com/download/1.2.1/tarball/"
-MD5SUM="2351efb20f6b7b5d9ce80fa4cb1bd9ca"
+DOWNLOAD="http://www.djangoproject.com/download/1.2.3/tarball/"
+MD5SUM="10bfb5831bcb4d3b1e6298d0e41d6603"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="Carlos Corbacho"
 EMAIL="carlos@strangeworlds.co.uk"
-APPROVED="Erik Hanson"
+APPROVED="rworkman"