system/isomd5sum: Updated for version 1.2.4.

Signed-off-by: B. Watson <urchlay@slackware.uk>

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

2 files changed, 28 insertions, 28 deletions

diff --git a/system/isomd5sum/isomd5sum.SlackBuild b/system/isomd5sum/isomd5sum.SlackBuild
index 497499afa7..28d686af6c 100644
--- a/system/isomd5sum/isomd5sum.SlackBuild
+++ b/system/isomd5sum/isomd5sum.SlackBuild
@@ -8,6 +8,7 @@
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20240317 bkw: update for v1.2.4, simplify script a bit
 # 20180611 bkw: update for v1.2.3
 # 20171214 bkw: update for v1.2.2
 # 20170614 bkw: update for v1.2.1
@@ -16,7 +17,7 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=isomd5sum
-VERSION=${VERSION:-1.2.3}
+VERSION=${VERSION:-1.2.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
@@ -60,8 +61,8 @@ rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
-find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
-        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} + -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} +
 
 sed -i \
   -e 's,/usr/share/man,/usr/man,' \
@@ -69,35 +70,34 @@ sed -i \
   -e "s,-O3,$SLKCFLAGS", \
   Makefile
 
-# Build & install binaries, libs, and python2 support:
-make -j1 \
-  RPM_OPT_FLAGS="$SLKCFLAGS" \
-  PYTHON=python2 \
-  DESTDIR=$PKG \
-  all install
-
-# If python3 is installed, build support for it.
-# Slack's python 2.x package has a python2-config command, but SBo's
-# python 3.x doesn't have python3-config (only e.g. python3.3-config).
-# The readlink/which stuff avoids hard-coding 3.3 in this script:
-if python3 --version >/dev/null 2>&1; then
+runmake() {
+  local py="$1"
+  shift
   make -j1 \
     RPM_OPT_FLAGS="$SLKCFLAGS" \
-    PYTHON=$( readlink $( which python3 ) ) \
+    PYTHON="$py" \
     DESTDIR=$PKG \
-    clean all install-python
-fi
+    "$@"
+}
+
+# Build & install binaries, libs, and python2 support:
+runmake python2 all install
+
+# Build & install python3 support:
+runmake python3 clean all install-python
 
-# fix .pc file stupidity:
-sed -i '/^\(libdir\|includedir\)/s,=.*usr,=/usr,' $PKG/usr/share/pkgconfig/$PRGNAM.pc
-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
+# 20240317 bkw: much quicker than the template find|xargs|strip.
+strip $PKG/usr/bin/* $PKG/usr/lib*/python*/site-packages/*.so
 
 gzip -9 $PKG/usr/man/man?/*.?
 
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a README COPYING testpyisomd5sum.py $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+# 20240317 bkw: this used to go in the doc dir, moved to bin.
+install -m0755 testpyisomd5sum.py $PKG/usr/bin
+
+PKGDOC=$PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKGDOC
+cp -a README COPYING $PKGDOC
+cat $CWD/$PRGNAM.SlackBuild > $PKGDOC/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/system/isomd5sum/isomd5sum.info b/system/isomd5sum/isomd5sum.info
index c25b5bb982..abf3796013 100644
--- a/system/isomd5sum/isomd5sum.info
+++ b/system/isomd5sum/isomd5sum.info
@@ -1,8 +1,8 @@
 PRGNAM="isomd5sum"
-VERSION="1.2.3"
+VERSION="1.2.4"
 HOMEPAGE="https://github.com/rhinstaller/isomd5sum/"
-DOWNLOAD="https://github.com/rhinstaller/isomd5sum/archive/1.2.3/isomd5sum-1.2.3.tar.gz"
-MD5SUM="c4e04bba46a162ff60ca6dea04ab3e21"
+DOWNLOAD="https://github.com/rhinstaller/isomd5sum/archive/1.2.4/isomd5sum-1.2.4.tar.gz"
+MD5SUM="da23e32ef09aede2f0946d312a798587"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""