- oops

[packages/rpm.git] / rpm.spec

diff --git a/rpm.spec b/rpm.spec
index 23f163f805073d3113d38a16697f859d71aef7b0..205d225b2f61975083f0ba1d8171df693779ad44 100644 (file)
--- a/rpm.spec
+++ b/rpm.spec
@@ -38,7 +38,7 @@ Version:      4.4.9
 Release:       0.3
 License:       GPL
 Group:         Base
-Source0:       ftp://jbj.org/pub/rpm-4.4.x/%{name}-%{version}.tar.gz
+Source0:       http://rpm5.org/files/rpm/rpm-4.4/%{name}-%{version}.tar.gz
 # Source0-md5: 210b768006e7d88dd8a3bcd498ea27f6
 Source1:       %{name}.groups
 Source2:       %{name}.platform
@@ -118,7 +118,7 @@ Patch57:    %{name}-as_needed-fix.patch
 Patch58:       %{name}-repackage-wo-lzma.patch
 Patch59:       %{name}-libtool-deps.patch
 Patch60:       %{name}-obsolete-rpmrc.patch
-URL:           http://wraptastic.org/
+URL:           http://rpm5.org/
 BuildRequires: autoconf >= 2.57
 BuildRequires: automake >= 1.4
 BuildRequires: beecrypt-devel >= %{beecrypt_ver}
@@ -789,49 +789,50 @@ install -d $RPM_BUILD_ROOT{/%{_lib},/etc/sysconfig,%{_sysconfdir}/rpm,/var/lib/b
        pylibdir=%{py_libdir} \
        pkgbindir="%{_bindir}"
 
+# 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
-echo "x86_64-[^-]*-linux(-gnu?)" >> $RPM_BUILD_ROOT%{_sysconfdir}/rpm/platform
+echo "x86_64-[^-]*-linux(-gnu)?" >> $RPM_BUILD_ROOT%{_sysconfdir}/rpm/platform
 %endif
 
 %ifarch amd64
-echo "amd64-[^-]*-linux(-gnu?)" >> $RPM_BUILD_ROOT%{_sysconfdir}/rpm/platform
-echo "x86_64-[^-]*-linux(-gnu?)" >> $RPM_BUILD_ROOT%{_sysconfdir}/rpm/platform
+echo "amd64-[^-]*-linux(-gnu)?" >> $RPM_BUILD_ROOT%{_sysconfdir}/rpm/platform
+echo "x86_64-[^-]*-linux(-gnu)?" >> $RPM_BUILD_ROOT%{_sysconfdir}/rpm/platform
 %endif
 
 %ifarch ia32e
-echo "ia32e-[^-]*-linux(-gnu?)" >> $RPM_BUILD_ROOT%{_sysconfdir}/rpm/platform
-echo "x86_64-[^-]*-linux(-gnu?)" >> $RPM_BUILD_ROOT%{_sysconfdir}/rpm/platform
+echo "ia32e-[^-]*-linux(-gnu)?" >> $RPM_BUILD_ROOT%{_sysconfdir}/rpm/platform
+echo "x86_64-[^-]*-linux(-gnu)?" >> $RPM_BUILD_ROOT%{_sysconfdir}/rpm/platform
 %endif
 
 # x86 things
-%ifarch athlon
-echo "athlon-[^-]*-linux(-gnu?)" >> $RPM_BUILD_ROOT%{_sysconfdir}/rpm/platform
+%ifarch athlon %{x8664}
+echo "athlon-[^-]*-linux(-gnu)?" >> $RPM_BUILD_ROOT%{_sysconfdir}/rpm/platform
 %endif
-%ifarch pentium4 athlon
-echo "pentium4-[^-]*-linux(-gnu?)" >> $RPM_BUILD_ROOT%{_sysconfdir}/rpm/platform
+%ifarch pentium4 athlon %{x8664}
+echo "pentium4-[^-]*-linux(-gnu)?" >> $RPM_BUILD_ROOT%{_sysconfdir}/rpm/platform
 %endif
-%ifarch pentium3 pentium4 athlon
-echo "pentium3-[^-]*-linux(-gnu?)" >> $RPM_BUILD_ROOT%{_sysconfdir}/rpm/platform
+%ifarch pentium3 pentium4 athlon %{x8664}
+echo "pentium3-[^-]*-linux(-gnu)?" >> $RPM_BUILD_ROOT%{_sysconfdir}/rpm/platform
 %endif
-%ifarch i686 pentium3 pentium4 athlon
-echo "i686-[^-]*-linux(-gnu?)" >> $RPM_BUILD_ROOT%{_sysconfdir}/rpm/platform
+%ifarch i686 pentium3 pentium4 athlon %{x8664}
+echo "i686-[^-]*-linux(-gnu)?" >> $RPM_BUILD_ROOT%{_sysconfdir}/rpm/platform
 %endif
-%ifarch i586 i686 pentium3 pentium4 athlon
-echo "i586-[^-]*-linux(-gnu?)" >> $RPM_BUILD_ROOT%{_sysconfdir}/rpm/platform
+%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
-echo "i486-[^-]*-linux(-gnu?)" >> $RPM_BUILD_ROOT%{_sysconfdir}/rpm/platform
+%ifarch i486 i586 i686 pentium3 pentium4 athlon %{x8664}
+echo "i486-[^-]*-linux(-gnu)?" >> $RPM_BUILD_ROOT%{_sysconfdir}/rpm/platform
 %endif
-%ifarch %{ix86}
-echo "i386-[^-]*-linux(-gnu?)" >> $RPM_BUILD_ROOT%{_sysconfdir}/rpm/platform
+%ifarch %{ix86} %{x8664}
+echo "i386-[^-]*-linux(-gnu)?" >> $RPM_BUILD_ROOT%{_sysconfdir}/rpm/platform
 %endif
 
 # ppc
 %ifarch ppc
-echo "ppc-[^-]*-linux(-gnu?)" >> $RPM_BUILD_ROOT%{_sysconfdir}/rpm/platform
+echo "ppc-[^-]*-linux(-gnu)?" >> $RPM_BUILD_ROOT%{_sysconfdir}/rpm/platform
 %endif
 
 # noarch