3 files changed, 32 insertions, 19 deletions
diff --git a/development/MySQL-python/MySQL-python.SlackBuild b/development/MySQL-python/MySQL-python.SlackBuild
index 7ea90707ad..3c6d0657ea 100644
--- a/development/MySQL-python/MySQL-python.SlackBuild
+++ b/development/MySQL-python/MySQL-python.SlackBuild
@@ -5,39 +5,50 @@
 # Written by Jick Nan (jick.nan@gmail.com)
 
 PRGNAM=MySQL-python
-VERSION=1.2.2
+VERSION=1.2.3c1
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
+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"
+fi
+
+set -e
+
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
-cd $TMP 
+cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar -xzvf $CWD/$PRGNAM-$VERSION.tar.gz || exit 1
-cd $PRGNAM-$VERSION || exit 1
+tar -xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
 chown -R root:root .
 chmod -R u+w,go+r-w,a-s .
 
-python setup.py bdist || exit 1
-tar zxvf dist/$PRGNAM-$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
-)
+find $PKG | xargs file | grep "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 ChangeLog GPL HISTORY PKG-INFO README $PKG/usr/doc/$PRGNAM-$VERSION
-install -m 0644 *.txt $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a ChangeLog GPL HISTORY PKG-INFO README doc/*.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 $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/development/MySQL-python/MySQL-python.info b/development/MySQL-python/MySQL-python.info
index f53ce742b6..608cab80c4 100644
--- a/development/MySQL-python/MySQL-python.info
+++ b/development/MySQL-python/MySQL-python.info
@@ -1,8 +1,10 @@
 PRGNAM="MySQL-python"
-VERSION="1.2.2"
+VERSION="1.2.3c1"
 HOMEPAGE="http://cheeseshop.python.org/pypi/MySQL-python/"
-DOWNLOAD="http://downloads.sourceforge.net/mysql-python/MySQL-python-1.2.2.tar.gz"
-MD5SUM="532268f02870bea18c1d465e88afff30"
+DOWNLOAD="http://downloads.sourceforge.net/mysql-python/MySQL-python-1.2.3c1.tar.gz"
+DOWNLOAD_x86_64=""
+MD5SUM="310dd856e439d070b59ece6dd7a0734d"
+MD5SUM_x86_64=""
 MAINTAINER="Jick Nan"
 EMAIL="jick.nan@gmail.com"
-APPROVED="rworkman"
+APPROVED="rworkman,pprkut"
diff --git a/development/MySQL-python/README b/development/MySQL-python/README
index 7b08482c7e..545bf819fa 100644
--- a/development/MySQL-python/README
+++ b/development/MySQL-python/README
@@ -1,12 +1,12 @@
 MySQL-python (Python interface to MySQL)
 
-MySQLdb is an interface to the popular MySQL database server for Python. 
+MySQLdb is an interface to the popular MySQL database server for Python.
 The design goals are:
 
     * Compliance with Python database API version 2.0 [PEP-0249]
     * Thread-safety
     * Thread-friendliness (threads will not block each other)
 
-MySQL-3.23 through 5.0 and Python-2.3 through 2.5 are currently supported.
+MySQL-3.23 through 5.1 and Python-2.3 through 2.6 are currently supported.
 
 This requires the Python setuptools (pysetuptools on SlackBuilds.org).