X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=rpm.spec;h=ec43cff2060cb4e294ffeb53133aaedb81d77264;hb=296155b5f0d8bf6b3b2f393ef4e77bc286924040;hp=d3b73da9b220ee396dc80b2c3937add690367753;hpb=eaa26f56e0b2b562fe4540611586bc867e801732;p=packages%2Frpm.git

diff --git a/rpm.spec b/rpm.spec
index d3b73da..ec43cff 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:	17
+Release:	31
 License:	LGPL v2.1
 Group:		Base
 # http://rpm5.org/files/rpm/rpm-5.4/rpm-5.4.15-0.20140824.src.rpm
@@ -177,6 +177,10 @@ 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
 
 # Patches imported from Mandriva
 
@@ -774,7 +778,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
@@ -962,6 +966,7 @@ cd -
 %patch88 -p1
 %patch89 -p1
 %patch90 -p1
+%patch91 -p1
 
 %patch1000 -p1
 %patch1001 -p1
@@ -1012,6 +1017,9 @@ cd -
 %patch1049 -p1
 
 %patch83 -p1
+%patch92 -p1
+%patch93 -p1
+%patch94 -p1
 
 %patch1050 -p1
 
@@ -1022,6 +1030,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
@@ -1269,7 +1279,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
@@ -1640,8 +1649,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