rpms/db4/devel db-4.5.20-jni-include-dir.patch, NONE, 1.1 db4.spec, 1.44, 1.45

[fedora-cvs-commits at redhat.com]

Author: jnovy

Update of /cvs/dist/rpms/db4/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20393

Modified Files:
	db4.spec 
Added Files:
	db-4.5.20-jni-include-dir.patch 
Log Message:
- Require java-1.5.0-gcj and java-1.5.0-gcj-devel for build


db-4.5.20-jni-include-dir.patch:
 configure.ac |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE db-4.5.20-jni-include-dir.patch ---
--- db-4.5.20/dist/configure.ac.orig	2007-03-24 17:56:44.000000000 -0400
+++ db-4.5.20/dist/configure.ac	2007-03-24 17:57:17.000000000 -0400
@@ -389,7 +389,7 @@
 	AC_PROG_JAVAC
 	AC_PROG_JAR
 	AC_PROG_JAVA
-	AC_JNI_INCLUDE_DIR
+	JNI_INCLUDE_DIRS="/usr/lib/jvm/java-1.5.0-gcj/include"
 
 	if test x$JAVA != x; then
 	AC_MSG_CHECKING(java version)


Index: db4.spec
===================================================================
RCS file: /cvs/dist/rpms/db4/devel/db4.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- db4.spec	4 Dec 2006 08:39:28 -0000	1.44
+++ db4.spec	30 Mar 2007 08:07:59 -0000	1.45
@@ -8,7 +8,7 @@
 Summary: The Berkeley DB database library (version 4) for C
 Name: db4
 Version: 4.5.20
-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
 Source2: nptl-abi-note.S
@@ -21,6 +21,7 @@
 Patch14: db-1.85-errno.patch
 Patch20: http://www.oracle.com/technology/products/berkeley-db/db/update/4.5.20/patch.4.5.20.1
 Patch21: http://www.oracle.com/technology/products/berkeley-db/db/update/4.5.20/patch.4.5.20.2
+Patch22: db-4.5.20-jni-include-dir.patch
 URL: http://www.oracle.com/database/berkeley-db/
 License: BSD-style
 Group: System Environment/Libraries
@@ -28,8 +29,8 @@
 BuildRequires: perl, libtool, ed, tcl-devel >= 8.4.4
 %ifarch %{java_arches}
 BuildRequires: gcc-java
-BuildRequires: java-1.4.2-gcj-compat
-BuildRequires: java-1.4.2-gcj-compat-devel
+BuildRequires: java-1.5.0-gcj
+BuildRequires: java-1.5.0-gcj-devel
 %endif
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -116,6 +117,7 @@
 
 %patch20 -p0 -b .4.5.20.1
 %patch21 -p0 -b .4.5.20.2
+%patch22 -p1 -b .4.5.20.jni
 
 # Remove tags files which we don't need.
 find . -name tags | xargs rm -f
@@ -352,6 +354,9 @@
 %endif
 
 %changelog
+* Sat Mar 24 2007 Thomas Fitzsimmons <fitzsim at redhat.com> 4.5.20-5
+- Require java-1.5.0-gcj and java-1.5.0-gcj-devel for build.
+
 * Mon Dec  4 2006 Jindrich Novy <jnovy at redhat.com> 4.5.20-4
 - apply upstream patches for 4.5.20
   (Java API <-> core API related fixes)