2 files changed, 27 insertions, 15 deletions
diff --git a/development/SQLAlchemy/SQLAlchemy.SlackBuild b/development/SQLAlchemy/SQLAlchemy.SlackBuild
index b6049163cf..232abe7df3 100644
--- a/development/SQLAlchemy/SQLAlchemy.SlackBuild
+++ b/development/SQLAlchemy/SQLAlchemy.SlackBuild
@@ -23,7 +23,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=SQLAlchemy
-VERSION=0.4.6
+VERSION=0.5.5
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -33,25 +33,35 @@ 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
 rm -rf $PRGNAM-$VERSION
-tar xvf $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 xvf 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 || true
-  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 CHANGES LICENSE PKG-INFO README* VERSION doc/* examples test \
+cp -a CHANGES* LICENSE PKG-INFO README* doc/* examples test \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
@@ -59,4 +69,4 @@ 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/SQLAlchemy/SQLAlchemy.info b/development/SQLAlchemy/SQLAlchemy.info
index 6f83722bb0..d132ae0b13 100644
--- a/development/SQLAlchemy/SQLAlchemy.info
+++ b/development/SQLAlchemy/SQLAlchemy.info
@@ -1,8 +1,10 @@
 PRGNAM="SQLAlchemy"
-VERSION="0.4.6"
+VERSION="0.5.5"
 HOMEPAGE="http://www.sqlalchemy.org"
-DOWNLOAD="http://pypi.python.org/packages/source/S/SQLAlchemy/SQLAlchemy-0.4.6.tar.gz"
-MD5SUM="3d1e737bb408de25b2fadb19a736b40e"
+DOWNLOAD="http://downloads.sourceforge.net/project/sqlalchemy/sqlalchemy/0.5.5/SQLAlchemy-0.5.5.tar.gz"
+DOWNLOAD_x86_64=""
+MD5SUM="6a518d2c16caf10bdbce85ad06e08abb"
+MD5SUM_x86_64=""
 MAINTAINER="Andrea Maccis"
 EMAIL="andrea.maccis@gmail.com"
-APPROVED="rworkman"
+APPROVED="rworkman,pprkut"