SPECS: builder - don't use rpmrc in check_buildarch(), it makes rp...

[arekm]

Author: arekm                        Date: Thu Mar  8 07:28:34 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- don't use rpmrc in check_buildarch(), it makes rpm 4.4.7 to fail

---- Files affected:
SPECS:
   builder (1.493 -> 1.494) 

---- Diffs:

================================================================
Index: SPECS/builder
diff -u SPECS/builder:1.493 SPECS/builder:1.494
--- SPECS/builder:1.493	Wed Mar  7 22:58:52 2007
+++ SPECS/builder	Thu Mar  8 08:28:29 2007
@@ -372,6 +372,11 @@
 
 # runs rpm with minimal macroset
 minirpm() {
+	nprpmrc=no
+	if [ "$1" = "--norpmrc" ]; then
+		norpmrc=yes
+		shift
+	fi
 	# we reset macros not to contain macros.build as all the %() macros are
 	# executed here, while none of them are actually needed.
 	# at the time of this writing macros.build + macros contained 70 "%(...)" macros.
@@ -426,7 +431,9 @@
 %_sourcedir ./
 EOF
 	fi
-	eval $RPMBUILD --rcfile .builder-rpmrc $QUIET $RPMOPTS $RPMBUILDOPTS $BCOND $TARGET_SWITCH $* 2>&1
+	LOCAL_RPMRC="--rcfile .builder-rpmrc"
+	[ "$norpmrc" = "yes" ] && LOCAL_RPMRC=""
+	eval $RPMBUILD $LOCAL_RPMRC $QUIET $RPMOPTS $RPMBUILDOPTS $BCOND $TARGET_SWITCH $* 2>&1
 }
 
 cache_rpm_dump() {
@@ -1196,7 +1203,7 @@
 # this avoids unneccessary BR filling.
 check_buildarch() {
 	local out ret
-	out=$(minirpm --short-circuit -bp --define "'prep exit 0'" --nodeps $SPECFILE 2>&1)
+	out=$(minirpm --norpmrc --short-circuit -bp --define "'prep exit 0'" --nodeps $SPECFILE 2>&1)
 	ret=$?
 	if [ $ret -ne 0 ]; then
 		echo >&2 "$out"
================================================================

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