SOURCES: rpm.macros - add _preserve_env_base and a new way of redefining _p...

[baggins]

Author: baggins                      Date: Thu Feb 12 21:57:21 2009 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- add _preserve_env_base and a new way of redefining _preserve_env,
  due to rpm problems with %{expand:...} in complicated specs (ex. php.spec)

---- Files affected:
SOURCES:
   rpm.macros (1.505 -> 1.506) 

---- Diffs:

================================================================
Index: SOURCES/rpm.macros
diff -u SOURCES/rpm.macros:1.505 SOURCES/rpm.macros:1.506
--- SOURCES/rpm.macros:1.505	Wed Feb 11 21:02:47 2009
+++ SOURCES/rpm.macros	Thu Feb 12 22:57:15 2009
@@ -129,9 +129,10 @@
 # redefine %_preserve_env in following manner:
 #
 #	# ADDITIONAL_VAR is required because [a good reason here]
-#	%{expand:%%define _preserve_env %_preserve_env ADDITIONAL_VAR}
+#	%define _preserve_env %_preserve_env_base ADDITIONAL_VAR
 
-%_preserve_env	PATH HOME TMP TMPDIR
+%_preserve_env_base	PATH HOME TMP TMPDIR
+%_preserve_env %_preserve_env_base
 
 %_clean_env		env -i %(awk -vq="'" -vqq="\\"'\\"" -vq2q="'\\"'" 'BEGIN {
 	split("%{?_preserve_env:%_preserve_env}", P);
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/rpm.macros?r1=1.505&r2=1.506&f=u