SPECS: rpm.spec - looks like we need ix86 arches in x86_64 platfor...

[arekm]

Author: arekm                        Date: Sat Jun  2 22:00:58 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- looks like we need ix86 arches in x86_64 platform file for multiarch support

---- Files affected:
SPECS:
   rpm.spec (1.821 -> 1.822) 

---- Diffs:

================================================================
Index: SPECS/rpm.spec
diff -u SPECS/rpm.spec:1.821 SPECS/rpm.spec:1.822
--- SPECS/rpm.spec:1.821	Tue May 29 19:05:34 2007
+++ SPECS/rpm.spec	Sun Jun  3 00:00:52 2007
@@ -809,25 +809,25 @@
 %endif
 
 # x86 things
-%ifarch athlon
+%ifarch athlon %{x8664}
 echo "athlon-[^-]*-linux(-gnu)?" >> $RPM_BUILD_ROOT%{_sysconfdir}/rpm/platform
 %endif
-%ifarch pentium4 athlon
+%ifarch pentium4 athlon %{x8664}
 echo "pentium4-[^-]*-linux(-gnu)?" >> $RPM_BUILD_ROOT%{_sysconfdir}/rpm/platform
 %endif
-%ifarch pentium3 pentium4 athlon
+%ifarch pentium3 pentium4 athlon %{x8664}
 echo "pentium3-[^-]*-linux(-gnu)?" >> $RPM_BUILD_ROOT%{_sysconfdir}/rpm/platform
 %endif
-%ifarch i686 pentium3 pentium4 athlon
+%ifarch i686 pentium3 pentium4 athlon %{x8664}
 echo "i686-[^-]*-linux(-gnu)?" >> $RPM_BUILD_ROOT%{_sysconfdir}/rpm/platform
 %endif
-%ifarch i586 i686 pentium3 pentium4 athlon
+%ifarch i586 i686 pentium3 pentium4 athlon %{x8664}
 echo "i586-[^-]*-linux(-gnu)?" >> $RPM_BUILD_ROOT%{_sysconfdir}/rpm/platform
 %endif
-%ifarch i486 i586 i686 pentium3 pentium4 athlon
+%ifarch i486 i586 i686 pentium3 pentium4 athlon %{x8664}
 echo "i486-[^-]*-linux(-gnu)?" >> $RPM_BUILD_ROOT%{_sysconfdir}/rpm/platform
 %endif
-%ifarch %{ix86}
+%ifarch %{ix86} %{x8664}
 echo "i386-[^-]*-linux(-gnu)?" >> $RPM_BUILD_ROOT%{_sysconfdir}/rpm/platform
 %endif
 
@@ -1235,6 +1235,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.822  2007/06/02 22:00:52  arekm
+- looks like we need ix86 arches in x86_64 platform file for multiarch support
+
 Revision 1.821  2007/05/29 17:05:34  arekm
 - first platform file entry can't contain regexps
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/rpm.spec?r1=1.821&r2=1.822&f=u