From d945102b2af611e952f1457b91b70f4e4ed4d856 Mon Sep 17 00:00:00 2001 From: Benjamin Trigona-Harany Date: Fri, 22 Feb 2019 13:13:21 -0800 Subject: gis/Shapely: Enable Python 3 by default. --- gis/Shapely/Shapely.SlackBuild | 10 ++++------ gis/Shapely/Shapely.info | 2 +- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/gis/Shapely/Shapely.SlackBuild b/gis/Shapely/Shapely.SlackBuild index 86856a927d..5af6caefb4 100644 --- a/gis/Shapely/Shapely.SlackBuild +++ b/gis/Shapely/Shapely.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for Shapely -# Copyright 2013-2018 Benjamin Trigona-Harany +# Copyright 2013-2019 Benjamin Trigona-Harany # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,7 +24,7 @@ PRGNAM=Shapely VERSION=${VERSION:-1.6.4} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -72,10 +72,8 @@ find -L . \ # remove unnecessary .pxi file sed -i "s/data_files\s*=.*/data_files = [],/g" setup.py -python setup.py install --root=$PKG -if $(python3 -c 'import sys' 2>/dev/null); then - python3 setup.py install --root=$PKG -fi +python2 setup.py install --root=$PKG +python3 setup.py install --root=$PKG find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true diff --git a/gis/Shapely/Shapely.info b/gis/Shapely/Shapely.info index 6f44d300aa..d663c65c09 100644 --- a/gis/Shapely/Shapely.info +++ b/gis/Shapely/Shapely.info @@ -5,6 +5,6 @@ DOWNLOAD="https://github.com/Toblerity/Shapely/archive/1.6.4/Shapely-1.6.4.tar.g MD5SUM="cf6f7abde575bb75ce0b39aaf061930f" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="geos" +REQUIRES="geos python3" MAINTAINER="Benjamin Trigona-Harany" EMAIL="slackbuilds@jaxartes.net" -- cgit v1.2.3