X-Git-Url: http://git.pld-linux.org/?p=packages%2Frpm.git;a=blobdiff_plain;f=rpm.spec;h=56ea152522c20ce0bbb182129399cc7aaaa14520;hp=63965f9f41fcfc5134eeb0eb3342e2a446ddda8b;hb=7db865f2bcabd6634b78e94aae5f19c47fcc9a97;hpb=66f8933350db4b33ae1458d868398ede1ec0e721

diff --git a/rpm.spec b/rpm.spec
index 63965f9..56ea152 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -47,7 +47,7 @@ Summary(ru.UTF-8):	Менеджер пакетов от RPM
 Summary(uk.UTF-8):	Менеджер пакетів від RPM
 Name:		rpm
 Version:	5.4.15
-Release:	39
+Release:	44
 License:	LGPL v2.1
 Group:		Base
 # http://rpm5.org/files/rpm/rpm-5.4/rpm-5.4.15-0.20140824.src.rpm
@@ -181,6 +181,9 @@ Patch93:	python2_explicit.patch
 Patch94:	do_not_write_before_macro_buffer.patch
 Patch95:	rpm-python-spec-header.patch
 Patch96:	skip-ldconfig-optimization.patch
+Patch97:	glibc.patch
+Patch98:	extension-based-compression-detection.patch
+Patch99:	%{name}-gpg-pinentry.patch
 
 # Patches imported from Mandriva
 
@@ -362,6 +365,7 @@ BuildRequires:	popt-static >= %{reqpopt_ver}
 BuildRequires:	zlib-static
 %endif
 Requires(posttrans):	coreutils
+Requires:	FHS >= 3.0-2
 Requires:	%{name}-base = %{version}-%{release}
 Requires:	%{name}-lib = %{version}-%{release}
 Requires:	beecrypt >= %{beecrypt_ver}
@@ -957,6 +961,7 @@ cd -
 %patch89 -p1
 %patch90 -p1
 %patch91 -p1
+%patch99 -p1
 
 %patch1000 -p1
 %patch1001 -p1
@@ -1012,6 +1017,8 @@ cd -
 %patch94 -p1
 %patch95 -p1
 %patch96 -p1
+%patch97 -p1
+%patch98 -p1
 
 %patch1050 -p1
 
@@ -1055,6 +1062,7 @@ sed -i \
 %configure \
 	WITH_PERL_VERSION=no \
 	__GST_INSPECT=%{_bindir}/gst-inspect-1.0 \
+	__GPG=%{_bindir}/gpg \
 	--disable-silent-rules \
 	--enable-shared \
 	--enable-static \