X-Git-Url: http://git.pld-linux.org/?p=packages%2Frpm.git;a=blobdiff_plain;f=rpm.spec;h=723b5cfb63441f7ba1b44a3d2dc343e24e76f265;hp=b3a7b5cb0f09ec91739b8afe71a8a441b2fdd920;hb=71622d6e98d7542b8c266243a3d60f5e0d8743c2;hpb=2a23f873d89df2bcad57ae766be0fb42c026d34a diff --git a/rpm.spec b/rpm.spec index b3a7b5c..723b5cf 100644 --- a/rpm.spec +++ b/rpm.spec @@ -22,7 +22,7 @@ # force_cpp - force using __cpp other than "%{_target_cpu}-pld-linux-gcc -E" # versions of required libraries -%define reqdb_ver 4.5.20 +%define reqdb_ver 4.6.18 %define reqpopt_ver 1.10.8 %define beecrypt_ver 2:4.1.2-4 %define sover 4.4 @@ -35,7 +35,7 @@ Summary(ru.UTF-8): Менеджер пакетов от RPM Summary(uk.UTF-8): Менеджер пакетів від RPM Name: rpm Version: 4.4.9 -Release: 1 +Release: 5 License: GPL Group: Base Source0: http://rpm5.org/files/rpm/rpm-4.4/%{name}-%{version}.tar.gz @@ -90,7 +90,7 @@ Patch25: %{name}-rpm2cpio-payload.patch Patch26: %{name}-notsc.patch Patch27: %{name}-hack-norpmlibdep.patch Patch28: %{name}-makefile-no_myLDADD_deps.patch - +Patch29: %{name}-macros-dbhash.patch Patch31: %{name}-missing-prototypes.patch Patch32: %{name}-pld-autodep.patch Patch33: %{name}-arch-x86_64.patch @@ -693,6 +693,7 @@ install %{SOURCE12} scripts/perl.prov %patch26 -p1 %patch27 -p1 %patch28 -p1 +%patch29 -p1 %patch31 -p1 %patch32 -p1 %patch33 -p1 @@ -805,6 +806,7 @@ echo "%{_target_cpu}-%{_target_vendor}-linux" > $RPM_BUILD_ROOT%{_sysconfdir}/rp # x86_64 things %ifarch x86_64 +echo "amd64-[^-]*-linux(-gnu)?" >> $RPM_BUILD_ROOT%{_sysconfdir}/rpm/platform echo "x86_64-[^-]*-linux(-gnu)?" >> $RPM_BUILD_ROOT%{_sysconfdir}/rpm/platform %endif @@ -844,6 +846,7 @@ echo "i386-[^-]*-linux(-gnu)?" >> $RPM_BUILD_ROOT%{_sysconfdir}/rpm/platform # ppc %ifarch ppc echo "ppc-[^-]*-linux(-gnu)?" >> $RPM_BUILD_ROOT%{_sysconfdir}/rpm/platform +echo "powerpc-[^-]*-linux(-gnu)?" >> $RPM_BUILD_ROOT%{_sysconfdir}/rpm/platform %endif # noarch