- use %define _rel if available

Changed files:
    relup.sh -> 1.3

diff --git a/relup.sh b/relup.sh
index 535b95dc2a1eac0abd30d0d390526ccb601e1aaa..722454d01af16c0499064bbd46714bb8174aa3d6 100644 (file)
--- a/relup.sh
+++ b/relup.sh
@@ -9,17 +9,21 @@ specfile="$1"
 
 get_dump() {
        local specfile="$1"
-       rpm --specfile "$specfile" --define 'prep %dump'  -q 2>&1
+       rpm --specfile "$specfile" --define 'prep %dump' -q 2>&1
 }
 
 get_release() {
-       awk '/PACKAGE_RELEASE/{print $NF; exit}'
+       local specfile="$1"
+       rel=$(awk '/^%define.*_rel/{print $NF}' $specfile)
+       if [ -z "$rel" ]; then
+               rel=$(get_dump "$specfile" | awk '/PACKAGE_RELEASE/{print $NF; exit}')
+       fi
+       echo $rel
 }
 
-
 tmpd=$(mktemp -d "${TMPDIR:-/tmp}/relXXXXXX")
 for spec in "$@"; do
-       rel=$(get_dump "$spec" | get_release)
+       rel=$(get_release "$spec")
        echo "$spec" >> "$tmpd/$rel"
 done