From 52a20c6c69047c7960e73c4670ecab0e90ce5b3d Mon Sep 17 00:00:00 2001 From: Benjamin Trigona-Harany Date: Mon, 12 Nov 2018 17:27:31 -0800 Subject: gis/Geohash: Python 3 by default. --- gis/Geohash/Geohash.SlackBuild | 13 ++++++------- gis/Geohash/Geohash.info | 2 +- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/gis/Geohash/Geohash.SlackBuild b/gis/Geohash/Geohash.SlackBuild index d89f1b7d4b..6100ab1625 100644 --- a/gis/Geohash/Geohash.SlackBuild +++ b/gis/Geohash/Geohash.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for Geohash -# Copyright 2016 Benjamin Trigona-Harany +# Copyright 2016-2018 Benjamin Trigona-Harany # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -69,17 +69,16 @@ find -L . \ \( -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 - sed -i "s/from geohash/from .geohash/" $PRGNAM/__init__.py - 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 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a LICENSE.txt README.rst $PKG/usr/doc/$PRGNAM-$VERSION +cp -a \ + LICENSE.txt README.rst \ + $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/gis/Geohash/Geohash.info b/gis/Geohash/Geohash.info index 89ba46621f..660744a032 100644 --- a/gis/Geohash/Geohash.info +++ b/gis/Geohash/Geohash.info @@ -5,6 +5,6 @@ DOWNLOAD="https://pypi.python.org/packages/source/G/Geohash/Geohash-1.0.tar.gz" MD5SUM="a7c4e57874061fae1e30dd8aa8b9b390" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="" +REQUIRES="python3" MAINTAINER="Benjamin Trigona-Harany" EMAIL="slackbuilds@jaxartes.net" -- cgit v1.2.3