rpms/cmake/FC-5 cmake-2.4.2-fedora.patch, 1.1, 1.2 cmake.spec, 1.4, 1.5

[Orion Poplawski (orion)]

Author: orion

Update of /cvs/extras/rpms/cmake/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3184/FC-5

Modified Files:
	cmake-2.4.2-fedora.patch cmake.spec 
Log Message:
Add /usr/lib/jvm/java to FindJNI search paths


cmake-2.4.2-fedora.patch:

Index: cmake-2.4.2-fedora.patch
===================================================================
RCS file: /cvs/extras/rpms/cmake/FC-5/cmake-2.4.2-fedora.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cmake-2.4.2-fedora.patch	31 Jul 2006 19:33:45 -0000	1.1
+++ cmake-2.4.2-fedora.patch	31 Oct 2006 23:13:39 -0000	1.2
@@ -42,3 +42,21 @@
    /usr/local/share/swig1.3)
  IF(EXISTS ${SWIG_DIR})
    IF("x${SWIG_DIR}x" STREQUAL "x${CMAKE_ROOT}/Modulesx")
+--- cmake-2.4.3/Modules/FindJNI.cmake.orig	2006-10-31 16:07:57.000000000 -0700
++++ cmake-2.4.3/Modules/FindJNI.cmake	2006-10-31 16:09:36.000000000 -0700
+@@ -14,6 +14,7 @@
+   $ENV{JAVA_HOME}/jre/lib/i386
+   $ENV{JAVA_HOME}/jre/lib/amd64
+   /usr/lib
++  /usr/lib/jvm/java/lib
+   /usr/local/lib
+   /usr/lib/java/jre/lib/i386
+   /usr/local/lib/java/jre/lib/i386
+@@ -27,6 +28,7 @@
+   "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.3;JavaHome]/include"
+   $ENV{JAVA_HOME}/include
+   /usr/include 
++  /usr/lib/jvm/java/include
+   /usr/local/include
+   /usr/lib/java/include
+   /usr/local/lib/java/include


Index: cmake.spec
===================================================================
RCS file: /cvs/extras/rpms/cmake/FC-5/cmake.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- cmake.spec	2 Aug 2006 17:55:32 -0000	1.4
+++ cmake.spec	31 Oct 2006 23:13:39 -0000	1.5
@@ -1,6 +1,6 @@
 Name:		cmake
 Version:	2.4.3
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Cross-platform make system
 
 Group:		Development/Tools
@@ -62,6 +62,9 @@
 
 
 %changelog
+* Tue Oct 31 2006 Orion Poplawski <orion at cora.nwra.com> - 2.4.3-3
+- Add /usr/lib/jvm/java to FindJNI search paths
+
 * Wed Aug  2 2006 Orion Poplawski <orion at cora.nwra.com> - 2.4.3-2
 - vim 7.0 now ships cmake files, so don't ship ours (bug #201018)
 - Add patch to Linux.cmake for Fortran soname support for plplot