- rel 36

[packages/rpm.git] / rpm.spec

diff --git a/rpm.spec b/rpm.spec
index f10a9a181a42c0b66455a9cd06891c8986017ad2..69ab708f78268a7a52df049b36418553f6e84c13 100644 (file)
--- 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:       24
+Release:       36
 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,12 @@ 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
 
@@ -673,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
@@ -962,6 +968,7 @@ cd -
 %patch88 -p1
 %patch89 -p1
 %patch90 -p1
+%patch91 -p1
 
 %patch1000 -p1
 %patch1001 -p1
@@ -1012,6 +1019,11 @@ cd -
 %patch1049 -p1
 
 %patch83 -p1
+%patch92 -p1
+%patch93 -p1
+%patch94 -p1
+%patch95 -p1
+%patch96 -p1
 
 %patch1050 -p1