From 703b90d4a385e6c7dd09b4bfa0b73b7deaecaa29 Mon Sep 17 00:00:00 2001
From: Benjamin Trigona-Harany <bosth@alumni.sfu.ca>
Date: Fri, 16 Mar 2018 23:28:43 -0700
Subject: [PATCH] gis/pyspatialite: Switch to i586.

Signed-off-by: Benjamin Trigona-Harany <bosth@alumni.sfu.ca>
---
 gis/pyspatialite/pyspatialite.SlackBuild | 28 +++++++++++++-----------
 gis/pyspatialite/pyspatialite.info       |  2 +-
 2 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/gis/pyspatialite/pyspatialite.SlackBuild b/gis/pyspatialite/pyspatialite.SlackBuild
index c51c0a76df..b4dc849ffe 100644
--- a/gis/pyspatialite/pyspatialite.SlackBuild
+++ b/gis/pyspatialite/pyspatialite.SlackBuild
@@ -30,7 +30,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
@@ -41,8 +41,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,25 +60,27 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-${SRCVER}
-tar xvf $CWD/$PRGNAM-${SRCVER}.tar.gz || tar xvf $CWD/${SRCVER}.tar.gz
-cd $PRGNAM-${SRCVER}
+rm -rf $PRGNAM-$SRCVER
+tar xvf $CWD/$PRGNAM-$SRCVER.tar.gz
+cd $PRGNAM-$SRCVER
 chown -R root:root .
-find . \
- \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
-  -exec chmod 755 {} \; -o \
-  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-  -exec chmod 644 {} \;
+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 {} \;
 
 sed -i '/^#include "sqlite3.h"$/d' src/{statement,util}.h
 CFLAGS=-I/usr/include python setup.py install --root=$PKG
 
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+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
 
 rm -r $PKG/usr/$PRGNAM-doc
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a CHANGES LICENSE README.md $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  CHANGES LICENSE README.md \
+  $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/gis/pyspatialite/pyspatialite.info b/gis/pyspatialite/pyspatialite.info
index abb97908bd..0d2249deb5 100644
--- a/gis/pyspatialite/pyspatialite.info
+++ b/gis/pyspatialite/pyspatialite.info
@@ -1,7 +1,7 @@
 PRGNAM="pyspatialite"
 VERSION="3.0.1_alpha_0"
 HOMEPAGE="https://github.com/lokkju/pyspatialite"
-DOWNLOAD="https://github.com/lokkju/pyspatialite/archive/3.0.1-alpha-0.tar.gz"
+DOWNLOAD="https://github.com/lokkju/pyspatialite/archive/3.0.1-alpha-0/pyspatialite-3.0.1-alpha-0.tar.gz"
 MD5SUM="d4b9364756b90bc81399fea27af9dc98"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""