Actually use the %{_clean_env} in %build and %install

Default %{___build_pre} provided in the rpm-build package does
clear some environment variables (locale), but there are other,
that can break build (e.g. $http_proxy may break Python tests using
http://localhost/ URLs).

Version: 1.688

diff --git a/rpm-build-macros.spec b/rpm-build-macros.spec
index 2d8a619677c25bc20608455ee4dbf47adf07efbc..b1230ab936c9589216d710730730f3d738f2b64b 100644 (file)
--- a/rpm-build-macros.spec
+++ b/rpm-build-macros.spec
@@ -5,7 +5,7 @@
 %if "%{pld_release}" == "ac"
 %define        with_rpm4       1
 %endif
-%define                rpm_macros_rev  1.687
+%define                rpm_macros_rev  1.688
 %define                find_lang_rev   1.36
 Summary:       PLD Linux RPM build macros
 Summary(pl.UTF-8):     Makra do budowania pakietów RPM dla Linuksa PLD

diff --git a/rpm.macros b/rpm.macros
index 04b5ce8b2c0d76099a463776946f053ce7cfc342..b7370d9b5b6d4b301c69e0e32362cd0e334bbcb1 100644 (file)
--- a/rpm.macros
+++ b/rpm.macros
@@ -208,6 +208,16 @@
        }
 }')
 
+# override %__spec_build_pre and %__spec_install_pre from macros.rpmbuild
+# adding %{_clean_env}
+%__spec_build_pre      %{_clean_env}\
+%{___build_pre}\
+%{nil}
+%__spec_install_pre    %{_clean_env}\
+%{___build_pre}\
+%{?buildroot:%{__rm} -rf '%{buildroot}'; %{__mkdir_p} '%{buildroot}'}\
+%{nil}
+
 #-----------------------------------------------------------------
 %configure2_13 { \
  if [ -n "$LINGUAS" ]; then unset LINGUAS; fi; \