rpms/cmake/devel cmake-2.6.1-jni.patch, NONE, 1.1 cmake.spec, 1.39, 1.40 cmake-2.6.0-jni.patch, 1.1, NONE

[Rex Dieter]

Author: rdieter

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

Modified Files:
	cmake.spec 
Added Files:
	cmake-2.6.1-jni.patch 
Removed Files:
	cmake-2.6.0-jni.patch 
Log Message:
rebase jni patch


cmake-2.6.1-jni.patch:

--- NEW FILE cmake-2.6.1-jni.patch ---
diff -up cmake-2.6.1/Modules/FindJNI.cmake.jni cmake-2.6.1/Modules/FindJNI.cmake
--- cmake-2.6.1/Modules/FindJNI.cmake.jni	2008-08-01 10:34:50.000000000 -0500
+++ cmake-2.6.1/Modules/FindJNI.cmake	2008-08-26 15:15:01.000000000 -0500
@@ -23,6 +23,7 @@ SET(JAVA_AWT_LIBRARY_DIRECTORIES
   $ENV{JAVA_HOME}/jre/lib/amd64
   $ENV{JAVA_HOME}/jre/lib/ppc
   /usr/lib
+  /usr/lib/jvm/java/lib
   /usr/local/lib
   /usr/lib/jvm/java/lib
   /usr/lib/java/jre/lib/i386
@@ -61,6 +62,7 @@ SET(JAVA_AWT_INCLUDE_DIRECTORIES
   "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\${java_install_version};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/pkgs/rpms/cmake/devel/cmake.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- cmake.spec	26 Aug 2008 20:05:15 -0000	1.39
+++ cmake.spec	26 Aug 2008 20:16:52 -0000	1.40
@@ -14,7 +14,7 @@
 Source2:        macros.cmake
 #Patch to look for jni files where Fedora puts them.
 #Submitted upstream: http://public.kitware.com/Bug/view.php?id=7333
-Patch0:         cmake-2.6.0-jni.patch
+Patch0:         cmake-2.6.1-jni.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # fix a crasher, see 


--- cmake-2.6.0-jni.patch DELETED ---