X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=rpm.spec;h=5b5dc8d995798fbb1a5c888000997490ab5b854c;hb=883e0facce1ca73eaf260a57fb1558ca23acc710;hp=b2f2a3f8cc17e66bd8cecb5605a849b35ddb9c8b;hpb=0959ed6de3df213414d3b905bd231e859f4713c3;p=packages%2Frpm.git

diff --git a/rpm.spec b/rpm.spec
index b2f2a3f..5b5dc8d 100644
--- 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:	9
+Release:	13
 License:	LGPL v2.1
 Group:		Base
 # http://rpm5.org/files/rpm/rpm-5.4/rpm-5.4.15-0.20140824.src.rpm
@@ -174,6 +174,9 @@ Patch84:	x32.patch
 Patch85:	rpm-CVE-2013-6435.patch
 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
 
@@ -293,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}
@@ -954,6 +959,9 @@ cd -
 %patch85 -p1
 %patch86 -p1
 %patch87 -p1
+%patch88 -p1
+%patch89 -p1
+%patch90 -p1
 
 %patch1000 -p1
 %patch1001 -p1
@@ -1005,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