- keep parallel downloads to 1; reset release to 1

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

diff --git a/relup.sh b/relup.sh
index 9f3331b6fb6a9a145c249e2ad1cf86c6e28413ea..7963e2a846b527cd2635a8af30e1b174a5d96bf7 100644 (file)
--- a/relup.sh
+++ b/relup.sh
@@ -1,11 +1,8 @@
 #!/bin/sh
-# script to run after "rel up" style change.
+# script to run after "release bump" style change.
 # takes Release from spec and creates commit with message
 # 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)"
+# "- release $rel"
 
 set -e
 
@@ -20,13 +17,15 @@ get_dump() {
 }
 
 usage="Usage:
-${0##*/} [-i] [-t] [-m <MESSAGE>] <SPECLIST>
+${0##*/} [-i] [-u] [-t] [-n] [-m <MESSAGE>] <SPECLIST>
 
 Options:
 -i
   Try to increment package release
--t
-  Test mode. do not commit
+-u
+  cvs update first
+-t | -n
+  Test mode (dry-run). do not commit
 -m
   Specify commit message
 
@@ -34,7 +33,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 +46,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 +56,7 @@ if [ ! -x /usr/bin/getopt ]; then
        exit 1
 fi
 
-t=$(getopt -o 'm:ith' -n "${0##*/}" -- "$@") || exit $?
+t=$(getopt -o 'm:inuth' -n "${0##*/}" -- "$@") || exit $?
 # Note the quotes around `$t': they are essential!
 eval set -- "$t"
 
@@ -66,7 +65,10 @@ while true; do
        -i)
                inc=1
                ;;
-       -t)
+       -u)
+               update=1
+               ;;
+       -t | -n)
                test=1
                ;;
        -m)
@@ -90,12 +92,26 @@ while true; do
 done
 
 tmpd=$(mktemp -d "${TMPDIR:-/tmp}/relXXXXXX")
-for spec in "$@"; do
-       spec=${spec%.spec}.spec
+topdir=$(rpm -E '%{_topdir}')
+cd "$topdir"
+for pkg in "$@"; do
+       name=${pkg%.spec} name=${name##*/}
+       spec=$(rpm -D "name $name" -E '%{_specdir}/%{name}.spec')
+       spec=${spec#$topdir/}
+       if [ "$update" = "1" ]; then
+               ./builder -g -ns "$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")
@@ -103,10 +119,14 @@ for spec in "$@"; do
        echo "$spec" >> "$tmpd/$rel"
 done
 
+n="$(echo -e '\nn')"
+n="${n%%n}"
 for file in $(ls "$tmpd" 2>/dev/null); do
        files=$(cat "$tmpd/$file")
        rel=$(basename "$file")
-       msg="- rel $rel${message:+ ($message)}"
+       msg=""
+       [ -n "$message" ] && msg="$msg- $message$n"
+       msg="$msg- release ${rel%%%*} (by relup.sh)$n"
        echo cvs ci -m "'$msg'"
        if [ "$test" != 1 ]; then
                cvs ci -m "$msg" $files