Don't hardcode target cpu in _target_platform on x32. Release 16

[packages/rpm.git] / rpm.spec

diff --git a/rpm.spec b/rpm.spec
index ead7168ab3bbff1ca5f600b9bd252bb46b224e95..384382c28ca50f22c961275accdd8f520c0bc07b 100644 (file)
--- a/rpm.spec
+++ b/rpm.spec
@@ -51,7 +51,7 @@ Summary(ru.UTF-8):    Менеджер пакетов от RPM
 Summary(uk.UTF-8):     Менеджер пакетів від RPM
 Name:          rpm
 Version:       5.4.15
-Release:       11
+Release:       16
 License:       LGPL v2.1
 Group:         Base
 # http://rpm5.org/files/rpm/rpm-5.4/rpm-5.4.15-0.20140824.src.rpm
@@ -176,6 +176,7 @@ Patch86:    rpm-CVE-2014-8118.patch
 Patch87:       %{name}-file-output-for-ELF.patch
 Patch88:       %{name}-rpmtdnext.patch
 Patch89:       disable-header-verification.patch
+Patch90:       %{name}-cppcompat.patch
 
 # Patches imported from Mandriva
 
@@ -295,6 +296,8 @@ Patch1048:  %{name}-5.4.14-rpmdbchk.patch
 # https://abf.io/openmandriva/rpm/raw/master/rpm-5.4.14-no-assert-abort-with-broken-headers.patch
 Patch1049:     %{name}-5.4.14-no-assert-abort-with-broken-headers.patch
 
+Patch1050:     python-libx32.patch
+
 URL:           http://rpm5.org/
 BuildRequires: %{reqdb_pkg}-devel >= %{reqdb_pkgver}
 %if %{with sqlite}
@@ -958,6 +961,7 @@ cd -
 %patch87 -p1
 %patch88 -p1
 %patch89 -p1
+%patch90 -p1
 
 %patch1000 -p1
 %patch1001 -p1
@@ -1009,6 +1013,8 @@ cd -
 
 %patch83 -p1
 
+%patch1050 -p1
+
 install %{SOURCE2} macros/pld.in
 install %{SOURCE8} scripts/php.prov.in
 install %{SOURCE9} scripts/php.req.in