python-cssselect: update to 1.2.0

1 files changed, 18 insertions, 20 deletions

diff --git a/python-cssselect/build/python-cssselect.SlackBuild b/python-cssselect/build/python-cssselect.SlackBuild
index 4d6a265a..d95d2672 100755
--- a/python-cssselect/build/python-cssselect.SlackBuild
+++ b/python-cssselect/build/python-cssselect.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 # $Id$
-# Copyright 2012  Eric Hameleers, Eindhoven, NL
+# Copyright 2012, 2023  Eric Hameleers, Eindhoven, NL
 # All rights reserved.
 #
 #   Permission to use, copy, modify, and distribute this software for
@@ -30,11 +30,13 @@
 # URL:         http://packages.python.org/cssselect/
 # Needs:       
 # Changelog:   
-# 0.7.1-1:     20/Oct/2012 by Eric Hameleers <alien@slackware.com>
+# 0.7.1-1:     20/oct/2012 by Eric Hameleers <alien@slackware.com>
 #              * Initial build.
+# 0.7.1-1:     05/jan/2023 by Eric Hameleers <alien@slackware.com>
+#              * Update.
 # 
 # Run 'sh python-cssselect.SlackBuild' to build a Slackware package.
-# The package (.tgz) and .txt file as well as build logs are created in /tmp .
+# The package (.txz) and .txt file as well as build logs are created in /tmp .
 # Install it using 'installpkg'. 
 #
 # -----------------------------------------------------------------------------
@@ -43,9 +45,9 @@
 
 PRGNAM=python-cssselect
 SRCNAM=cssselect
-VERSION=${VERSION:-0.7.1}
+VERSION=${VERSION:-1.2.0}
 BUILD=${BUILD:-1}
-NUMJOBS=${NUMJOBS:" -j4 "}
+NUMJOBS=${NUMJOBS:-" -j$(nproc) "}
 TAG=${TAG:-alien}
 
 DOCS="AUTHORS CHANGES LICENSE PKG-INFO README.rst"
@@ -66,17 +68,14 @@ SRCURL="http://pypi.python.org/packages/source/c/${SRCNAM}/${SRCNAM}-${VERSION}.
 ##
 
 # Automatically determine the architecture we're building on:
-MARCH=$( uname -m )
 if [ -z "$ARCH" ]; then
-  case "$MARCH" in
-    i?86)    export ARCH=i486 ;;
-    armv7hl) export ARCH=$MARCH ;;
-    armv6hl) export ARCH=$MARCH ;;
-    armv5hl) export ARCH=$MARCH ;;
-    arm*)    export ARCH=arm ;;
+  case "$(uname -m)" in
+    i?86) ARCH=i586 ;;
+    arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;;
     # Unless $ARCH is already set, use uname -m for all other archs:
-    *)       export ARCH=$MARCH ;;
+    *) ARCH=$(uname -m) ;;
   esac
+  export ARCH
 fi
 
 # Exit the script on errors:
@@ -107,7 +106,7 @@ if ! [ -f ${SOURCE} ]; then
   if [ -f ${SOURCE} ]; then echo "Ah, found it!"; continue; fi
   if ! [ "x${SRCURL}" == "x" ]; then
     echo "Will download file to $(dirname $SOURCE)"
-    wget -nv -T 20 -O "${SOURCE}" "${SRCURL}" || true
+    wget --no-check-certificate -nv -T 20 -O "${SOURCE}" "${SRCURL}" || true
     if [ $? -ne 0 -o ! -s "${SOURCE}" ]; then
       echo "Downloading '$(basename ${SOURCE})' failed... aborting the build."
       mv -f "${SOURCE}" "${SOURCE}".FAIL
@@ -135,10 +134,11 @@ echo "Extracting the source archive(s) for $PRGNAM..."
 tar -xvf ${SOURCE}
 cd ${SRCNAM}-${VERSION}
 chown -R root:root .
-chmod -R u+w,go+r-w,a+X-s .
+chmod -R u+w,go+r-w,a+rX-st .
 
 echo Building ...
-python setup.py install --root=$PKG 2>&1 | tee $OUTPUT/install-$PRGNAM.log
+python2 setup.py install --root=$PKG 2>&1 |tee $OUTPUT/install-${PRGNAM}_py2.log
+python3 setup.py install --root=$PKG 2>&1 |tee $OUTPUT/install-${PRGNAM}_py3.log
 
 # Add documentation:
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
@@ -160,16 +160,14 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
 # Add a package description:
 mkdir -p $PKG/install
 cat $SRCDIR/slack-desc > $PKG/install/slack-desc
-#cat $SRCDIR/slack-required > $PKG/install/slack-required
 
 # Build the package:
 cd $PKG
-makepkg --linkadd y --chown n $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-tgz} 2>&1 | tee $OUTPUT/makepkg-${PRGNAM}.log
+makepkg --linkadd y --chown n $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} 2>&1 | tee $OUTPUT/makepkg-${PRGNAM}.log
 cd $OUTPUT
-md5sum ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-tgz} > ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-tgz}.md5
+md5sum ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} > ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz}.md5
 cd -
 cat $PKG/install/slack-desc | grep "^${PRGNAM}" > $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.txt
-#cat $PKG/install/slack-required > $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.dep
 
 # Restore the original umask:
 umask ${_UMASK_}