diff options
| -rw-r--r-- | gis/cartopy/cartopy.SlackBuild | 14 | ||||
| -rw-r--r-- | gis/cartopy/cartopy.info | 6 |
2 files changed, 8 insertions, 12 deletions
diff --git a/gis/cartopy/cartopy.SlackBuild b/gis/cartopy/cartopy.SlackBuild index 47e6072f46..243840f9d8 100644 --- a/gis/cartopy/cartopy.SlackBuild +++ b/gis/cartopy/cartopy.SlackBuild @@ -23,13 +23,13 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=cartopy -VERSION=${VERSION:-0.13.1} +VERSION=${VERSION:-0.15.0} 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" @@ -60,11 +60,7 @@ rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION -if [ -e $CWD/v$VERSION.tar.gz ]; then - tar xvf $CWD/v$VERSION.tar.gz -else - tar xvf $CWD/$PRGNAM-$VERSION.tar.gz -fi +tar xvf $CWD/$PRGNAM-$VERSION.tar.gz cd $PRGNAM-$VERSION chown -R root:root . find -L . \ diff --git a/gis/cartopy/cartopy.info b/gis/cartopy/cartopy.info index f7820aad95..34dfbe1575 100644 --- a/gis/cartopy/cartopy.info +++ b/gis/cartopy/cartopy.info @@ -1,8 +1,8 @@ PRGNAM="cartopy" -VERSION="0.13.1" +VERSION="0.15.0" HOMEPAGE="http://scitools.org.uk/cartopy/" -DOWNLOAD="https://github.com/SciTools/cartopy/archive/v0.13.1.tar.gz" -MD5SUM="021d5be723678f47da7cc7d77aed9eb2" +DOWNLOAD="https://github.com/SciTools/cartopy/archive/v0.15.0/cartopy-0.15.0.tar.gz" +MD5SUM="98da94b1b1f844b31e679bdfdd6e0d96" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="geos matplotlib proj pyshp scipy Shapely" |