[packages/rpm/32_on_64: 3/3] package ix86 macros on ix8664

[draenog]

commit 5f5af126f5abb791a3c57f12fb3aac94be04ca35
Author: Kacper Kornet <draenog at pld-linux.org>
Date:   Tue Aug 27 21:08:58 2013 +0100

    package ix86 macros on ix8664
    
    ix8664 hosts can compile ix86 packages. But to do it correctly
    the macros for the given architecture have to be present.

 rpm.spec | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/rpm.spec b/rpm.spec
index 0c5bd3a..44e666f 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -43,7 +43,7 @@ Summary(ru.UTF-8):	Менеджер пакетов от RPM
 Summary(uk.UTF-8):	Менеджер пакетів від RPM
 Name:		rpm
 Version:	5.4.12
-Release:	2.1
+Release:	2.2
 License:	LGPL v2.1
 Group:		Base
 # http://rpm5.org/files/rpm/rpm-5.4/rpm-5.4.12-0.20130725.src.rpm
@@ -1048,7 +1048,7 @@ install %{SOURCE16} $RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg/PLD-3.0-Th-GPG-key
 install -d $RPM_BUILD_ROOT%{_rpmlibdir}/noarch-linux
 install cpu-os-macros/noarch-linux/macros $RPM_BUILD_ROOT%{_rpmlibdir}/noarch-linux/macros
 
-%ifarch %{ix86}
+%ifarch %{ix86} %{x8664}
 install -d $RPM_BUILD_ROOT%{_rpmlibdir}/{i386,i486,i586,i686,athlon,pentium3,pentium4}-linux
 install cpu-os-macros/athlon-linux/macros   $RPM_BUILD_ROOT%{_rpmlibdir}/athlon-linux/macros
 install cpu-os-macros/i386-linux/macros     $RPM_BUILD_ROOT%{_rpmlibdir}/i386-linux/macros
@@ -1323,7 +1323,7 @@ find %{_rpmlibdir} -name '*-linux' -type l | xargs rm -f
 %{_rpmlibdir}/macros.d/pld
 %{_rpmlibdir}/cpuinfo.yaml
 %{_rpmlibdir}/noarch-*
-%ifarch %{ix86}
+%ifarch %{ix86} %{x8664}
 %{_rpmlibdir}/i?86*
 %{_rpmlibdir}/pentium*
 %{_rpmlibdir}/athlon*
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/rpm.git/commitdiff/5f5af126f5abb791a3c57f12fb3aac94be04ca35