From 8bcea31ac435d2a3e3b1986ba5cd43b1c61ba622 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Tue, 31 Oct 2006 23:11:16 +0000 Subject: [PATCH] Add /usr/lib/jvm/java to FindJNI search paths --- cmake-2.4.2-fedora.patch | 18 ++++++++++++++++++ cmake.spec | 5 ++++- 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/cmake-2.4.2-fedora.patch b/cmake-2.4.2-fedora.patch index 60cf8cd..a31f236 100644 --- a/cmake-2.4.2-fedora.patch +++ b/cmake-2.4.2-fedora.patch @@ -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 diff --git a/cmake.spec b/cmake.spec index 618c9c6..273963d 100644 --- a/cmake.spec +++ b/cmake.spec @@ -1,6 +1,6 @@ Name: cmake Version: 2.4.3 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Cross-platform make system Group: Development/Tools @@ -62,6 +62,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Oct 31 2006 Orion Poplawski - 2.4.3-4 +- Add /usr/lib/jvm/java to FindJNI search paths + * Tue Aug 29 2006 Orion Poplawski - 2.4.3-3 - Rebuild for FC6