X-Git-Url: https://git.tld-linux.org/?p=packages%2Frpm-build-tools.git;a=blobdiff_plain;f=relup.sh;h=8267436e1efc2c5cc295941189c01a0176365044;hp=7557ba619b1282596364914aa6d253ba8159fbea;hb=45d8f2d9258214696ed2d3bba02ceb0236d47fd3;hpb=f8a24e0ba6f0a677b7b4626b6a1085ba966b0959

diff --git a/relup.sh b/relup.sh
index 7557ba6..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:
@@ -38,7 +45,7 @@ get_release() {
 	rel=$(awk '/^%define[ 	]+_?rel[ 	]+/{print $NF}' $specfile)
 	if [ -z "$rel" ]; then
 		dump=$(get_dump "$specfile")
-		rel=$(echo "$dump" | awk '/PACKAGE_RELEASE/{print $NF; exit}')
+		rel=$(echo "$dump" | awk '$2~/^(PACKAGE_)?RELEASE$/{print $NF; exit}')
 	fi
 	echo $rel
 }