SPECS: builder - rename .rpmrc and .rpmmacros to prevent accidenta...

[glen]

Author: glen                         Date: Fri Mar  3 10:29:29 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- rename .rpmrc and .rpmmacros to prevent accidental overwrite

---- Files affected:
SPECS:
   builder (1.409 -> 1.410) 

---- Diffs:

================================================================
Index: SPECS/builder
diff -u SPECS/builder:1.409 SPECS/builder:1.410
--- SPECS/builder:1.409	Sat Feb 18 19:42:39 2006
+++ SPECS/builder	Fri Mar  3 11:29:24 2006
@@ -347,12 +347,12 @@
 	# executed here, while none of them are actually needed.
 	# what we need from dump is NAME, VERSION, RELEASE and PATCHES/SOURCES.
 	# at the time of this writing macros.build + macros contained 70 "%(...)" macros.
-	macrofiles="/usr/lib/rpm/macros:$SPECS_DIR/.rpmmacros:~/etc/.rpmmacros:~/.rpmmacros"
+	macrofiles="/usr/lib/rpm/macros:$SPECS_DIR/.builder-rpmmacros:~/etc/.rpmmacros:~/.rpmmacros"
 	dump='%{echo:dummy: PACKAGE_NAME %{name} }%dump'
 	# FIXME: better ideas than .rpmrc?
-	printf 'include:/usr/lib/rpm/rpmrc\nmacrofiles:%s\n' $macrofiles > .rpmrc
+	printf 'include:/usr/lib/rpm/rpmrc\nmacrofiles:%s\n' $macrofiles > .builder-rpmrc
 # TODO: move these to /usr/lib/rpm/macros
-	cat > .rpmmacros <<'EOF'
+	cat > .builder-rpmmacros <<'EOF'
 %requires_releq_kernel_up %{nil}
 %requires_releq_kernel_smp %{nil}
 %requires_releq() %{nil}
@@ -379,7 +379,7 @@
 		ARGS='--nodigest --nosignature --nobuild'
 		;;
 	esac
-	$RPMBUILD --rcfile .rpmrc $ARGS --nodeps --define "prep $dump" $BCOND $TARGET_SWITCH $SPECFILE 2>&1
+	$RPMBUILD --rcfile .builder-rpmrc $ARGS --nodeps --define "prep $dump" $BCOND $TARGET_SWITCH $SPECFILE 2>&1
 	`
 	if [ $? -gt 0 ]; then
 		error=$(echo "$rpm_dump" | sed -ne '/^error:/,$p')
================================================================

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