rpms/db4/devel db-4.6.21-1.85-compat.patch, NONE, 1.1 db4.spec, 1.63, 1.64

[Jindrich Novy]

Author: jnovy

Update of /cvs/pkgs/rpms/db4/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3360

Modified Files:
	db4.spec 
Added Files:
	db-4.6.21-1.85-compat.patch 
Log Message:
* Tue Sep 16 2008 Jindrich Novy <jnovy at redhat.com> 4.7.25-5
- 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: db4.spec
===================================================================
RCS file: /cvs/pkgs/rpms/db4/devel/db4.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- db4.spec	10 Sep 2008 18:50:59 -0000	1.63
+++ db4.spec	16 Sep 2008 15:56:27 -0000	1.64
@@ -5,11 +5,12 @@
 Summary: The Berkeley DB database library (version 4) for C
 Name: db4
 Version: 4.7.25
-Release: 4%{?dist}
+Release: 5%{?dist}
 Source0: http://download.oracle.com/berkeley-db/db-%{version}.tar.gz
 Source1: http://download.oracle.com/berkeley-db/db.1.85.tar.gz
 Patch1: http://www.oracle.com/technology/products/berkeley-db/db/update/4.7.25/patch.4.7.25.1
 Patch2: db-4.3.29-sparc64.patch
+Patch3: db-4.6.21-1.85-compat.patch
 Patch10: http://www.oracle.com/technology/products/berkeley-db/db/update/1.85/patch.1.1
 Patch11: http://www.oracle.com/technology/products/berkeley-db/db/update/1.85/patch.1.2
 Patch12: http://www.oracle.com/technology/products/berkeley-db/db/update/1.85/patch.1.3
@@ -115,6 +116,7 @@
 %setup -q -n db-%{version} -a 1
 %patch1 -p0 -b .sequence
 %patch2 -p1 -b .sparc64
+%patch3 -p1 -b .185compat
 
 pushd dist
 libtoolize --copy --force
@@ -366,6 +368,9 @@
 %endif
 
 %changelog
+* Tue Sep 16 2008 Jindrich Novy <jnovy at redhat.com> 4.7.25-5
+- build also if db4 is not installed (thanks to Michael A. Peters)
+
 * Wed Sep 10 2008 Jindrich Novy <jnovy at redhat.com> 4.7.25-4
 - actually apply the .jni patch
 - fix permissions in db4-utils package (#225675)