rpms/cfengine/devel cfengine-2.2.8-db47.patch, NONE, 1.1 cfengine.spec, 1.36, 1.37

[Jeff Sheltren]

Author: sheltren

Update of /cvs/extras/rpms/cfengine/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2382

Modified Files:
	cfengine.spec 
Added Files:
	cfengine-2.2.8-db47.patch 
Log Message:
Add patch to detect db 4.7


cfengine-2.2.8-db47.patch:

--- NEW FILE cfengine-2.2.8-db47.patch ---
--- cfengine-2.2.8/configure.db47	2008-09-27 15:25:37.000000000 +0000
+++ cfengine-2.2.8/configure	2008-09-27 15:25:43.000000000 +0000
@@ -24093,7 +24093,7 @@
    { (exit 1); exit 1; }; }
 else
     if test "x$BERKELEY_DB_DIR" = "xdefault" ; then
-        for v in BerkeleyDB.4.2 BerkeleyDB.4.3 BerkeleyDB.4.4 BerkeleyDB.4.5 BerkeleyDB.4.6; do
+        for v in BerkeleyDB.4.2 BerkeleyDB.4.3 BerkeleyDB.4.4 BerkeleyDB.4.5 BerkeleyDB.4.6 BerkelyDB.4.7; do
             for d in $prefix /opt /usr/local /usr; do
                 test -d "$d/$v" && BERKELEY_DB_DIR="$d/$v"
             done
@@ -24146,7 +24146,7 @@
   return 0;
 }
 _ACEOF
-for ac_lib in '' db-4 db4 db-4.6 db-4.5 db-4.4 db-4.3 db-4.2 db-4.1 db-4.0; do
+for ac_lib in '' db-4 db4 db-4.7 db-4.6 db-4.5 db-4.4 db-4.3 db-4.2 db-4.1 db-4.0; do
   if test -z "$ac_lib"; then
     ac_res="none required"
   else
@@ -24254,7 +24254,7 @@
     elif test -d "$BERKELEY_DB_DIR"; then
 
         BERKELEY_DB_CFLAGS="-I$BERKELEY_DB_DIR/include"
-        for v in . db46 db45 db44 db43 db42 db41 db40 db4 db33 db32 db3 db; do
+        for v in . db47 db46 db45 db44 db43 db42 db41 db40 db4 db33 db32 db3 db; do
             if test -f "$BERKELEY_DB_DIR/include/$v/db.h"; then
                 BERKELEY_DB_CFLAGS="-I$BERKELEY_DB_DIR/include/$v"
 		break
@@ -24262,7 +24262,7 @@
         done
 
         BERKELEY_DB_LIB="-ldb"
-        for v in db-4.6 db4.6 db46 db-4.5 db4.5 db45 db-4.4 db4.4 db44; do
+        for v in db-4.7 db4.7 db47 db-4.6 db4.6 db46 db-4.5 db4.5 db45 db-4.4 db4.4 db44; do
             if test -f "$BERKELEY_DB_DIR/lib/lib$v.so"; then
                 BERKELEY_DB_LIB="-l$v"
 		break


Index: cfengine.spec
===================================================================
RCS file: /cvs/extras/rpms/cfengine/devel/cfengine.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- cfengine.spec	8 Aug 2008 17:48:48 -0000	1.36
+++ cfengine.spec	27 Sep 2008 16:01:31 -0000	1.37
@@ -1,13 +1,14 @@
 Summary: A systems administration tool for networks
 Name: cfengine
 Version: 2.2.8
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group: Applications/System
 Source0: ftp://ftp.iu.hio.no/pub/cfengine/cfengine-2.2.8.tar.gz
 Source1: cfexecd
 Source2: cfservd
 Source3: cfenvd
+Patch0: cfengine-2.2.8-db47.patch
 URL: http://www.cfengine.org/
 BuildRequires: db4-devel,openssl-devel,bison,flex,m4,libacl-devel
 BuildRequires: libselinux-devel,tetex-dvips,texinfo-tex
@@ -28,6 +29,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .db47
 
 
 %build
@@ -128,6 +130,9 @@
 
 
 %changelog
+* Sat Sep 27 2008 Jeff Sheltren <jeff at osuosl.org> 2.2.8-2
+- Patch configure to detect db-4.7 (#461942)
+
 * Fri Aug  8 2008 Jeff Sheltren <jeff at osuosl.org> 2.2.8-1
 - Update to upstream 2.2.8
 - Release now includes full documentation again