SPECS: builder - pass used spec branch to rpmbuild as %_cvstag macro
glen
glen at pld-linux.org
Wed Sep 24 14:26:20 CEST 2008
Author: glen Date: Wed Sep 24 12:26:20 2008 GMT
Module: SPECS Tag: HEAD
---- Log message:
- pass used spec branch to rpmbuild as %_cvstag macro
---- Files affected:
SPECS:
builder (1.562 -> 1.563)
---- Diffs:
================================================================
Index: SPECS/builder
diff -u SPECS/builder:1.562 SPECS/builder:1.563
--- SPECS/builder:1.562 Mon Jun 30 12:21:38 2008
+++ SPECS/builder Wed Sep 24 14:26:14 2008
@@ -2140,9 +2140,13 @@
--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=
@@ -2281,6 +2285,11 @@
elif [ "$CVSTAG" = "HEAD" ]; then
# assume -r HEAD is same as -A
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
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/builder?r1=1.562&r2=1.563&f=u
More information about the pld-cvs-commit
mailing list