X-Git-Url: http://git.pld-linux.org/?p=packages%2Frpm.git;a=blobdiff_plain;f=rpm.spec;h=086e21360cb1c73f9376162c76dd6f6e3cbf7e3e;hp=f10a9a181a42c0b66455a9cd06891c8986017ad2;hb=ec7b8d8fb16f5789772693ff807e0a93a5c653e4;hpb=f5f4004c4c8eeb0f338fa3e53b9a82c18faa0add diff --git a/rpm.spec b/rpm.spec index f10a9a1..086e213 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: 24 +Release: 39 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 @@ -118,6 +118,7 @@ Patch22: %{name}-sparc64.patch Patch23: %{name}-gendiff.patch Patch24: openmp.patch Patch25: %{name}-URPM-build-fix.patch +Patch26: %{name}-semanage.patch Patch27: %{name}-helperEVR-noassert.patch Patch28: %{name}-unglobal.patch Patch29: %{name}-builddir-readlink.patch @@ -177,6 +178,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 +680,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 @@ -904,6 +911,7 @@ cd - %patch23 -p1 %patch24 -p1 %patch25 -p1 +%patch26 -p1 %patch27 -p1 %patch28 -p1 %patch29 -p1 @@ -962,6 +970,7 @@ cd - %patch88 -p1 %patch89 -p1 %patch90 -p1 +%patch91 -p1 %patch1000 -p1 %patch1001 -p1 @@ -1012,6 +1021,11 @@ cd - %patch1049 -p1 %patch83 -p1 +%patch92 -p1 +%patch93 -p1 +%patch94 -p1 +%patch95 -p1 +%patch96 -p1 %patch1050 -p1