commit efec12ac5420b483fb368b05ba3c7f04c06d05ab
Author: Jan Rękorajski <[email protected]>
Date: Fri Feb 26 08:58:12 2021 +0100
Use rpm-specdump if it exists, rpm.org rpm can't do 'rpm dump %prep'
relup.sh | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
---
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:
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/rpm-build-tools.git/commitdiff/efec12ac5420b483fb368b05ba3c7f04c06d05ab
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
