python/pyresample: Updated for version 1.2.5.

Signed-off-by: Dimitris Zlatanidis <d.zlatanidis@gmail.com>

4 files changed, 18 insertions, 16 deletions

diff --git a/python/pyresample/README b/python/pyresample/README
index 06674a01f2..4616946715 100644
--- a/python/pyresample/README
+++ b/python/pyresample/README
@@ -4,3 +4,5 @@ Pyresample uses a kd-tree approach for resampling.
 Pyresample is designed for resampling of remote sensing data
 and supports resampling from both fixed grids and geolocated
 swath data.
+
+Optional dependencies: numexpr, pykdtree, quicklook (not available from SBo)
diff --git a/python/pyresample/pyresample.SlackBuild b/python/pyresample/pyresample.SlackBuild
index 79c7ebc1db..6ba816e619 100644
--- a/python/pyresample/pyresample.SlackBuild
+++ b/python/pyresample/pyresample.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for pyresample
 
-# Copyright 2014 Dimitris Zlatanidis Greece-Orestiada
+# Copyright 2014-2016  Dimitris Zlatanidis  Orestiada, Greece
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,13 +23,13 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=pyresample
-VERSION=${VERSION:-1.1.0}
+VERSION=${VERSION:-1.2.5}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -40,8 +40,8 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -67,7 +67,7 @@ find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
   -o -perm 511 \) -exec chmod 755 {} \; -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 python setup.py install --root=$PKG
 
diff --git a/python/pyresample/pyresample.info b/python/pyresample/pyresample.info
index a064d571cc..38a1325cbf 100644
--- a/python/pyresample/pyresample.info
+++ b/python/pyresample/pyresample.info
@@ -1,10 +1,10 @@
 PRGNAM="pyresample"
-VERSION="1.1.0"
-HOMEPAGE="http://code.google.com/p/pyresample/"
-DOWNLOAD="https://pypi.python.org/packages/source/p/pyresample/pyresample-1.1.0.tar.gz"
-MD5SUM="9132d1e2596acbd20b4d460672593976"
+VERSION="1.2.5"
+HOMEPAGE="https://github.com/pytroll/pyresample"
+DOWNLOAD="https://pypi.python.org/packages/47/51/af41958f02e2a79ea1d7509476237e2411b9e7117751b394c3cd80c49ada/pyresample-1.2.5.tar.gz"
+MD5SUM="ffab5031bfcaa672d94138122ada5b4e"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="pyproj configobj numexpr pykdtree"
+REQUIRES="pyproj numpy configobj"
 MAINTAINER="Dimitris Zlatanidis"
 EMAIL="d.zlatanidis@gmail.com"
diff --git a/python/pyresample/slack-desc b/python/pyresample/slack-desc
index 3ad3727372..8991a828e4 100644
--- a/python/pyresample/slack-desc
+++ b/python/pyresample/slack-desc
@@ -8,12 +8,12 @@
           |-----handy-ruler------------------------------------------------------|
 pyresample: pyresample (geospatial resampling)
 pyresample:
-pyresample: Python package for geospatial resampling.
-pyresample:
-pyresample: Homepage: http://code.google.com/p/pyresample/
-pyresample:
-pyresample:
+pyresample: Resampling (reprojection) of geospatial image data in Python.
+pyresample: Pyresample uses a kd-tree approach for resampling. Pyresample is
+pyresample: designed for resampling of remote sensing data  and supports
+pyresample: from both fixed grids and geolocated swath data.
 pyresample:
+pyresample: Homepage: https://github.com/pytroll/pyresample
 pyresample:
 pyresample:
 pyresample: