[qpid-cpp] Added patches for qpid-store to work with the new BDB packages.

[Darryl L. Pierce]

commit 19977d06ff9e301babdc1fd1786ccbf22e7e1cf6
Author: Darryl Pierce <mcpierce at mcp-rawhide-x86.usersys.redhat.com>
Date:   Mon Jul 30 16:03:37 2012 -0400

    Added patches for qpid-store to work with the new BDB packages.
    
    - Added BR for libdb-devel and libdb4-devel, replacing db4-devel.

 06-Fixed-db4-on-Fedora.patch |   50 ++++++++++++++++++++++++++++++++++++++++++
 qpid-cpp.spec                |   27 ++++++++++++++++------
 2 files changed, 69 insertions(+), 8 deletions(-)
---
diff --git a/06-Fixed-db4-on-Fedora.patch b/06-Fixed-db4-on-Fedora.patch
new file mode 100644
index 0000000..40befdc
--- /dev/null
+++ b/06-Fixed-db4-on-Fedora.patch
@@ -0,0 +1,50 @@
+From 8ca90197bc2ab79228eaa7eefa2090eaf1b8426f Mon Sep 17 00:00:00 2001
+From: "Darryl L. Pierce" <dpierce at redhat.com>
+Date: Thu, 26 Jul 2012 17:18:27 -0400
+Subject: [PATCH] Fixed db4 on Fedora 18.
+
+---
+ configure.ac             | 6 +++---
+ lib/MessageStoreImpl.cpp | 2 +-
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 4ed71dd..235d8c1 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -181,7 +181,7 @@ LIBS=$gl_saved_libs
+ 
+ # Require libdb_cxx (any version between 4.2 and 4.8), for the library, and for db_cxx.h.
+ db4_devel_fail=0
+-AC_CHECK_HEADER([db_cxx.h], ,[db4_devel_fail=1])
++AC_CHECK_HEADER([libdb/db_cxx.h], ,[db4_devel_fail=1])
+ test $db4_devel_fail == 1 && \
+   AC_MSG_ERROR([db4-devel package missing. Please ensure both db4 and db4-devel are installed. (hint: "yum install db4-devel" should do it...)])
+ 
+@@ -195,8 +195,8 @@ LIBS=$gl_saved_libs
+ 
+ # Determine how to include db_cxx.h:
+ # Red Hat needs <db4/db_cxx.h>, Debian needs <db_cxx.h>.
+-AC_CHECK_HEADER([db4/db_cxx.h],
+-                [DB_CXX_HEADER_PREFIX=db4/])
++AC_CHECK_HEADER([libdb/db_cxx.h],
++                [DB_CXX_HEADER_PREFIX=libdb/])
+ if test x$DB_CXX_HEADER_PREFIX = x; then
+   AC_CHECK_HEADER([db_cxx.h],
+ 		  [DB_CXX_HEADER_PREFIX=])
+diff --git a/lib/MessageStoreImpl.cpp b/lib/MessageStoreImpl.cpp
+index d8cd611..4545573 100644
+--- a/lib/MessageStoreImpl.cpp
++++ b/lib/MessageStoreImpl.cpp
+@@ -32,7 +32,7 @@
+ #include "qmf/com/redhat/rhm/store/Package.h"
+ #include "StoreException.h"
+ #include <dirent.h>
+-#include <db.h>
++#include <libdb4/db.h>
+ 
+ #define MAX_AIO_SLEEPS 100000 // tot: ~1 sec
+ #define AIO_SLEEP_TIME_US  10 // 0.01 ms
+-- 
+1.7.11.2
+
diff --git a/qpid-cpp.spec b/qpid-cpp.spec
index c3e01e8..260a8a2 100644
--- a/qpid-cpp.spec
+++ b/qpid-cpp.spec
@@ -30,7 +30,7 @@
 
 Name:           qpid-cpp
 Version:        0.16
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Libraries for Qpid C++ client applications
 License:        ASL 2.0
 URL:            http://qpid.apache.org
@@ -61,14 +61,16 @@ BuildRequires: nss-devel
 BuildRequires: nspr-devel
 BuildRequires: xqilla-devel
 BuildRequires: xerces-c-devel
-BuildRequires: db4-devel
+BuildRequires: libdb-devel
+BuildRequires: libdb4-devel
 BuildRequires: libaio-devel
 
-Patch0: 01-make-BrokerImportExport.h-public.patch
-Patch1: 02-Remove-colons-from-conditionals.patch
-Patch2: 03-Fix-string-encoding.patch
-Patch3: 04-Adds-a-Cmake-target-to-generate-a-source-tarball-for.patch
-Patch4: 05-Relocated-all-swig-.i-files-to-the-include-directory.patch
+Patch1: 01-make-BrokerImportExport.h-public.patch
+Patch2: 02-Remove-colons-from-conditionals.patch
+Patch3: 03-Fix-string-encoding.patch
+Patch4: 04-Adds-a-Cmake-target-to-generate-a-source-tarball-for.patch
+Patch5: 05-Relocated-all-swig-.i-files-to-the-include-directory.patch
+Patch6: 06-Fixed-db4-on-Fedora.patch
 
 %description
 
@@ -538,11 +540,16 @@ Summary: Perl bindings for Apache Qpid Messaging
 %setup -q -n qpid-%{version}
 %setup -q -T -D -b 1 -n qpid-%{version}
 
-%patch0 -p2
 %patch1 -p2
 %patch2 -p2
 %patch3 -p2
 %patch4 -p2
+%patch5 -p2
+
+# qpid-store
+pushd ../store-%{version}.%{store_svnrev}
+%patch6 -p1
+popd
 
 %global perftests "qpid-perftest qpid-topic-listener qpid-topic-publisher qpid-latency-test qpid-client-test qpid-txtest"
 
@@ -719,6 +726,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Jul 30 2012 Darryl L. Pierce <dpierce at redhat.com> - 0.16-6
+- Added patches for qpid-store to work with the new BDB packages.
+- Added BR for libdb-devel and libdb4-devel, replacing db4-devel.
+
 * Fri Jul 27 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.16-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild