From ba8f4565d00fe7cdc90c55d53cabdb2780b6c103 Mon Sep 17 00:00:00 2001
From: LukenShiro <lukenshiro@ngi.it>
Date: Wed, 12 May 2010 17:42:07 +0200
Subject: [PATCH] libraries/pytables: Updated for version 2.1.1

---
 libraries/pytables/pytables.SlackBuild | 30 +++++++++++++++++---------
 libraries/pytables/pytables.info       |  8 +++----
 2 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/libraries/pytables/pytables.SlackBuild b/libraries/pytables/pytables.SlackBuild
index 120c380559..64e91380cf 100644
--- a/libraries/pytables/pytables.SlackBuild
+++ b/libraries/pytables/pytables.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for pytables
 
-# Copyright 2007-8  LukenShiro <lukenshiro@ngi.it>
+# Copyright 2007-2009  LukenShiro <lukenshiro@ngi.it>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=pytables
-VERSION=${VERSION:-2.0.4}
+VERSION=${VERSION:-2.1.1}
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -33,15 +33,20 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-DOCFILES="RELEASE_NOTES.txt LICENSES/ MIGRATING_TO_2.x.txt THANKS ANNOUNCE.txt \
-    LICENSE.txt PKG-INFO TODO.txt README.txt"
+SRC_PRGNAM=tables
+DOCFILES="RELEASE_NOTES.txt LICENSES/ MIGRATING_TO_2.x.txt THANKS \
+  ANNOUNCE.txt LICENSE.txt PKG-INFO README.txt doc/html doc/scripts \
+  doc/text doc/usersguide.pdf"
 
 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
@@ -49,26 +54,31 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-$VERSION
+rm -rf $SRC_PRGNAM-$VERSION
+tar xvf $CWD/$SRC_PRGNAM-$VERSION.tar.gz
+cd $SRC_PRGNAM-$VERSION
 chown -R root:root .
 chmod -R u+w,go+r-w,a-s .
 
+# For now Pyrex extensions are not automatically re-built, because
+# Slackware pyrex is not yet at required version (>=0.9.8.4).
+#CFLAGS=$SLKCFLAGS \
 python setup.py build
 python setup.py install --prefix=/usr --root=$PKG
 
 # Copy documentation, examples, contrib, and bench files
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a $DOCFILES $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a doc/{html,scripts,text,usersguide.pdf} $PKG/usr/doc/$PRGNAM-$VERSION/
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
 mkdir -p $PKG/usr/share/$PRGNAM/
 cp -a examples contrib bench $PKG/usr/share/$PRGNAM/
 
 ( cd $PKG
-  find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-  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 || true
+  find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | \
+    xargs strip --strip-unneeded 2> /dev/null
 )
  
 mkdir -p $PKG/install
diff --git a/libraries/pytables/pytables.info b/libraries/pytables/pytables.info
index 032b4c685a..21c29f83d4 100644
--- a/libraries/pytables/pytables.info
+++ b/libraries/pytables/pytables.info
@@ -1,8 +1,8 @@
 PRGNAM="pytables"
-VERSION="2.0.4"
+VERSION="2.1.1"
 HOMEPAGE="http://www.pytables.org/moin"
-DOWNLOAD="http://www.pytables.org/download/stable/pytables-2.0.4.tar.gz"
-MD5SUM="e9892962256d28c898ea0c985e60c09e"
+DOWNLOAD="http://www.pytables.org/download/pytables-2.1.1/tables-2.1.1.tar.gz"
+MD5SUM="fce2100e655e91849b3d73f22274b0c4"
 MAINTAINER="LukenShiro"
 EMAIL="lukenshiro@ngi.it"
-APPROVED="rworkman"
+APPROVED="dsomero"