Build bind-sdb against libdb instead of libdb4

Signed-off-by: Tomas Hozza <thozza@redhat.com>

3 files changed, 31 insertions, 33 deletions

diff --git a/bind-9.9.1-P2-dlz-libdb.patch b/bind-9.9.1-P2-dlz-libdb.patch
new file mode 100644
index 0000000..7c62d87
--- /dev/null
+++ b/bind-9.9.1-P2-dlz-libdb.patch
@@ -0,0 +1,27 @@
+diff -up bind-9.9.4/contrib/dlz/config.dlz.in.libdb bind-9.9.4/contrib/dlz/config.dlz.in
+--- bind-9.9.4/contrib/dlz/config.dlz.in.libdb	2014-01-06 13:24:24.669256364 +0100
++++ bind-9.9.4/contrib/dlz/config.dlz.in	2014-01-06 13:26:29.861420493 +0100
+@@ -257,7 +257,7 @@ case "$use_dlz_bdb" in
+ 			# Check other locations for includes.
+ 			# Order is important (sigh).
+ 
+-			bdb_incdirs="/ /db48/ /db47/ /db46/ /db45/ /db44/ /db43/ /db42/ /db41/ /db4/ /db/"
++			bdb_incdirs="/ /db48/ /db47/ /db46/ /db45/ /db44/ /db43/ /db42/ /db41/ /db4/ /libdb/ /db/"
+ 			for d in $bdb_incdirs
+ 			do
+ 				if test -f "$dd/include${d}db.h"
+@@ -283,13 +283,7 @@ case "$use_dlz_bdb" in
+ 			do
+ 				if test -f "$dd/${target_lib}/lib${d}.so"
+ 				then
+-					if test "$dd" != "/usr"
+-					then
+-						dlz_bdb_libs="-L${dd}/${target_lib} "
+-					else
+-						dlz_bdb_libs=""
+-					fi
+-					dlz_bdb_libs="${dlz_bdb_libs}-l${d}"
++					dlz_bdb_libs="-L${dd}/${target_lib}/libdb -l${d}"
+ 					break
+ 				fi
+ 			done
diff --git a/bind-9.9.1-P2-dlz-libdb4.patch b/bind-9.9.1-P2-dlz-libdb4.patch
deleted file mode 100644
index 1099fa4..0000000
--- a/bind-9.9.1-P2-dlz-libdb4.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -up bind-9.9.1-P2/contrib/dlz/config.dlz.in.libdb4 bind-9.9.1-P2/contrib/dlz/config.dlz.in
---- bind-9.9.1-P2/contrib/dlz/config.dlz.in.libdb4	2012-07-30 16:58:57.566418514 +0200
-+++ bind-9.9.1-P2/contrib/dlz/config.dlz.in	2012-07-30 17:30:10.930074108 +0200
-@@ -257,7 +257,7 @@ case "$use_dlz_bdb" in
- 			# Check other locations for includes.
- 			# Order is important (sigh).
- 
--			bdb_incdirs="/ /db48/ /db47/ /db46/ /db45/ /db44/ /db43/ /db42/ /db41/ /db4/ /db/"
-+			bdb_incdirs="/ /db48/ /db47/ /db46/ /db45/ /db44/ /db43/ /db42/ /db41/ /db4/ /libdb4/ /db/"
- 			for d in $bdb_incdirs
- 			do
- 				if test -f "$dd/include${d}db.h"
-@@ -281,15 +281,9 @@ case "$use_dlz_bdb" in
- 			bdb_libnames="db48 db-4.8 db47 db-4.7 db46 db-4.6 db45 db-4.5 db44 db-4.4 db43 db-4.3 db42 db-4.2 db41 db-4.1 db"
- 			for d in $bdb_libnames
- 			do
--				if test -f "$dd/${target_lib}/lib${d}.so"
-+				if test -f "$dd/${target_lib}/libdb4/lib${d}.so"
- 				then
--					if test "$dd" != "/usr"
--					then
--						dlz_bdb_libs="-L${dd}/${target_lib} "
--					else
--						dlz_bdb_libs=""
--					fi
--					dlz_bdb_libs="${dlz_bdb_libs}-l${d}"
-+					dlz_bdb_libs="-L${dd}/${target_lib}/libdb4 -l${d}"
- 					break
- 				fi
- 			done
diff --git a/bind.spec b/bind.spec
index 978d821..decac2f 100644
--- a/bind.spec
+++ b/bind.spec
@@ -82,7 +82,7 @@ Patch123:bind98-rh735103.patch
 Patch124:nslookup-norec.patch
 Patch125:bind99-buildfix.patch
 Patch127:bind99-forward.patch
-Patch130:bind-9.9.1-P2-dlz-libdb4.patch
+Patch130:bind-9.9.1-P2-dlz-libdb.patch
 Patch131:bind-9.9.1-P2-multlib-conflict.patch
 Patch133:bind99-rh640538.patch
 Patch134:bind97-rh669163.patch
@@ -126,7 +126,7 @@ BuildRequires:  libidn-devel, libxml2-devel
 BuildRequires:  systemd-units
 %if %{SDB}
 BuildRequires:  openldap-devel, postgresql-devel, sqlite-devel, mysql-devel
-BuildRequires:  db4-devel
+BuildRequires:  libdb-devel
 %endif
 %if %{test}
 BuildRequires:  net-tools
@@ -299,7 +299,7 @@ pushd bin/dig
 popd
 %patch125 -p1 -b .buildfix
 %patch127 -p1 -b .forward
-%patch130 -p1 -b .libdb4
+%patch130 -p1 -b .libdb
 %patch131 -p1 -b .multlib-conflict
 %patch137 -p1 -b .rrl
 %patch138 -p1 -b .update
@@ -920,6 +920,7 @@ rm -rf ${RPM_BUILD_ROOT}
 %changelog
 * Mon Jan 06 2014 Tomas Hozza <thozza@redhat.com> 32:9.9.5-0.1.b1
 - Update to bind-9.9.5b1
+- Build bind-sdb against libdb instead of libdb4
 
 * Wed Dec 18 2013 Tomas Hozza <thozza@redhat.com> 32:9.9.4-11
 - Fix crash in rbtdb after two sucessive getoriginnode() calls