- fixed libtool-deps patch, release 5

[packages/rpm.git] / rpm.spec

diff --git a/rpm.spec b/rpm.spec
index c9eb3f3e8bcef00893b9273611ca062422076259..723b5cfb63441f7ba1b44a3d2dc343e24e76f265 100644 (file)
--- 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
@@ -118,6 +118,8 @@ Patch57:    %{name}-as_needed-fix.patch
 Patch58:       %{name}-repackage-wo-lzma.patch
 Patch59:       %{name}-libtool-deps.patch
 Patch60:       %{name}-obsolete-rpmrc.patch
+Patch61:       %{name}-sparc64.patch
+Patch62:       %{name}-rpmdb.patch
 URL:           http://rpm5.org/
 BuildRequires: autoconf >= 2.57
 BuildRequires: automake >= 1.4
@@ -125,6 +127,10 @@ BuildRequires:     beecrypt-devel >= %{beecrypt_ver}
 BuildRequires: bzip2-devel >= 1.0.2-17
 BuildRequires: db-devel >= %{reqdb_ver}
 BuildRequires: elfutils-devel >= 0.108
+%ifnarch sparc64
+# -fPIE/-pie
+BuildRequires: gcc >= 5:3.4
+%endif
 BuildRequires: gettext-devel >= 0.11.4-2
 %{?with_system_libmagic:BuildRequires: libmagic-devel}
 %{?with_selinux:BuildRequires: libselinux-devel >= 1.18}
@@ -687,6 +693,7 @@ install %{SOURCE12} scripts/perl.prov
 %patch26 -p1
 %patch27 -p1
 %patch28 -p1
+%patch29 -p1
 %patch31 -p1
 %patch32 -p1
 %patch33 -p1
@@ -709,6 +716,10 @@ install %{SOURCE12} scripts/perl.prov
 %patch58 -p1
 %patch59 -p1
 %patch60 -p1
+%ifarch sparc64
+%patch61 -p1
+%endif
+%patch62 -p1
 
 cd scripts
 mv -f perl.req perl.req.in
@@ -795,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
 
@@ -834,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