- removed outdated db5.3 patch

[packages/rpm.git] / rpm.spec

diff --git a/rpm.spec b/rpm.spec
index 6763d70e62d4f8a96c7b1369ee7dd972110a68b7..6a9b8edb88620eaae1dfce9b3709aeefb4121de4 100644 (file)
--- a/rpm.spec
+++ b/rpm.spec
@@ -12,6 +12,7 @@
 %bcond_without python          # don't build python bindings
 %bcond_without selinux         # build without selinux support
 %bcond_without suggest_tags    # build without Suggest tag (bootstrapping)
+%bcond_with    db60            # use DB 6.0 instead of 5.2
 %bcond_with    neon            # build with HTTP/WebDAV support (neon library)
 %bcond_with    sqlite          # build with SQLite support
 %bcond_with    system_lua      # use system lua
@@ -27,9 +28,15 @@
 %endif
 
 # versions of required libraries
+%if %{with db60}
+%define                reqdb_pkg       db6.0
+%define                reqdb_ver       6.0
+%define                reqdb_pkgver    6.0.20
+%else
 %define                reqdb_pkg       db5.2
 %define                reqdb_ver       5.2
 %define                reqdb_pkgver    5.2.36.0-4
+%endif
 %define                reqpopt_ver     1.15
 %define                beecrypt_ver    2:4.2.0
 %define                sover           5.4
@@ -42,13 +49,13 @@ Summary(pt_BR.UTF-8):       Gerenciador de pacotes RPM
 Summary(ru.UTF-8):     Менеджер пакетов от RPM
 Summary(uk.UTF-8):     Менеджер пакетів від RPM
 Name:          rpm
-Version:       5.4.12
+Version:       5.4.13
 Release:       2
 License:       LGPL v2.1
 Group:         Base
-# http://rpm5.org/files/rpm/rpm-5.4/rpm-5.4.12-0.20130725.src.rpm
+# http://rpm5.org/files/rpm/rpm-5.4/rpm-5.4.13-0.20130819.src.rpm
 Source0:       %{name}-%{version}.tar.gz
-# Source0-md5: 1af762bbedf936240b1e1a482cc7a193
+# Source0-md5: 4ce4ab33a4d5f1fcb13afcc494c92c07
 Source100:     cpu-os-macros.tar.gz
 # Source100-md5:       928034a5bdceb398881bc14b5f29973b
 Source1:       %{name}.groups
@@ -75,7 +82,6 @@ Source19:     %{name}.noautocompressdoc
 Source20:      %{name}.noautoprov
 Source21:      %{name}.noautoprovfiles
 Source22:      %{name}.noautoreq
-Source23:      %{name}.noautoreqdep
 Source24:      %{name}.noautoreqfiles
 Source25:      %{name}-php-requires.php
 Source26:      %{name}db_checkversion.c
@@ -108,7 +114,6 @@ Patch22:    %{name}-sparc64.patch
 Patch23:       %{name}-gendiff.patch
 Patch24:       openmp.patch
 Patch25:       %{name}-URPM-build-fix.patch
-Patch26:       %{name}-db5.3.patch
 Patch27:       %{name}-helperEVR-noassert.patch
 Patch28:       %{name}-unglobal.patch
 Patch29:       %{name}-builddir-readlink.patch
@@ -155,8 +160,10 @@ Patch70:   python-%{name}sense-missingok.patch
 Patch71:       %{name}-changelog-encoding.patch
 Patch72:       %{name}-preserve-tag-type.patch
 Patch73:       gem_helper-spec-arg.patch
-Patch74:       rpm-fix-internal-lua-build.patch
-Patch75:       rpm-double_check_file_deps.patch
+Patch74:       %{name}-fix-internal-lua-build.patch
+Patch75:       %{name}-double_check_file_deps.patch
+Patch76:       %{name}-revert-debugedit-breakage.patch
+Patch77:       %{name}-lua-expat.patch
 
 # Patches imported from Mandriva
 
@@ -269,6 +276,10 @@ Patch1042: %{name}-5.4.9-fix-rpm_qa-pattern.patch
 # warning: introduces memory leak
 Patch1043:     %{name}-5.4.12-copy-Value-string.patch
 Patch1044:     %{name}-5.4.12-fix-rpmlua-print.patch
+Patch1045:     %{name}-5.4.12-fix-rpmpython-module-import-init.patch
+Patch1046:     %{name}-5.4.12-truncate-output-buffer-after-use.patch
+Patch1047:     %{name}-5.4.13-perl-bindings-do-not-use-xmalloc.patch
+Patch1048:     %{name}-5.4.13-dont-override-existing-variables-with-etc-os-release.patch
 
 URL:           http://rpm5.org/
 BuildRequires: %{reqdb_pkg}-devel >= %{reqdb_pkgver}
@@ -851,7 +862,6 @@ Dokumentacja API RPM-a oraz przewodniki w formacie HTML generowane ze
 %patch23 -p1
 %patch24 -p1
 %patch25 -p1
-####%patch26 -p1
 %patch27 -p1
 %patch28 -p1
 %patch29 -p1
@@ -882,7 +892,7 @@ Dokumentacja API RPM-a oraz przewodniki w formacie HTML generowane ze
 %patch54 -p1
 %patch55 -p1
 %patch56 -p1
-%patch57 -p1
+%{!?with_db60:%patch57 -p1}
 %patch58 -p1
 %patch60 -p1
 %patch61 -p1
@@ -898,6 +908,8 @@ Dokumentacja API RPM-a oraz przewodniki w formacie HTML generowane ze
 %patch73 -p1
 %patch74 -p1
 %patch75 -p1
+%patch76 -p0
+%patch77 -p0
 
 %patch1000 -p1
 %patch1001 -p1
@@ -943,6 +955,10 @@ Dokumentacja API RPM-a oraz przewodniki w formacie HTML generowane ze
 %patch1042 -p1
 %patch1043 -p1
 %patch1044 -p1
+%patch1045 -p1
+%patch1046 -p1
+%patch1047 -p1
+%patch1048 -p1
 %patch68 -p1
 %patch69 -p1
 
@@ -959,7 +975,7 @@ awk -f %{SOURCE6} %{SOURCE1}
 install %{SOURCE26} tools/rpmdb_checkversion.c
 install %{SOURCE28} tools/rpmdb_reset.c
 
-for extlib in beecrypt neon pcre popt ; do
+for extlib in beecrypt neon pcre popt; do
        [ -d $extlib ] && %{__rm} -r $extlib
 done
 
@@ -1191,7 +1207,6 @@ install %{SOURCE19} $RPM_BUILD_ROOT%{_sysconfdir}/rpm/noautocompressdoc
 install %{SOURCE20} $RPM_BUILD_ROOT%{_sysconfdir}/rpm/noautoprov
 install %{SOURCE21} $RPM_BUILD_ROOT%{_sysconfdir}/rpm/noautoprovfiles
 install %{SOURCE22} $RPM_BUILD_ROOT%{_sysconfdir}/rpm/noautoreq
-install %{SOURCE23} $RPM_BUILD_ROOT%{_sysconfdir}/rpm/noautoreqdep
 install %{SOURCE24} $RPM_BUILD_ROOT%{_sysconfdir}/rpm/noautoreqfiles
 
 touch $RPM_BUILD_ROOT%{_sysconfdir}/rpm/sysinfo/Conflictname