From a5831c9db5a9f8f85756240db0119b810b66bd7e Mon Sep 17 00:00:00 2001
From: Orion Poplawski <orion@fedoraproject.org>
Date: Tue, 2 Sep 2008 21:52:56 +0000
Subject: [PATCH] - Drop jni patch, applied upstream.

---
 cmake-2.4.5-xmlrpc.patch | 23 -----------------------
 cmake-2.6.1-jni.patch    | 19 -------------------
 cmake.spec               | 15 +++++----------
 3 files changed, 5 insertions(+), 52 deletions(-)
 delete mode 100644 cmake-2.4.5-xmlrpc.patch
 delete mode 100644 cmake-2.6.1-jni.patch

diff --git a/cmake-2.4.5-xmlrpc.patch b/cmake-2.4.5-xmlrpc.patch
deleted file mode 100644
index abf1f39..0000000
--- a/cmake-2.4.5-xmlrpc.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- cmake-2.4.5/Modules//FindXMLRPC.cmake.xmlrpc	2006-12-18 16:37:09.000000000 -0700
-+++ cmake-2.4.5/Modules//FindXMLRPC.cmake	2006-12-18 16:37:16.000000000 -0700
-@@ -102,7 +102,6 @@
-       FIND_LIBRARY(XMLRPC_${name}_LIBRARY
-         NAMES ${name}
-         PATHS ${XMLRPC_LIBRARY_DIRS}
--        NO_DEFAULT_PATH
-         )
-       MARK_AS_ADVANCED(XMLRPC_${name}_LIBRARY)
- 
---- cmake-2.4.5/Utilities/cm_xmlrpc.h.xmlrpc	2006-12-04 09:04:06.000000000 -0700
-+++ cmake-2.4.5/Utilities/cm_xmlrpc.h	2006-12-18 17:00:01.000000000 -0700
-@@ -20,8 +20,8 @@
- /* Use the xmlrpc library configured for CMake.  */
- #include "cmThirdParty.h"
- #ifdef CMAKE_USE_SYSTEM_XMLRPC
--# include <xmlrpc.h>
--# include <xmlrpc_client.h>
-+# include <xmlrpc-c/base.h>
-+# include <xmlrpc-c/client.h>
- #else
- # include <cmxmlrpc/xmlrpc.h>
- # include <cmxmlrpc/xmlrpc_client.h>
diff --git a/cmake-2.6.1-jni.patch b/cmake-2.6.1-jni.patch
deleted file mode 100644
index 6403c98..0000000
--- a/cmake-2.6.1-jni.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-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
diff --git a/cmake.spec b/cmake.spec
index c69c342..de589d4 100644
--- a/cmake.spec
+++ b/cmake.spec
@@ -4,7 +4,7 @@
 
 Name:           cmake
 Version:        2.6.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Cross-platform make system
 
 Group:          Development/Tools
@@ -12,13 +12,8 @@ License:        BSD
 URL:            http://www.cmake.org
 Source0:        http://www.cmake.org/files/v2.6/cmake-%{version}.tar.gz
 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.1-jni.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-# fix a crasher, see 
-# http://www.redhat.com/archives/fedora-devel-list/2008-August/msg01145.html
+#See http://public.kitware.com/Bug/view.php?id=7392
 Patch1:         cmake-2.6.1-parens.patch   
 
 BuildRequires:  ncurses-devel, libX11-devel
@@ -48,10 +43,7 @@ The %{name}-gui package contains the Qt based GUI for CMake.
 
 %prep
 %setup -q -n %{name}-%{version}
-
-%patch0 -p1 -b .jni
 %patch1 -p1 -b .parens
-
 # Fixup permissions
 find -name \*.h -o -name \*.cxx -print0 | xargs -0 chmod -x
 
@@ -122,6 +114,9 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
 
 
 %changelog
+* Tue Sep 2 2008 Orion Poplawski <orion@cora.nwra.com> - 2.6.1-3
+- Drop jni patch, applied upstream.
+
 * Tue Aug 26 2008 Rex Dieter <rdieter@fedoraproject.org> - 2.6.1-2
 - attempt to patch logic error, crasher