rpms/compat-db/devel db-4.6.21-1.85-compat.patch, NONE, 1.1 compat-db.spec, 1.32, 1.33

[Jindrich Novy]

Author: jnovy

Update of /cvs/pkgs/rpms/compat-db/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2835

Modified Files:
	compat-db.spec 
Added Files:
	db-4.6.21-1.85-compat.patch 
Log Message:
* Tue Sep 16 2008 Jindrich Novy <jnovy at redhat.com> 4.6.21-4
- build also if db4 is not installed (thanks to Michael A. Peters)


db-4.6.21-1.85-compat.patch:

--- NEW FILE db-4.6.21-1.85-compat.patch ---
diff -ur db-4.6.21/dist/Makefile.in db-4.6.21-db.h_include-patched/dist/Makefile.in
--- db-4.6.21/dist/Makefile.in	2007-07-05 18:35:02.000000000 +0000
+++ db-4.6.21-db.h_include-patched/dist/Makefile.in	2008-09-05 08:59:36.000000000 +0000
@@ -139,8 +139,8 @@
 # local libraries, for example.  Do that by adding -I options to the DB185INC
 # line, and -l options to the DB185LIB line.
 ##################################################
-DB185INC=	-c @CFLAGS@ -I$(srcdir) @CPPFLAGS@
-DB185LIB=
+DB185INC=	-c @CFLAGS@ -I$(srcdir) -I$(srcdir)/db.1.85/PORT/linux/include @CPPFLAGS@
+DB185LIB=	${srcdir}/db.1.85/PORT/linux/libdb.a
 
 ##################################################
 # NOTHING BELOW THIS LINE SHOULD EVER NEED TO BE MODIFIED.


Index: compat-db.spec
===================================================================
RCS file: /cvs/pkgs/rpms/compat-db/devel/compat-db.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- compat-db.spec	2 Aug 2008 16:23:36 -0000	1.32
+++ compat-db.spec	16 Sep 2008 15:53:52 -0000	1.33
@@ -6,7 +6,7 @@
 Summary: The Berkeley DB database library for Red Hat Linux 7.x compatibility
 Name: compat-db
 Version: 4.6.21
-Release: 3%{?dist}
+Release: 4%{?dist}
 Source0: http://download.oracle.com/berkeley-db/db-4.3.29.tar.gz
 Source1: http://download.oracle.com/berkeley-db/db-4.5.20.tar.gz
 Source2: http://download.oracle.com/berkeley-db/db-4.6.21.tar.gz
@@ -14,6 +14,7 @@
 Patch2: db-4.3.29-64bit.patch
 Patch3: db-4.3.29-sparc64.patch
 Patch4: db-4.5.20-glibc.patch
+Patch5: db-4.6.21-1.85-compat.patch
 
 # Upstream db-4.3.29 patches
 Patch20: http://www.oracle.com/technology/products/berkeley-db/db/update/4.3.29/patch.4.3.29.1
@@ -49,6 +50,7 @@
 pushd db-4.3.29
 %patch2 -p1 -b .64bit
 %patch3 -p1 -b .sparc64
+%patch5 -p1 -b .185compat
 %patch20 -p0
 popd
 
@@ -204,6 +206,9 @@
 %{_includedir}/*
 
 %changelog
+* Tue Sep 16 2008 Jindrich Novy <jnovy at redhat.com> 4.6.21-4
+- build also if db4 is not installed (thanks to Michael A. Peters)
+
 * Sat Aug 02 2008 Jindrich Novy <jnovy at redhat.com> 4.6.21-3
 - fix URL to 4.3.29 patch
 - official upstream tarball for db-4.3.29 has changed, the only change