- pass used spec branch to rpmbuild as %_cvstag macro

Changed files:
    builder.sh -> 1.563

diff --git a/builder.sh b/builder.sh
index 83432bc0cae42ea5993adcf452012b598fe0bee7..7ff2d678bafcb9f6a1e35e32b912358e26585149 100644 (file)
--- a/builder.sh
+++ b/builder.sh
@@ -2140,9 +2140,13 @@ while [ $# -gt 0 ]; do
                --date )
                        CVSDATE="${2}"; shift 2 ;;
                -r | --cvstag )
-                       shift; CVSTAG="${1}"; shift ;;
+                       CVSTAG="$2"
+                       shift 2
+                       ;;
                -A)
-                       shift; CVSTAG="HEAD"; ;;
+                       shift
+                       CVSTAG="HEAD"
+                       ;;
                -R | --fetch-build-requires)
                        FETCH_BUILD_REQUIRES="yes"
                        NOT_INSTALLED_PACKAGES=
@@ -2283,6 +2287,11 @@ elif [ "$CVSTAG" = "HEAD" ]; then
        CVSTAG=""
 fi
 
+if [ "$CVSTAG" ]; then
+       # pass $CVSTAG used by builder to rpmbuild too, so specs could use it
+       RPMOPTS="$RPMOPTS --define \"_cvstag $CVSTAG\""
+fi
+
 if [ -n "$DEBUG" ]; then
        set -x
        set -v