X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=rpm.spec;h=23f163f805073d3113d38a16697f859d71aef7b0;hb=2d8ae03ebcbc56f0604c359ddbfa43cb9356f6dd;hp=0ae89e2de2350de2df3359539de4b9c26f6a4df5;hpb=99ad19f2b4794d9de622e683142052b00240be04;p=packages%2Frpm.git

diff --git a/rpm.spec b/rpm.spec
index 0ae89e2..23f163f 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -35,7 +35,7 @@ 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
@@ -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
@@ -656,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
@@ -687,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
@@ -791,6 +791,52 @@ install -d $RPM_BUILD_ROOT{/%{_lib},/etc/sysconfig,%{_sysconfdir}/rpm,/var/lib/b
 
 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
+echo "athlon-[^-]*-linux(-gnu?)" >> $RPM_BUILD_ROOT%{_sysconfdir}/rpm/platform
+%endif
+%ifarch pentium4 athlon
+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
+%endif
+%ifarch i686 pentium3 pentium4 athlon
+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
+%endif
+%ifarch i486 i586 i686 pentium3 pentium4 athlon
+echo "i486-[^-]*-linux(-gnu?)" >> $RPM_BUILD_ROOT%{_sysconfdir}/rpm/platform
+%endif
+%ifarch %{ix86}
+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
@@ -1109,6 +1155,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