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

diff --git a/rpm.spec b/rpm.spec
index ec43cff..8901531 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:	31
+Release:	38
 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
@@ -181,6 +181,8 @@ 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
 
@@ -677,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
@@ -1020,6 +1022,8 @@ cd -
 %patch92 -p1
 %patch93 -p1
 %patch94 -p1
+%patch95 -p1
+%patch96 -p1
 
 %patch1050 -p1