[packages/rpm] include x32 macros for x86_64

glen glen at pld-linux.org
Thu Jan 8 10:35:37 CET 2015


commit 851689fd7b01ca8ecaa3331ac9a470160f8f8183
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Thu Jan 8 10:38:17 2015 +0200

    include x32 macros for x86_64

 rpm.spec | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/rpm.spec b/rpm.spec
index 97e44ff..5dbfeec 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -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
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/rpm.git/commitdiff/851689fd7b01ca8ecaa3331ac9a470160f8f8183



More information about the pld-cvs-commit mailing list