From: Jan Rękorajski <baggins@pld-linux.org>
Date: Fri, 26 Feb 2021 07:58:12 +0000 (+0100)
Subject: Use rpm-specdump if it exists, rpm.org rpm can't do 'rpm dump %prep'
X-Git-Tag: auto/th/rpm-build-tools-4.10-1~13
X-Git-Url: http://git.pld-linux.org/?p=packages%2Frpm-build-tools.git;a=commitdiff_plain;h=efec12a

Use rpm-specdump if it exists, rpm.org rpm can't do 'rpm dump %prep'
---

diff --git a/relup.sh b/relup.sh
index 8cc645d..8267436 100755
--- a/relup.sh
+++ b/relup.sh
@@ -8,12 +8,19 @@ set -e
 
 get_dump() {
 	local specfile="$1"
-	if ! out=$(rpm --specfile "$specfile" --define 'prep %dump' -q 2>&1); then
-		echo >&2 "$out"
+	local rpm_dump
+	local success="y"
+	if [ -x /usr/bin/rpm-specdump ]; then
+		rpm_dump=$(rpm-specdump "$specfile" 2>&1) || success="n"
+	else
+		rpm_dump=$(rpm --specfile "$specfile" --define 'prep %dump' -q 2>&1) || success="n"
+	fi
+	if [ "$success" != "y" ]; then
+		echo >&2 "$rpm_dump"
 		echo >&2 "You need icon files being present in SOURCES."
 		exit 1
 	fi
-	echo "$out"
+	echo "$rpm_dump"
 }
 
 usage="Usage: