[packages/rpm-build-tools] - drop support for rpm 4.0 - properly load builder macros on rpm.org 4.x

[baggins]

commit ac1281919568d928bdefe8cbc5436cdf3fa5906d
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Mon Oct 12 00:05:53 2020 +0200

    - drop support for rpm 4.0
    - properly load builder macros on rpm.org 4.x

 builder.sh | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)
---
diff --git a/builder.sh b/builder.sh
index 32486f2..918692d 100755
--- a/builder.sh
+++ b/builder.sh
@@ -214,13 +214,8 @@ fi
 
 GETLOCAL=${GETLOCAL:-cp -a}
 
-if rpm --version 2>&1 | grep -q '4.0.[0-2]'; then
-	RPM="rpm"
-	RPMBUILD="rpm"
-else
-	RPM="rpm"
-	RPMBUILD="rpmbuild"
-fi
+RPM="rpm"
+RPMBUILD="rpmbuild"
 
 #
 # sanity checks
@@ -630,8 +625,6 @@ set_spec_target() {
 
 # runs rpm with minimal macroset
 minirpm() {
-	safe_macrofiles=$(rpm $TARGET_SWITCH --showrc | awk -F: '/^macrofiles/ { gsub(/^macrofiles[ \t]+:/, "", $0); print $0 } ')
-
 	# TODO: move these to /usr/lib/rpm/macros
 	cat > $BUILDER_MACROS <<'EOF'
 %x8664 x86_64 amd64 ia32e
@@ -694,7 +687,12 @@ EOF
 %_sourcedir ./
 EOF
 	fi
-	eval PATH=$CLEAN_PATH $RPMBUILD $TARGET_SWITCH --macros "$safe_macrofiles:$BUILDER_MACROS" $QUIET $RPMOPTS $RPMBUILDOPTS $BCOND $* 2>&1
+    if rpm --version 2>&1 | grep -qE '5\.[0-9]+\.[0-9]+'; then
+		safe_macrofiles=$(rpm $TARGET_SWITCH --showrc | awk -F: '/^macrofiles/ { gsub(/^macrofiles[ \t]+:/, "", $0); print $0 } ')
+		eval PATH=$CLEAN_PATH $RPMBUILD $TARGET_SWITCH --macros "$safe_macrofiles:$BUILDER_MACROS" $QUIET $RPMOPTS $RPMBUILDOPTS $BCOND $* 2>&1
+	else
+		eval PATH=$CLEAN_PATH $RPMBUILD $TARGET_SWITCH --load "$BUILDER_MACROS" $QUIET $RPMOPTS $RPMBUILDOPTS $BCOND $* 2>&1
+	fi
 }
 
 cache_rpm_dump() {
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/rpm-build-tools.git/commitdiff/ac1281919568d928bdefe8cbc5436cdf3fa5906d