- kill _preserve_env recursion (every call to _clean_env was causing

  _preserve_end self duplication and in result mawk SEGV at some point)

diff --git a/rpm-build-macros.spec b/rpm-build-macros.spec
index fd7f13f5060663f52e9272e7f831d346b8a07e7c..244b1295bdc65737f61b937ec0b1a88cd65ec442 100644 (file)
--- a/rpm-build-macros.spec
+++ b/rpm-build-macros.spec
@@ -11,7 +11,7 @@ Summary:      PLD Linux RPM build macros
 Summary(pl.UTF-8):     Makra do budowania pakietów RPM dla Linuksa PLD
 Name:          rpm-build-macros
 Version:       %{rpm_macros_rev}
-Release:       3
+Release:       4
 License:       GPL
 Group:         Development/Building
 Source0:       rpm.macros

diff --git a/rpm.macros b/rpm.macros
index e33b7738d3480410a88d511ad87349f68a7e4c18..1191109a0abc1091ce7269bb14867fe6d82b82d5 100644 (file)
--- a/rpm.macros
+++ b/rpm.macros
@@ -186,8 +186,8 @@
 %_preserve_env_base    PATH HOME TMP TMPDIR SSH_AUTH_SOCK
 
 # "env -i" must end in first line of expaned macros because it's used as first line of shell script (#! env...)
-%_clean_env            %{!?_preserve_env:%global _preserve_env %{nil}}%{expand:%%global _preserve_env %{_preserve_env} %_preserve_env_base} env -i %(awk -vq="'" -vqq="\\"'\\"" -vq2q="'\\"'" 'BEGIN {
-       split("%{?_preserve_env}", P);
+%_clean_env env -i %(awk -vq="'" -vqq="\\"'\\"" -vq2q="'\\"'" 'BEGIN {
+       split("%{?_preserve_env:%_preserve_env %_preserve_env_base}%{!?_preserve_env:%_preserve_env_base}", P);
        for (i in P) {
                p = P[i];
                if (!ENVIRON[p] || d[p]) {