SOURCES: rpm.macros - changes suggested by pluto

[sparky]

Author: sparky                       Date: Sun Aug  6 19:05:12 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- changes suggested by pluto

---- Files affected:
SOURCES:
   rpm.macros (1.314 -> 1.315) 

---- Diffs:

================================================================
Index: SOURCES/rpm.macros
diff -u SOURCES/rpm.macros:1.314 SOURCES/rpm.macros:1.315
--- SOURCES/rpm.macros:1.314	Sat Aug  5 21:08:08 2006
+++ SOURCES/rpm.macros	Sun Aug  6 21:05:06 2006
@@ -58,9 +58,9 @@
 # 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 @@
 
 %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}
 }')
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/rpm.macros?r1=1.314&r2=1.315&f=u