[packages/poldek/DB5.2] - link and compile with db-5.2 instead of system db

[baggins]

commit 19e679c666bcb132ebe033aee7e45c534d26939c
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Mon Nov 26 15:55:25 2012 +0100

    - link and compile with db-5.2 instead of system db

 poldek-db52.patch | 25 +++++++++++++++++++++++++
 poldek.spec       |  4 +++-
 2 files changed, 28 insertions(+), 1 deletion(-)
---
diff --git a/poldek.spec b/poldek.spec
index 4ce1ac0..af37042 100644
--- a/poldek.spec
+++ b/poldek.spec
@@ -10,7 +10,7 @@
 
 # required versions (forced to avoid SEGV with mixed db used by rpm and poldek)
 %define		ver_db		5.2
-%define		ver_db_rel	2
+%define		ver_db_rel	3
 %define		ver_rpm		5.4.10
 
 %define		snap	rc6
@@ -45,6 +45,7 @@ Patch3:		%{name}-Os-fail-workaround.patch
 Patch4:		%{name}-link-rpmio.patch
 Patch5:		%{name}-vrpmlog.patch
 Patch6:		%{name}-git.patch
+Patch7:		%{name}-db52.patch
 URL:		http://poldek.pld-linux.org/
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -210,6 +211,7 @@ Moduły języka Python dla poldka.
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
+%patch7 -p1
 
 %{__rm} m4/libtool.m4 m4/lt*.m4
 
diff --git a/poldek-db52.patch b/poldek-db52.patch
new file mode 100644
index 0000000..a902a5d
--- /dev/null
+++ b/poldek-db52.patch
@@ -0,0 +1,25 @@
+--- poldek-0.30/configure.ac~	2012-11-26 15:41:14.238657356 +0100
++++ poldek-0.30/configure.ac	2012-11-26 15:43:32.665319139 +0100
+@@ -308,17 +308,17 @@
+ 	#	DBLIB="$DBLIB -ldb1"
+ 	#fi
+ else
+-    AC_CHECK_LIB(db4, db_create, [DBLIB="-ldb4"],
+-        [AC_CHECK_LIB(db-4.1, db_create, [DBLIB="-ldb-4.1"],
+-             [AC_CHECK_LIB(db-4.0, db_create, [DBLIB="-ldb-4.0"],
+-                     [AC_CHECK_LIB(db, db_create, [DBLIB="-ldb"],,[$LIBS])],
++    AC_CHECK_LIB(db4, db_create, [DBLIB="-ldb4" DBINCLUDE="-I/usr/include/db4"],
++        [AC_CHECK_LIB(db-4.1, db_create, [DBLIB="-ldb-4.1" DBINCLUDE="-I/usr/include/db4.1"],
++             [AC_CHECK_LIB(db-4.0, db_create, [DBLIB="-ldb-4.0" DBINCLUDE="-I/usr/include/db4.0"],
++                     [AC_CHECK_LIB(db-5.2, db_create, [DBLIB="-ldb-5.2" DBINCLUDE="-I/usr/include/db5.2"],,[$LIBS])],
+                      [$LIBS])],, [$LIBS])],, [$LIBS])
+ 
+ 	if test "${ENABLE_STATIC}." = "yes."; then 
+ 		DBLIB="$DBLIB"
+ 	fi
+ 
+-	CPPFLAGS="-I/usr/include/db4 $CPPFLAGS"
++	CPPFLAGS="$DBINCLUDE $CPPFLAGS"
+ fi
+ 
+ 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/poldek.git/commitdiff/19e679c666bcb132ebe033aee7e45c534d26939c