- oops

[packages/rpm.git] / rpm.spec

diff --git a/rpm.spec b/rpm.spec
index 3188fb4b7afc1d7dfb839f65e4d7e19bb1447afb..205d225b2f61975083f0ba1d8171df693779ad44 100644 (file)
--- a/rpm.spec
+++ b/rpm.spec
@@ -35,10 +35,10 @@ Summary(ru.UTF-8):  Менеджер пакетов от RPM
 Summary(uk.UTF-8):     Менеджер пакетів від RPM
 Name:          rpm
 Version:       4.4.9
-Release:       0.1
+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
@@ -72,7 +72,7 @@ Patch7:               %{name}-scripts-closefds.patch
 Patch8:                %{name}-python-macros.patch
 Patch9:                %{name}-gettext-in-header.patch
 Patch10:       %{name}-compress-doc.patch
-
+Patch11:       %{name}-Nmalloc.patch
 Patch12:       %{name}-system_libs.patch
 Patch13:       %{name}-bb-and-short-circuit.patch
 Patch14:       %{name}-etc_dir.patch
@@ -117,7 +117,8 @@ Patch55:    %{name}-truncate-cvslog.patch
 Patch57:       %{name}-as_needed-fix.patch
 Patch58:       %{name}-repackage-wo-lzma.patch
 Patch59:       %{name}-libtool-deps.patch
-URL:           http://wraptastic.org/
+Patch60:       %{name}-obsolete-rpmrc.patch
+URL:           http://rpm5.org/
 BuildRequires: autoconf >= 2.57
 BuildRequires: automake >= 1.4
 BuildRequires: beecrypt-devel >= %{beecrypt_ver}
@@ -166,7 +167,7 @@ Requires:   popt >= %{reqpopt_ver}
 %{!?with_static:Obsoletes:     rpm-utils-static}
 Conflicts:     glibc < 2.2.92
 # ABI changes in rpm, new poldek needed
-Conflicts:     poldek < 0.20.1-0.20070105.0
+Conflicts:     poldek < 0.20.1-0.20070108.1.4
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _binary_payload         w9.gzdio
@@ -655,6 +656,7 @@ Dokumentacja API RPM-a oraz przewodniki w formacie HTML generowane ze
 %patch8 -p1
 %patch9 -p1
 %patch10 -p1
+%patch11 -p1
 %patch12 -p1
 %patch13 -p1
 %patch14 -p1
@@ -686,8 +688,7 @@ install %{SOURCE12} scripts/perl.prov
 %patch28 -p1
 %patch31 -p1
 %patch32 -p1
-# needed? I doubt
-# %patch33 -p1
+%patch33 -p1
 %patch34 -p1
 %patch35 -p0
 %patch36 -p1
@@ -706,6 +707,7 @@ install %{SOURCE12} scripts/perl.prov
 %patch57 -p1
 %patch58 -p1
 %patch59 -p1
+%patch60 -p1
 
 cd scripts
 mv -f perl.req perl.req.in
@@ -787,8 +789,55 @@ 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
+%endif
+
+%ifarch amd64
+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
+%endif
+
+# x86 things
+%ifarch athlon %{x8664}
+echo "athlon-[^-]*-linux(-gnu)?" >> $RPM_BUILD_ROOT%{_sysconfdir}/rpm/platform
+%endif
+%ifarch pentium4 athlon %{x8664}
+echo "pentium4-[^-]*-linux(-gnu)?" >> $RPM_BUILD_ROOT%{_sysconfdir}/rpm/platform
+%endif
+%ifarch pentium3 pentium4 athlon %{x8664}
+echo "pentium3-[^-]*-linux(-gnu)?" >> $RPM_BUILD_ROOT%{_sysconfdir}/rpm/platform
+%endif
+%ifarch i686 pentium3 pentium4 athlon %{x8664}
+echo "i686-[^-]*-linux(-gnu)?" >> $RPM_BUILD_ROOT%{_sysconfdir}/rpm/platform
+%endif
+%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 %{x8664}
+echo "i486-[^-]*-linux(-gnu)?" >> $RPM_BUILD_ROOT%{_sysconfdir}/rpm/platform
+%endif
+%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
+%endif
+
+# noarch
+echo "noarch-[^-]*-.*" >> $RPM_BUILD_ROOT%{_sysconfdir}/rpm/platform
+
 %ifarch %{ppc}
 #sed -e '/_target_platform/s/[%]{_target_cpu}/ppc/' \
 #      -i $RPM_BUILD_ROOT%{_rpmlibdir}/ppc74[05]0-linux/macros
@@ -1107,6 +1156,8 @@ find %{_rpmlibdir} -name '*-linux' -type l | xargs rm -f
 %{_rpmlibdir}/sparc*
 %endif
 %ifarch %{x8664}
+%{_rpmlibdir}/amd64*
+%{_rpmlibdir}/ia32e*
 %{_rpmlibdir}/x86_64*
 %endif
 # must be here for "Requires: rpm-*prov" to work