aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenjamin Trigona-Harany <bosth@alumni.sfu.ca>2018-03-13 22:44:11 -0700
committerWilly Sudiarto Raharjo <willysr@slackbuilds.org>2018-03-17 08:51:43 +0700
commitf8afedac7ee1e819bca29d772e19c14fe66100a1 (patch)
tree25fab70e5f745455aadddc1b56a2047b96b86be9
parentb7ad3c60c84b809e95e03847978c1e99aab26be7 (diff)
gis/cligj: Add Python 3 support.
Signed-off-by: Benjamin Trigona-Harany <bosth@alumni.sfu.ca>
-rw-r--r--gis/cligj/cligj.SlackBuild15
-rw-r--r--gis/cligj/cligj.info2
2 files changed, 10 insertions, 7 deletions
diff --git a/gis/cligj/cligj.SlackBuild b/gis/cligj/cligj.SlackBuild
index 27bf63b89487b..df3778b307ac4 100644
--- a/gis/cligj/cligj.SlackBuild
+++ b/gis/cligj/cligj.SlackBuild
@@ -31,7 +31,7 @@ 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
@@ -42,8 +42,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"
@@ -62,16 +62,19 @@ rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
cd $TMP
rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz || tar xvf $CWD/$VERSION.tar.gz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
cd $PRGNAM-$VERSION
chown -R root:root .
find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+ \( -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 \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
python setup.py install --root=$PKG
+if $(python3 -c 'import sys' 2>/dev/null); then
+ python3 setup.py install --root=$PKG
+fi
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
cp -a LICENSE README.rst $PKG/usr/doc/$PRGNAM-$VERSION
diff --git a/gis/cligj/cligj.info b/gis/cligj/cligj.info
index 56344aed9292b..56409ccc4b33a 100644
--- a/gis/cligj/cligj.info
+++ b/gis/cligj/cligj.info
@@ -1,7 +1,7 @@
PRGNAM="cligj"
VERSION="0.4.0"
HOMEPAGE="https://github.com/mapbox/cligj"
-DOWNLOAD="https://github.com/mapbox/cligj/archive/0.4.0.tar.gz"
+DOWNLOAD="https://github.com/mapbox/cligj/archive/0.4.0/cligj-0.4.0.tar.gz"
MD5SUM="f95e862644749619b29260647fa13633"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""