[packages/rpm/dev-5.4.17] - added db62 bcond, replace db5.2 patch by configurable sed calls

[qboosh]

commit 5ef85eb722df79f32c1951d60e9fa7f849cf8770
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Mon Feb 20 22:03:08 2017 +0100

    - added db62 bcond, replace db5.2 patch by configurable sed calls

 rpm-db5.2.patch | 29 -----------------------------
 rpm.spec        | 21 +++++++++++++++++----
 2 files changed, 17 insertions(+), 33 deletions(-)
---
diff --git a/rpm.spec b/rpm.spec
index 1a91c30..7c5d407 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -13,6 +13,7 @@
 %bcond_without	selinux		# build without selinux support
 %bcond_without	suggest_tags	# build without Suggest tag (bootstrapping)
 %bcond_with	db61		# use DB 6.1 instead of 5.2
+%bcond_with	db62		# use DB 6.2 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
@@ -29,15 +30,21 @@
 %endif
 
 # versions of required libraries
+%if %{with db62}
+%define		reqdb_pkg	db6.2
+%define		reqdb_ver	6.2
+%define		reqdb_pkgver	6.2.23
+%else
 %if %{with db61}
 %define		reqdb_pkg	db6.1
 %define		reqdb_ver	6.1
-%define		reqdb_pkgver	6.1.19
+%define		reqdb_pkgver	6.1.26
 %else
 %define		reqdb_pkg	db5.2
 %define		reqdb_ver	5.2
 %define		reqdb_pkgver	5.2.36.0-4
 %endif
+%endif
 %define		reqpopt_ver	1.15
 %define		beecrypt_ver	2:4.2.0
 %define		sover		5.4
@@ -148,7 +155,7 @@ Patch53:	%{name}-lua-enable-extra-libs.patch
 Patch54:	%{name}-fix-filedigests-verify.patch
 Patch55:	%{name}-disable-hmac-verify.patch
 Patch56:	%{name}-macros.patch
-Patch57:	%{name}-db5.2.patch
+
 Patch58:	%{name}-preserve-iterator.patch
 Patch60:	%{name}-python-sitescriptdir.patch
 Patch61:	%{name}-clean-docdir.patch
@@ -928,7 +935,7 @@ cd -
 %patch54 -p1
 %patch55 -p1
 %patch56 -p1
-%{!?with_db61:%patch57 -p1}
+
 %patch58 -p1
 %patch60 -p1
 %patch61 -p1
@@ -1015,7 +1022,7 @@ install %{SOURCE11} scripts/perl.prov.in
 cp -p %{SOURCE30} scripts/rubygems.rb
 cp -p %{SOURCE31} scripts/gem_helper.rb
 
-rm scripts/find-php*
+%{__rm} scripts/find-php*
 
 %{__mv} -f scripts/perl.req{,.in}
 
@@ -1029,6 +1036,12 @@ for extlib in beecrypt neon %{?with_system_pcre:pcre} popt libtpm; do
 	[ -d $extlib ] && %{__rm} -r $extlib
 done
 
+%if %{without db62}
+%{__sed} -e 's/^DBXY=db62$/DBXY=db%{reqdb_ver}/' \
+	 -e 's/db-6\.2/db-%{reqdb_ver}/' \
+	 -e 's/db_sql-6\.2/db_sql-%{reqdb_ver}/' -i configure.ac
+%endif
+
 %build
 %{__libtoolize}
 #%{__autopoint}
diff --git a/rpm-db5.2.patch b/rpm-db5.2.patch
deleted file mode 100644
index b06c8e4..0000000
--- a/rpm-db5.2.patch
+++ /dev/null
@@ -1,29 +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=db62
-+DBXY=db5.2
- 
- AC_PATH_PROG(__BASH, bash, %{_bindir}/bash, $MYPATH)
- AC_PATH_PROG(__BZIP2, bzip2, %{_bindir}/bzip2, $MYPATH)
-@@ -1582,7 +1582,7 @@
- CPPFLAGS="${CPPFLAGS} -I${prefix}/include/${DBXY}"
- RPM_CHECK_LIB(
-     [Berkeley-DB], [db],
--    [db-6.2], [db_create], [db.h],
-+    [db-5.2], [db_create], [db.h],
-     [yes,external], [db3],
-     [ DBLIBSRCS="$DBLIBSRCS db3.c"
-       AM_CONDITIONAL(WITH_DB, [ true ])
-@@ -1609,7 +1609,7 @@
- dnl XXX error: `db3' is already registered with AC_CONFIG_SUBDIRS.
- RPM_CHECK_LIB(
-     [Berkeley-DB (+SQLite3)], [dbsql],
--    [db_sql-6.2], [sqlite3_open], [dbsql.h],
-+    [db_sql-5.2], [sqlite3_open], [dbsql.h],
-     [yes,external], [db3/sql],
-     [
-       AM_CONDITIONAL(WITH_DBSQL, [ true ])
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/rpm.git/commitdiff/5ef85eb722df79f32c1951d60e9fa7f849cf8770