- autodetect noarch target (sick of the strip and chrpath noise)

[packages/rpm-build-tools.git] / relup.sh

diff --git a/relup.sh b/relup.sh
index 535b95dc2a1eac0abd30d0d390526ccb601e1aaa..64481874162b6caddba49879c167702973177d8e 100644 (file)
--- a/relup.sh
+++ b/relup.sh
@@ -1,25 +1,38 @@
 #!/bin/sh
 # script to run after "rel up" style change.
 # takes Release from spec and creates commit with message
-# groups similiar commits to gether.
+# groups similiar commits together.
 # "- rel $rel"
+# - fails when specfile defines Icon: but the icon is not present in SOURCES
+# TODO
+# - optional message after rel: "- rel 9 (rebuild with foolib)"
 
 set -e
 specfile="$1"
 
 get_dump() {
        local specfile="$1"
-       rpm --specfile "$specfile" --define 'prep %dump'  -q 2>&1
+       if ! out=$(rpm --specfile "$specfile" --define 'prep %dump' -q 2>&1); then
+               echo >&2 "$out"
+               echo >&2 "You need icon files being present in SOURCES."
+               exit 1
+       fi
+       echo "$out"
 }
 
 get_release() {
-       awk '/PACKAGE_RELEASE/{print $NF; exit}'
+       local specfile="$1"
+       rel=$(awk '/^%define.*_rel/{print $NF}' $specfile)
+       if [ -z "$rel" ]; then
+               dump=$(get_dump "$specfile")
+               rel=$(echo "$dump" | 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