[php/f17] patch to ensure we use latest libdb (not libdb4)

[Remi Collet]

commit 94903b6230320e31ed56244db34bfbebdb62432f
Author: Remi Collet <rcollet at redhat.com>
Date:   Thu Sep 20 13:50:48 2012 +0200

    patch to ensure we use latest libdb (not libdb4)

 php-5.4.7-libdb.patch |   62 +++++++++++++++++++++++++++++++++++++++++++++++++
 php.spec              |    7 ++++-
 2 files changed, 68 insertions(+), 1 deletions(-)
---
diff --git a/php-5.4.7-libdb.patch b/php-5.4.7-libdb.patch
new file mode 100644
index 0000000..0b1e305
--- /dev/null
+++ b/php-5.4.7-libdb.patch
@@ -0,0 +1,62 @@
+--- php-5.4.7/ext/dba/config.m4.orig	2012-09-20 12:23:00.548322754 +0200
++++ php-5.4.7/ext/dba/config.m4	2012-09-20 12:28:07.656380829 +0200
+@@ -312,57 +312,13 @@
+   dbdp4="/usr/local/BerkeleyDB.4."
+   dbdp5="/usr/local/BerkeleyDB.5."
+   for i in $PHP_DB4 ${dbdp5}1 ${dbdp5}0 ${dbdp4}8 ${dbdp4}7 ${dbdp4}6 ${dbdp4}5 ${dbdp4}4 ${dbdp4}3 ${dbdp4}2 ${dbdp4}1 ${dbdp}0 /usr/local /usr; do
+-    if test -f "$i/db5/db.h"; then
+-      THIS_PREFIX=$i
+-      THIS_INCLUDE=$i/db5/db.h
+-      break
+-    elif test -f "$i/db4/db.h"; then
+-      THIS_PREFIX=$i
+-      THIS_INCLUDE=$i/db4/db.h
+-      break
+-    elif test -f "$i/include/db5.1/db.h"; then
+-      THIS_PREFIX=$i
+-      THIS_INCLUDE=$i/include/db5.1/db.h
+-      break
+-    elif test -f "$i/include/db5.0/db.h"; then
+-      THIS_PREFIX=$i
+-      THIS_INCLUDE=$i/include/db5.0/db.h
+-      break
+-    elif test -f "$i/include/db4.8/db.h"; then
+-      THIS_PREFIX=$i
+-      THIS_INCLUDE=$i/include/db4.8/db.h
+-      break
+-    elif test -f "$i/include/db4.7/db.h"; then
+-      THIS_PREFIX=$i
+-      THIS_INCLUDE=$i/include/db4.7/db.h
+-      break
+-    elif test -f "$i/include/db4.6/db.h"; then
+-      THIS_PREFIX=$i
+-      THIS_INCLUDE=$i/include/db4.6/db.h
+-      break
+-    elif test -f "$i/include/db4.5/db.h"; then
+-      THIS_PREFIX=$i
+-      THIS_INCLUDE=$i/include/db4.5/db.h
+-      break
+-    elif test -f "$i/include/db4/db.h"; then
+-      THIS_PREFIX=$i
+-      THIS_INCLUDE=$i/include/db4/db.h
+-      break
+-    elif test -f "$i/include/db/db4.h"; then
+-      THIS_PREFIX=$i
+-      THIS_INCLUDE=$i/include/db/db4.h
+-      break
+-    elif test -f "$i/include/db4.h"; then
+-      THIS_PREFIX=$i
+-      THIS_INCLUDE=$i/include/db4.h
+-      break
+-    elif test -f "$i/include/db.h"; then
++    if test -f "$i/include/db.h"; then
+       THIS_PREFIX=$i
+       THIS_INCLUDE=$i/include/db.h
+       break
+     fi
+   done
+-  PHP_DBA_DB_CHECK(4, db-5.1 db-5.0 db-4.8 db-4.7 db-4.6 db-4.5 db-4.4 db-4.3 db-4.2 db-4.1 db-4.0 db-4 db4 db, [(void)db_create((DB**)0, (DB_ENV*)0, 0)])
++  PHP_DBA_DB_CHECK(4, db, [(void)db_create((DB**)0, (DB_ENV*)0, 0)])
+ fi
+ PHP_DBA_STD_RESULT(db4,Berkeley DB4)
+ 
diff --git a/php.spec b/php.spec
index 022f525..995c707 100644
--- a/php.spec
+++ b/php.spec
@@ -52,7 +52,7 @@
 Summary: PHP scripting language for creating dynamic web sites
 Name: php
 Version: 5.4.7
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: PHP
 Group: Development/Languages
 URL: http://www.php.net/
@@ -72,6 +72,7 @@ Source9: php.modconf
 Patch5: php-5.2.0-includedir.patch
 Patch6: php-5.2.4-embed.patch
 Patch7: php-5.3.0-recode.patch
+Patch8: php-5.4.7-libdb.patch
 
 # Fixes for extension modules
 
@@ -575,6 +576,7 @@ support for using the enchant library to PHP.
 %patch5 -p1 -b .includedir
 %patch6 -p1 -b .embed
 %patch7 -p1 -b .recode
+%patch8 -p1 -b .libdb
 
 %patch40 -p1 -b .dlopen
 %patch41 -p1 -b .easter
@@ -1279,6 +1281,9 @@ fi
 
 
 %changelog
+* Wed Sep 19 2012 Remi Collet <rcollet at redhat.com> 5.4.7-5
+- patch to ensure we use latest libdb (not libdb4)
+
 * Wed Sep 19 2012 Remi Collet <rcollet at redhat.com> 5.4.7-4
 - really fix rhel tests (use libzip and libdb)