- rel may contain other macros, strip and readd them for increment

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

diff --git a/relup.sh b/relup.sh
index 9f3331b6fb6a9a145c249e2ad1cf86c6e28413ea..e7d90063f1e62576fd7b30b7bde86486be0031fb 100644 (file)
--- a/relup.sh
+++ b/relup.sh
@@ -20,11 +20,13 @@ get_dump() {
 }
 
 usage="Usage:
-${0##*/} [-i] [-t] [-m <MESSAGE>] <SPECLIST>
+${0##*/} [-i] [-u] [-t] [-m <MESSAGE>] <SPECLIST>
 
 Options:
 -i
   Try to increment package release
+-u
+  cvs update first
 -t
   Test mode. do not commit
 -m
@@ -34,7 +36,7 @@ Options:
 
 get_release() {
        local specfile="$1"
-       rel=$(awk '/^%define[   ]*_rel[         ]/{print $NF}' $specfile)
+       rel=$(awk '/^%define[   ]+_?rel[        ]+/{print $NF}' $specfile)
        if [ -z "$rel" ]; then
                dump=$(get_dump "$specfile")
                rel=$(echo "$dump" | awk '/PACKAGE_RELEASE/{print $NF; exit}')
@@ -47,7 +49,7 @@ set_release() {
        local rel="$2"
        local newrel="$3"
        sed -i -e "
-               s/^\(%define[ \t]\+_rel[ \t]\+\)$rel\$/\1$newrel/
+               s/^\(%define[ \t]\+_\?rel[ \t]\+\)$rel\$/\1$newrel/
                s/^\(Release:[ \t]\+\)$rel\$/\1$newrel/
        " $specfile
 }
@@ -57,7 +59,7 @@ if [ ! -x /usr/bin/getopt ]; then
        exit 1
 fi
 
-t=$(getopt -o 'm:ith' -n "${0##*/}" -- "$@") || exit $?
+t=$(getopt -o 'm:iuth' -n "${0##*/}" -- "$@") || exit $?
 # Note the quotes around `$t': they are essential!
 eval set -- "$t"
 
@@ -66,6 +68,9 @@ while true; do
        -i)
                inc=1
                ;;
+       -u)
+               update=1
+               ;;
        -t)
                test=1
                ;;
@@ -92,10 +97,20 @@ done
 tmpd=$(mktemp -d "${TMPDIR:-/tmp}/relXXXXXX")
 for spec in "$@"; do
        spec=${spec%.spec}.spec
+       if [ "$update" = "1" ]; then
+               cvs up "$spec"
+       fi
        rel=$(get_release "$spec")
        if [ "$inc" = 1 ]; then
-               newrel=$(expr $rel + 1)
-               set_release "$spec" $rel $newrel
+               if [[ $rel = *%* ]]; then
+                       relmacro=${rel#*%}
+                       relnum=${rel%%%*}
+                       newrel=$(expr ${relnum} + 1)
+                       set_release "$spec" $rel "${newrel}%${relmacro}"
+               else
+                       newrel=$(expr ${rel} + 1)
+                       set_release "$spec" $rel $newrel
+               fi
 
                # refetch release
                rel=$(get_release "$spec")
@@ -106,7 +121,7 @@ done
 for file in $(ls "$tmpd" 2>/dev/null); do
        files=$(cat "$tmpd/$file")
        rel=$(basename "$file")
-       msg="- rel $rel${message:+ ($message)}"
+       msg="- release $rel${message:+ ($message)}"
        echo cvs ci -m "'$msg'"
        if [ "$test" != 1 ]; then
                cvs ci -m "$msg" $files