rpms/cmake/devel cmake.spec, 1.40, 1.41 cmake-2.4.5-xmlrpc.patch, 1.2, NONE cmake-2.6.1-jni.patch, 1.1, NONE

[Orion Poplawski]

Author: orion

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

Modified Files:
	cmake.spec 
Removed Files:
	cmake-2.4.5-xmlrpc.patch cmake-2.6.1-jni.patch 
Log Message:
* Tue Sep 2 2008 Orion Poplawski <orion at cora.nwra.com> - 2.6.1-3
- Drop jni patch, applied upstream.



Index: cmake.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cmake/devel/cmake.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- cmake.spec	26 Aug 2008 20:16:52 -0000	1.40
+++ cmake.spec	2 Sep 2008 21:52:56 -0000	1.41
@@ -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 @@
 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 @@
 
 %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 @@
 
 
 %changelog
+* Tue Sep 2 2008 Orion Poplawski <orion at cora.nwra.com> - 2.6.1-3
+- Drop jni patch, applied upstream.
+
 * Tue Aug 26 2008 Rex Dieter <rdieter at fedoraproject.org> - 2.6.1-2
 - attempt to patch logic error, crasher
 


--- cmake-2.4.5-xmlrpc.patch DELETED ---


--- cmake-2.6.1-jni.patch DELETED ---