- pld specific macros must not override arch target ones

[packages/rpm.git] / rpm.spec

diff --git a/rpm.spec b/rpm.spec
index 97e44ffe437361e79a7a3f93b02f1b298620d702..5998f6623d1b04fa64b1b2ca52765f290a0c154d 100644 (file)
--- a/rpm.spec
+++ b/rpm.spec
@@ -1047,7 +1047,7 @@ sed -i \
        --with-lua=%{!?with_system_lua:internal}%{?with_system_lua:external} \
        --with-lzma=external \
        --with-neon=%{?with_neon:external}%{!?with_neon:no} \
-       --with-path-macros='%{_rpmlibdir}/macros:%{_rpmlibdir}/%%{_target}/macros:%{_rpmlibdir}/macros.d/pld:%{_rpmlibdir}/macros.build:%{_sysconfdir}/rpm/macros.*:%{_sysconfdir}/rpm/macros:%{_sysconfdir}/rpm/%%{_target}/macros:%{_sysconfdir}/rpm/macros.d/*.macros:~/etc/.rpmmacros:~/.rpmmacros' \
+       --with-path-macros='%{_rpmlibdir}/macros:%{_rpmlibdir}/macros.d/pld:%{_rpmlibdir}/%%{_target}/macros:%{_rpmlibdir}/macros.build:%{_sysconfdir}/rpm/macros.*:%{_sysconfdir}/rpm/macros:%{_sysconfdir}/rpm/%%{_target}/macros:%{_sysconfdir}/rpm/macros.d/*.macros:~/etc/.rpmmacros:~/.rpmmacros' \
        --without-path-versioned \
        --with-pcre=%{!?with_system_pcre:internal}%{?with_system_pcre:external} \
        --with-popt=external \
@@ -1113,9 +1113,10 @@ rm $RPM_BUILD_ROOT%{_rpmlibdir}/pentium4-linux/macros
 %endif
 
 %ifnarch %{x8664}
-rm $RPM_BUILD_ROOT%{_rpmlibdir}/x86_64-linux/macros
-rm $RPM_BUILD_ROOT%{_rpmlibdir}/ia32e-linux/macros
 rm $RPM_BUILD_ROOT%{_rpmlibdir}/amd64-linux/macros
+rm $RPM_BUILD_ROOT%{_rpmlibdir}/ia32e-linux/macros
+rm $RPM_BUILD_ROOT%{_rpmlibdir}/x32*-linux/macros
+rm $RPM_BUILD_ROOT%{_rpmlibdir}/x86_64-linux/macros
 %endif
 
 %ifnarch %{ppc}
@@ -1131,7 +1132,6 @@ rm $RPM_BUILD_ROOT%{_rpmlibdir}/ppc*series-linux/macros
 rm $RPM_BUILD_ROOT%{_rpmlibdir}/ppc64*-linux/macros
 rm $RPM_BUILD_ROOT%{_rpmlibdir}/s390*-linux/macros
 rm $RPM_BUILD_ROOT%{_rpmlibdir}/sparc*-linux/macros
-rm $RPM_BUILD_ROOT%{_rpmlibdir}/x32*-linux/macros
 
 cat <<'EOF' > $RPM_BUILD_ROOT%{_sysconfdir}/rpm/platform
 # first platform file entry can't contain regexps