X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=relup.sh;h=573919793d970b6f736a360cd0b33db7190a8464;hb=9439a215500ef79bd92e3c1a8f80932c8c3ee57c;hp=8cc645d58d96e318bc57a2501e8eb25261b65efa;hpb=520382b9e2bf57a7ac0f746a6adfbcfbcfbdb6d5;p=packages%2Frpm-build-tools.git

diff --git a/relup.sh b/relup.sh
index 8cc645d..5739197 100755
--- a/relup.sh
+++ b/relup.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 # script to run after "release bump" style change.
 # takes Release from spec and creates commit with message
 # groups similiar commits together.
@@ -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:
@@ -201,8 +208,9 @@ for pkg in "$@"; do
 
 	# commit the changes
 	msg=""
-	[ -n "$message" ] && msg="$msg- $message$n"
-	msg="$msg- release ${rel%%%*} (by relup.sh)"
+	[ -n "$message" ] && msg="${msg}$message$n$n"
+	msg="${msg}Release ${rel%%%*} (by relup.sh)"
+
 	echo git commit -m "$msg" $spec
 	if [ "$test" != 1 ]; then
 		cd $pkgdir