- oops

[packages/rpm.git] / rpm.spec

diff --git a/rpm.spec b/rpm.spec
index 1df1d20d842a7fea18fc4e676e40e11165bdce8f..205d225b2f61975083f0ba1d8171df693779ad44 100644 (file)
--- a/rpm.spec
+++ b/rpm.spec
@@ -789,7 +789,8 @@ install -d $RPM_BUILD_ROOT{/%{_lib},/etc/sysconfig,%{_sysconfdir}/rpm,/var/lib/b
        pylibdir=%{py_libdir} \
        pkgbindir="%{_bindir}"
 
-echo "%{_target_cpu}-%{_target_vendor}-linux(-gnu)?" > $RPM_BUILD_ROOT%{_sysconfdir}/rpm/platform
+# first platform file entry can't contain regexps
+echo "%{_target_cpu}-%{_target_vendor}-linux-gnu" > $RPM_BUILD_ROOT%{_sysconfdir}/rpm/platform
 
 # x86_64 things
 %ifarch x86_64
@@ -807,25 +808,25 @@ echo "x86_64-[^-]*-linux(-gnu)?" >> $RPM_BUILD_ROOT%{_sysconfdir}/rpm/platform
 %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