- add _preserve_env_base and a new way of redefining _preserve_env,

  due to rpm problems with %{expand:...} in complicated specs (ex. php.spec)

Changed files:
    rpm.macros -> 1.506

diff --git a/rpm.macros b/rpm.macros
index 979ee29b2909fe6c9f0f4c858f5b7b12a4edf4dd..b6abb758f95642d1d216d54a0814f53d2106cdda 100644 (file)
--- a/rpm.macros
+++ b/rpm.macros
@@ -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);