3 files changed, 22 insertions, 27 deletions
diff --git a/development/psycopg2/psycopg2.SlackBuild b/development/psycopg2/psycopg2.SlackBuild
index 5b79ee1e54..23cf5651e9 100644
--- a/development/psycopg2/psycopg2.SlackBuild
+++ b/development/psycopg2/psycopg2.SlackBuild
@@ -22,44 +22,37 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-# Exit on most errors
-set -e
+# Modified by SlackBuilds.org
 
 PRGNAM=psycopg2
-VERSION=2.0.5.1
+VERSION=2.0.13
 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"
-elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-fi
+set -e
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xzvf $CWD/$PRGNAM-$VERSION.tar.gz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 chmod -R u+w,go+r-w,a-s .
 
-CFLAGS="$SLKCFLAGS" \
-python setup.py bdist
-
-tar zxvf dist/$PRGNAM-$VERSION.linux-i686.tar.gz -C $PKG
+python setup.py install --root=$PKG
 
-strip --strip-unneeded \
-  $PKG/usr/lib/python2.5/site-packages/psycopg2/_psycopg.so
+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 AUTHORS ChangeLog INSTALL LICENSE MANIFEST README doc/* \
+cp -a AUTHORS ChangeLog INSTALL LICENSE PKG-INFO README doc/* \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
@@ -67,4 +60,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/psycopg2/psycopg2.info b/development/psycopg2/psycopg2.info
index 63fedc1b3e..40d185265b 100644
--- a/development/psycopg2/psycopg2.info
+++ b/development/psycopg2/psycopg2.info
@@ -1,8 +1,10 @@
 PRGNAM="psycopg2"
-VERSION="2.0.5.1"
+VERSION="2.0.13"
 HOMEPAGE="http://initd.org/tracker/psycopg/wiki/PsycopgTwo"
-DOWNLOAD="http://initd.org/pub/software/psycopg/PSYCOPG-2-0/psycopg2-2.0.5.1.tar.gz"
-MD5SUM="052e4b97dab47708fdcdc36ffb25af66"
-MAINTAINER="Daniel de Kok"
-EMAIL="danieldk@pobox.com"
+DOWNLOAD="http://initd.org/pub/software/psycopg/psycopg2-2.0.13.tar.gz"
+MD5SUM="f520260595f4fcf035d26cfd57a75f19"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+MAINTAINER="nobody"
+EMAIL="nobody@nowhere"
 APPROVED="rworkman"
diff --git a/development/psycopg2/slack-desc b/development/psycopg2/slack-desc
index 1a07bece30..94209e9af3 100644
--- a/development/psycopg2/slack-desc
+++ b/development/psycopg2/slack-desc
@@ -7,13 +7,13 @@
 
         |-----handy-ruler------------------------------------------------------|
 psycopg2: psycopg2 (Python PostgreSQL bindings) 
-psycopg2: 
+psycopg2:
 psycopg2: psycopg is a PostgreSQL database adapter for Python. It supports the
 psycopg2: full Python DBAPI 2.0, and is thread safe at level 2. psycopg was
 psycopg2: designed for heavily multi-threaded applications.
-psycopg2: 
+psycopg2:
 psycopg2: The psycopg2 website can be found at:
 psycopg2: http://initd.org/tracker/psycopg/wiki/PsycopgTwo
-psycopg2: 
-psycopg2: 
-psycopg2: 
+psycopg2:
+psycopg2:
+psycopg2: