X-Git-Url: http://git.pld-linux.org/?p=packages%2Frpm.git;a=blobdiff_plain;f=rpm.spec;h=2e537c1e93c8dc3457ac668060cd9abbf3b21f59;hp=7863ff8543916ddd54a68b116a90da8e6fb1a725;hb=e9576b98b1c166be5e164c20df8d8659bb0431be;hpb=8dc5e0233ad0d5d82c143354cf67365c79f27525

diff --git a/rpm.spec b/rpm.spec
index 7863ff8..2e537c1 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:	7
+Release:	39
 License:	LGPL v2.1
 Group:		Base
 # http://rpm5.org/files/rpm/rpm-5.4/rpm-5.4.15-0.20140824.src.rpm
@@ -77,7 +77,7 @@ Source14:	%{name}-java-requires
 # http://svn.pld-linux.org/banner.sh/
 Source15:	banner.sh
 Source16:	ftp://ftp.pld-linux.org/dists/th/PLD-3.0-Th-GPG-key.asc
-# Source16-md5:	08b29584dd349aac9caa7610131a0a88
+# Source16-md5:	23914bb49fafe7153cee87126d966461
 Source17:	%{name}-mimetypedeps
 Source18:	macros.local
 Source19:	%{name}.noautocompressdoc
@@ -173,6 +173,16 @@ Patch83:	%{name}-ignore-missing-macro-files.patch
 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
+Patch91:	py-disable-fetch.patch
+Patch92:	fast_python_deps.patch
+Patch93:	python2_explicit.patch
+Patch94:	do_not_write_before_macro_buffer.patch
+Patch95:	rpm-python-spec-header.patch
+Patch96:	skip-ldconfig-optimization.patch
 
 # Patches imported from Mandriva
 
@@ -292,6 +302,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}
@@ -667,7 +679,7 @@ Summary(uk.UTF-8):	Скрипти та утиліти, необхідні для
 Group:		Applications/File
 Requires(pretrans):	coreutils
 Requires(pretrans):	findutils
-Requires:	%{name}-build-macros >= 1.699
+Requires:	%{name}-build-macros >= 1.712
 Requires:	%{name}-utils = %{version}-%{release}
 Requires:	/bin/id
 Requires:	awk
@@ -768,7 +780,7 @@ Summary(pl.UTF-8):	Makra ułatwiające tworzenie pakietów RPM z programami napi
 Group:		Applications/File
 Requires:	%{name} = %{version}-%{release}
 Requires:	python
-Requires:	python-distribute
+Requires:	python-setuptools
 Requires:	python-modules
 
 %description pythonprov
@@ -952,6 +964,11 @@ cd -
 %patch84 -p1
 %patch85 -p1
 %patch86 -p1
+%patch87 -p1
+%patch88 -p1
+%patch89 -p1
+%patch90 -p1
+%patch91 -p1
 
 %patch1000 -p1
 %patch1001 -p1
@@ -1002,6 +1019,13 @@ cd -
 %patch1049 -p1
 
 %patch83 -p1
+%patch92 -p1
+%patch93 -p1
+%patch94 -p1
+%patch95 -p1
+%patch96 -p1
+
+%patch1050 -p1
 
 install %{SOURCE2} macros/pld.in
 install %{SOURCE8} scripts/php.prov.in
@@ -1010,6 +1034,8 @@ install %{SOURCE11} scripts/perl.prov.in
 cp -p %{SOURCE30} scripts/rubygems.rb
 cp -p %{SOURCE31} scripts/gem_helper.rb
 
+rm scripts/find-php*
+
 %{__mv} -f scripts/perl.req{,.in}
 
 # generate Group translations to *.po
@@ -1257,7 +1283,6 @@ install %{SOURCE4} $RPM_BUILD_ROOT%{_rpmlibdir}/find-spec-bcond
 install %{SOURCE7} $RPM_BUILD_ROOT%{_rpmlibdir}/compress-doc
 install %{SOURCE12} $RPM_BUILD_ROOT%{_rpmlibdir}/user_group.sh
 install %{SOURCE14} $RPM_BUILD_ROOT%{_rpmlibdir}/java-find-requires
-install scripts/find-php*	$RPM_BUILD_ROOT%{_rpmlibdir}
 install scripts/php.{prov,req}	$RPM_BUILD_ROOT%{_rpmlibdir}
 cp -p %{SOURCE25} $RPM_BUILD_ROOT%{_rpmlibdir}/php.req.php
 install %{SOURCE17} $RPM_BUILD_ROOT%{_rpmlibdir}/mimetypedeps.sh
@@ -1628,8 +1653,9 @@ find %{_rpmlibdir} -name '*-linux' -type l | xargs rm -f
 
 %files php-pearprov
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_rpmlibdir}/php*
-%attr(755,root,root) %{_rpmlibdir}/find-php*
+%attr(755,root,root) %{_rpmlibdir}/php.prov
+%attr(755,root,root) %{_rpmlibdir}/php.req
+%attr(755,root,root) %{_rpmlibdir}/php.req.php
 
 %if %{with python}
 %files -n python-rpm