commit 5f3f5bd6b186fa3bc84c78df47cc356b1f19bbca
Author: Jakub Bogusz <[email protected]>
Date: Sun Sep 29 18:11:53 2013 +0200
- removed outdated db5.3 patch
- added db60 bcond
rpm-db5.3.patch | 11 -----------
rpm.spec | 11 ++++++++---
2 files changed, 8 insertions(+), 14 deletions(-)
---
diff --git a/rpm.spec b/rpm.spec
index c51bd4e..6a9b8ed 100644
--- 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
@@ -107,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
@@ -856,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
@@ -887,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
diff --git a/rpm-db5.3.patch b/rpm-db5.3.patch
deleted file mode 100644
index c11376a..0000000
--- a/rpm-db5.3.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- rpm-5.4.10/configure.ac~ 2012-07-18 21:42:22.133130256 +0200
-+++ rpm-5.4.10/configure.ac 2012-07-18 21:45:04.726457854 +0200
-@@ -543,7 +543,7 @@
- MYPATH=$PATH
- fi
-
--DBXY=db53
-+DBXY=db5.3
-
- AC_PATH_PROG(__BASH, bash, %{_bindir}/bash, $MYPATH)
- AC_PATH_PROG(__BZIP2, bzip2, %{_bindir}/bzip2, $MYPATH)
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/rpm.git/commitdiff/5f3f5bd6b186fa3bc84c78df47cc356b1f19bbca
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
