From: Arkadiusz Miśkiewicz <arekm@maven.pl>
Date: Sat, 28 Mar 2009 13:03:36 +0000 (+0000)
Subject: - fix env cleaning
X-Git-Tag: auto/ac/rpm-build-macros-1_516-1
X-Git-Url: http://git.pld-linux.org/?p=packages%2Frpm.git;a=commitdiff_plain;h=25e5fad01f88c08f5ee059b708e700de3e06824d

- fix env cleaning

Changed files:
    rpm.macros -> 1.516
---

diff --git a/rpm.macros b/rpm.macros
index 3f08edc..6673a89 100644
--- a/rpm.macros
+++ b/rpm.macros
@@ -141,9 +141,8 @@
 
 %_preserve_env_base	PATH HOME TMP TMPDIR SSH_AUTH_SOCK
 
-%_clean_env		\
-	%{!?_preserve_env:%global _preserve_env %{nil}}%{expand:%%global _preserve_env %{_preserve_env} %_preserve_env_base} \
-	env -i %(awk -vq="'" -vqq="\\"'\\"" -vq2q="'\\"'" 'BEGIN {
+# "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);
 	for (i in P) {
 		p = P[i];