4 files changed, 36 insertions, 42 deletions
diff --git a/development/numpy/README b/development/numpy/README
index 6ab3f1293e..26ea118b48 100644
--- a/development/numpy/README
+++ b/development/numpy/README
@@ -1,13 +1,10 @@
-The fundamental package needed for scientific computing with Python is
-called NumPy.  This package contains:
-    * a powerful N-dimensional array object
-    * sophisticated (broadcasting) functions
-    * basic linear algebra functions
-    * basic Fourier transforms
-    * sophisticated random number capabilities
-    * tools for integrating Fortran code.
-
-Besides its obvious scientific uses, NumPy can also be used as an
-efficient multi-dimensional container of generic data.  Arbitrary
-data-types can be defined.  This allows NumPy to seamlessly and
-quickly integrate with a wide-variety of databases.
+NumPy is a general-purpose array-processing package designed to
+efficiently manipulate large multi-dimensional arrays of arbitrary
+records without sacrificing too much speed for small multi-dimensional
+arrays.  NumPy is built on the Numeric code base and adds features
+introduced by numarray as well as an extended C-API and the ability to
+create arrays of arbitrary type which also makes NumPy suitable for
+interfacing with general-purpose data-base applications.
+        
+There are also basic facilities for discrete fourier transform, basic
+linear algebra and random number generation.
diff --git a/development/numpy/numpy.SlackBuild b/development/numpy/numpy.SlackBuild
index b7e4e6eb10..d216eaed91 100644
--- a/development/numpy/numpy.SlackBuild
+++ b/development/numpy/numpy.SlackBuild
@@ -2,53 +2,50 @@
 
 # Slackware build script for NumPy
 
-# Written by Aleksandar B. Samardzic <asamardzic@matf.bg.ac.yu>
+# Written by Aleksandar Samardzic <asamardzic@gmail.com>
 
-NAME=numpy
-VERSION=1.0.4
+PRGNAM=numpy
+VERSION=${VERSION:-1.2.0}
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
-PKG=${PKG:-$TMP/package-$NAME}
+PKG=${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 $NAME-$VERSION
-tar xvf $CWD/$NAME-$VERSION.tar.gz
-cd $NAME-$VERSION
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
 chown -R root:root .
-chmod -R u+w,go+r-w,a-s .
+find . \
+ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
+ -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
+ -exec chmod 644 {} \;
 
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
 python setup.py build
 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 "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
 )
 
-mkdir -p $PKG/usr/doc/$NAME-$VERSION
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a COMPATIBILITY DEV_README.txt LICENSE.txt README.txt THANKS.txt\
-  $PKG/usr/doc/$NAME-$VERSION
-cat $CWD/$NAME.SlackBuild > $PKG/usr/doc/$NAME-$VERSION/$NAME.SlackBuild
+  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 find $PKG/usr/doc -type f -exec chmod 0644 {} \;
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$NAME-$VERSION-$ARCH-$BUILD$TAG.tgz
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz
diff --git a/development/numpy/numpy.info b/development/numpy/numpy.info
index 618691b65d..7436ee17b6 100644
--- a/development/numpy/numpy.info
+++ b/development/numpy/numpy.info
@@ -1,8 +1,8 @@
 PRGNAM="numpy"
-VERSION="1.0.4"
+VERSION="1.2.0"
 HOMEPAGE="http://numpy.scipy.org/"
-DOWNLOAD="http://downloads.sourceforge.net/numpy/numpy-1.0.4.tar.gz"
-MD5SUM="8f011e9d7697da570efaac61c51725e0"
-MAINTAINER="Aleksandar B. Samardzic"
-EMAIL="asamardzic@matf.bg.ac.yu"
+DOWNLOAD="http://downloads.sourceforge.net/numpy/numpy-1.2.0.tar.gz"
+MD5SUM="1e760a8bca54f6116c42cd1b124673af"
+MAINTAINER="Aleksandar Samardzic"
+EMAIL="asamardzic@gmail.com"
 APPROVED="rworkman"
diff --git a/development/numpy/slack-desc b/development/numpy/slack-desc
index e711828604..4f210ab4b2 100644
--- a/development/numpy/slack-desc
+++ b/development/numpy/slack-desc
@@ -6,14 +6,14 @@
 # customary to leave one space after the ':'.
 
      |-----handy-ruler------------------------------------------------------|
-numpy: NumPy (a foundation Python package for scientific computing)
+numpy: NumPy (a Python extension for scientific computing)
 numpy:
 numpy: NumPy is an extension to the Python programming language, adding
-numpy: support for large, multi-dimensional arrays and matrices, along
+numpy: support for large, multi-dimensional arrays and matrices along
 numpy: with a large library of high-level mathematical functions to
 numpy: operate on these arrays.
 numpy: 
-numpy: NumPy home page is: http://numpy.scipy.org/
+numpy: Homepage: http://numpy.scipy.org/
 numpy:
 numpy:
 numpy: