SPECS: builder - set_spec_target after fetching SPECFILE

[glen]

Author: glen                         Date: Sun Sep 11 12:25:43 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- set_spec_target after fetching SPECFILE

---- Files affected:
SPECS:
   builder (1.328 -> 1.329) 

---- Diffs:

================================================================
Index: SPECS/builder
diff -u SPECS/builder:1.328 SPECS/builder:1.329
--- SPECS/builder:1.328	Sat Sep 10 13:54:42 2005
+++ SPECS/builder	Sun Sep 11 14:25:35 2005
@@ -283,17 +283,35 @@
 "
 }
 
+# set TARGET from BuildArch: from SPECFILE
+set_spec_target() {
+	 if [ -n "$SPECFILE" ] && [ -z "$TARGET" ]; then
+		  tmp=$(awk '/^BuildArch:/ { print $NF}' $SPECFILE)
+		  if [ "$tmp" ]; then
+				TARGET="$tmp"
+				case "$RPMBUILD" in
+				"rpmbuild")
+					 TARGET_SWITCH="--target $TARGET" ;;
+				"rpm")
+					 TARGET_SWITCH="--target=$TARGET" ;;
+				esac
+		  fi
+	 fi
+}
+
 cache_rpm_dump () {
 	 if [ -n "$DEBUG" ]; then
 		  set -x;
 		  set -v;
 	 fi
+
 rpm_dump_cache=`
 	case "$RPMBUILD" in
 		rpm )
 			rpm -bp --nodeps --define 'prep %dump' $BCOND $TARGET_SWITCH $SPECFILE 2>&1
 			;;
 		rpmbuild )
+		# FIXME: no $TARGET_SWITCH here needed?
 			rpmbuild --nodigest --nosignature --define 'prep %dump' $BCOND $SPECFILE 2>&1
 			;;
 	esac`
@@ -473,6 +491,8 @@
 	fi
 	unset OPTIONS
 	[ -n "$DONT_PRINT_REVISION" ] || grep -E -m 1 "^#.*Revision:.*Date" $SPECFILE
+
+	 set_spec_target
 }
 
 find_mirror()
@@ -1634,13 +1654,6 @@
 if [ -n "$DEBUG" ]; then
 	set -x;
 	set -v;
-fi
-
-if [ -n "$SPECFILE" ] && [ -z "$TARGET" ]; then
-	 tmp=$(awk  '/^BuildArch:/ { print $NF}' $SPECFILE)
-	 if [ "$tmp" ]; then
-		  TARGET="$tmp"
-	 fi
 fi
 
 if [ -n "$TARGET" ]; then
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/builder?r1=1.328&r2=1.329&f=u