SPECS: builder - some rpm packages do not have /usr/lib/rpm/rpmrc

arekm arekm at pld-linux.org
Tue Feb 6 20:10:31 CET 2007


Author: arekm                        Date: Tue Feb  6 19:10:31 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- some rpm packages do not have /usr/lib/rpm/rpmrc

---- Files affected:
SPECS:
   builder (1.474 -> 1.475) 

---- Diffs:

================================================================
Index: SPECS/builder
diff -u SPECS/builder:1.474 SPECS/builder:1.475
--- SPECS/builder:1.474	Wed Jan 31 23:57:02 2007
+++ SPECS/builder	Tue Feb  6 20:10:26 2007
@@ -380,8 +380,12 @@
 	# at the time of this writing macros.build + macros contained 70 "%(...)" macros.
 	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 > .builder-rpmrc
+	if [ -f /usr/lib/rpm/rpmrc ]; then
+		# FIXME: better ideas than .rpmrc?
+		printf 'include:/usr/lib/rpm/rpmrc\nmacrofiles:%s\n' $macrofiles > .builder-rpmrc
+	else
+		printf 'macrofiles:%s\n' $macrofiles > .builder-rpmrc
+	fi
 # TODO: move these to /usr/lib/rpm/macros
 	cat > .builder-rpmmacros <<'EOF'
 %alt_kernel %{nil}
================================================================

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



More information about the pld-cvs-commit mailing list