- rel 51; fix -Werror=trampolines option

[packages/rpm.git] / rpm.spec

diff --git a/rpm.spec b/rpm.spec
index 63965f9f41fcfc5134eeb0eb3342e2a446ddda8b..d43a35142c3c65589694912cac5a248aa1ee5bee 100644 (file)
--- 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:       51
 License:       LGPL v2.1
 Group:         Base
 # http://rpm5.org/files/rpm/rpm-5.4/rpm-5.4.15-0.20140824.src.rpm
@@ -156,6 +156,7 @@ Patch64:    %{name}-fix-compress-doc.patch
 Patch65:       %{name}-parseSpec-skip-empty-tags.patch
 Patch66:       %{name}-payload-use-hashed-inode.patch
 Patch67:       %{name}-repackage-dont-force-max-compression.patch
+Patch68:       rpm-bug-420.patch
 Patch70:       python-%{name}sense-missingok.patch
 Patch71:       %{name}-changelog-encoding.patch
 Patch72:       %{name}-preserve-tag-type.patch
@@ -181,6 +182,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 +366,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}
@@ -938,6 +943,7 @@ cd -
 %patch65 -p1
 %patch66 -p1
 %patch67 -p1
+%patch68 -p1
 %patch70 -p1
 %patch71 -p1
 %patch72 -p1
@@ -957,6 +963,7 @@ cd -
 %patch89 -p1
 %patch90 -p1
 %patch91 -p1
+%patch99 -p1
 
 %patch1000 -p1
 %patch1001 -p1
@@ -1012,6 +1019,8 @@ cd -
 %patch94 -p1
 %patch95 -p1
 %patch96 -p1
+%patch97 -p1
+%patch98 -p1
 
 %patch1050 -p1
 
@@ -1055,6 +1064,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 \