summaryrefslogtreecommitdiffstats
path: root/source/ap/rpm/rpm.SlackBuild
diff options
context:
space:
mode:
author Patrick J Volkerding <volkerdi@slackware.com>2021-12-03 20:07:20 +0000
committer Eric Hameleers <alien@slackware.com>2021-12-04 08:59:57 +0100
commitc29dcfa2dd2e7467ea3b6b757880348884d8790d (patch)
treed3353da7e281a39e6edb2bde414c1bc228be5d6e /source/ap/rpm/rpm.SlackBuild
parent66ba810196d8ce6f6da7df7931ce31e7303b8cf8 (diff)
downloadcurrent-c29dcfa2dd2e7467ea3b6b757880348884d8790d.tar.gz
current-c29dcfa2dd2e7467ea3b6b757880348884d8790d.tar.xz
Fri Dec 3 20:07:20 UTC 202120211203200720
ap/rpm-4.16.1.3-x86_64-4.txz: Rebuilt. Patched to handle non-compliant RPMs created by install4j. Thanks to alienBOB. d/poke-1.4-x86_64-1.txz: Upgraded. l/enchant-2.3.2-x86_64-1.txz: Upgraded. l/freetype-2.11.1-x86_64-1.txz: Upgraded. l/glib2-2.70.2-x86_64-1.txz: Upgraded. n/lynx-2.9.0dev.10-x86_64-1.txz: Upgraded. extra/php8/php8-8.1.0-x86_64-1.txz: Removed. extra/php80/php80-8.0.13-x86_64-1.txz: Added. extra/php81/php81-8.1.0-x86_64-1.txz: Added.
Diffstat (limited to 'source/ap/rpm/rpm.SlackBuild')
-rwxr-xr-xsource/ap/rpm/rpm.SlackBuild5
1 files changed, 4 insertions, 1 deletions
diff --git a/source/ap/rpm/rpm.SlackBuild b/source/ap/rpm/rpm.SlackBuild
index ff61a2e20..45d4ad48c 100755
--- a/source/ap/rpm/rpm.SlackBuild
+++ b/source/ap/rpm/rpm.SlackBuild
@@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=rpm
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-4}
NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
@@ -95,6 +95,9 @@ find . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \+
+# Fix for non-compliant RPMs created by install4j:
+zcat $CWD/rpm.install4j.compat.diff.gz | patch -p1 --verbose || exit 1
+
# We need to do this since there's a bugfix for python3.10 detection in
# the latest automake:
autoreconf -vif