From 8ebeba63bde7f000561e3a61ced2884adeb7926b Mon Sep 17 00:00:00 2001 From: =?utf8?q?Arkadiusz=20Mi=C5=9Bkiewicz?= Date: Tue, 6 Feb 2007 19:10:26 +0000 Subject: [PATCH] - some rpm packages do not have /usr/lib/rpm/rpmrc Changed files: builder.sh -> 1.475 --- builder.sh | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/builder.sh b/builder.sh index 304d060..1613ecd 100644 --- a/builder.sh +++ b/builder.sh @@ -380,8 +380,12 @@ cache_rpm_dump () { # 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} -- 2.44.0