- added bzip2_fallback.patch

[packages/rpm.git] / rpm.macros

diff --git a/rpm.macros b/rpm.macros
index 46dca7f63844b0e3109855b778c4736f3c2636cc..1bd798df8899b5f6e4e8e2e1827933e07c6ec25e 100644 (file)
--- a/rpm.macros
+++ b/rpm.macros
@@ -58,9 +58,9 @@ fi; \
 # Requires:            awk
 #
 # Flags specified in %filterout_* are removed from %rpm*flags, exactly:
-# %rpmcflags   = %optflags - %filterout_c - %filterout_ld
-# %rpmcxxflags = %rpmcflags - %filterout_cxx
-# %rpmldflags  = %optldflags - %filterout_ld
+# %rpmcflags    = %optflags - %filterout - %filterout_c   - %filterout_ld
+# %rpmcxxflags  = %optflags - %filterout - %filterout_cxx - %filterout_ld
+# %rpmldflags   = %optldflags - %filterout_ld
 #
 # Regular expressions are supported, but to avoid some character be treated
 # as regular expression it must be escaped twice.
@@ -75,13 +75,13 @@ fi; \
 
 %rpmcflags %(awk 'BEGIN {
        split("%{?debug:%debugcflags}%{!?debug:%optflags}%{?debuginfocflags}",I);
-       split("%{?filterout_c} %{?filterout_ld}",F);
+       split("%{?filterout} %{?filterout_c} %{?filterout_ld}",F);
        %{filter_out}
 }')
 
 %rpmcxxflags %(awk 'BEGIN {
-       split("%{rpmcflags}",I);
-       split("%{?filterout_cxx}",F);
+       split("%{?debug:%debugcflags}%{!?debug:%optflags}%{?debuginfocflags}",I);
+       split("%{?filterout} %{?filterout_cxx} %{?filterout_ld}",F);
        %{filter_out}
 }')
 
@@ -693,7 +693,7 @@ else \
                %{-M} \\\
                %{-G:-G %{-G*}} \\\
                %{expand:%{%{#}}} 1>&2 || exit $? \
-       [ ! -x /usr/sbin/nscd ] || /usr/sbin/nscd -i passwd \
+       [ ! -x /usr/sbin/nscd ] || /usr/sbin/nscd -i passwd || : \
 fi;
 
 # Usage:
@@ -715,7 +715,7 @@ if [ -n "`/usr/bin/getgid %{1}`" ]; then \
 else \
        echo "Adding group %{1} GID=%{-g*}." \
        /usr/sbin/groupadd -g %{-g*} -r %{1} 1>&2 || exit $? \
-       [ ! -x /usr/sbin/nscd ] || /usr/sbin/nscd -i group \
+       [ ! -x /usr/sbin/nscd ] || /usr/sbin/nscd -i group || : \
 fi;
 
 # apache_config_{install/uninstall} macros written by glen@pld-linux.org.
@@ -1043,4 +1043,6 @@ for schema in %*; do \
 done \
 %{nil}
 
+%env_update [ ! -x /sbin/env-update ] || /sbin/env-update -u || :
+
 # vim:ts=4 sw=4 noet