Patch FindRuby and FindSWIG to work on Fedora (bug #198103)

cmake-2.4.2-fedora.patch

@@ -0,0 +1,44 @@
+--- cmake-2.4.2/Modules/FindRuby.cmake.fedora	2006-07-11 10:20:14.000000000 -0600
++++ cmake-2.4.2/Modules/FindRuby.cmake	2006-07-11 10:20:38.000000000 -0600
+@@ -9,6 +9,7 @@
+ 
+ SET(RUBY_POSSIBLE_INCLUDE_PATHS
+-  /usr/lib/ruby/1.8/i386-linux
++  /usr/lib/ruby/*/i386-linux
++  /usr/lib64/ruby/*/x86_64-linux
+   )
+ 
+ SET(RUBY_POSSIBLE_LIB_PATHS
+@@ -19,12 +20,12 @@
+   ${RUBY_POSSIBLE_INCLUDE_PATHS})
+ 
+ FIND_LIBRARY(RUBY_LIBRARY
+-  NAMES ruby1.8
++  NAMES ruby
+   PATHS ${RUBY_POSSIBLE_LIB_PATHS}
+   )
+ 
+ FIND_PROGRAM(RUBY_EXECUTABLE
+-  NAMES ruby1.8
++  NAMES ruby
+   PATHS
+   /usr/bin
+   /usr/local/bin
+--- cmake-2.4.2/Modules/FindSWIG.cmake.fedora	2006-07-11 10:21:11.000000000 -0600
++++ cmake-2.4.2/Modules/FindSWIG.cmake	2006-07-11 10:22:47.000000000 -0600
+@@ -7,13 +7,11 @@
+ SET(SWIG_FOUND FOOBAR)
+ FIND_PATH(SWIG_DIR
+   SWIGConfig.cmake
+-  /usr/share/swig1.3
+-  /usr/lib/swig1.3
++  /usr/share/swig/*
+   /usr/local/share/swig1.3)
+ FIND_PATH(SWIG_DIR
+   swig.swg
+-  /usr/share/swig1.3
+-  /usr/lib/swig1.3
++  /usr/share/swig/*
+   /usr/local/share/swig1.3)
+ IF(EXISTS ${SWIG_DIR})
+   IF("x${SWIG_DIR}x" STREQUAL "x${CMAKE_ROOT}/Modulesx")

cmake.spec

@@ -1,6 +1,6 @@
 Name:		cmake
 Version:	2.4.2
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Cross-platform make system
 
 Group:		Development/Tools
@@ -8,6 +8,7 @@ License:	BSD
 URL:		http://www.cmake.org
 Source0:	http://www.cmake.org/files/v2.4/cmake-%{version}.tar.gz
 Source1:        cmake-init-fedora
+Patch0:         cmake-2.4.2-fedora.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  ncurses-devel, libX11-devel
 
@@ -22,6 +23,7 @@ generation, code generation, and template instantiation.
 
 %prep
 %setup -q
+%patch -p1 -b .fedora
 
 
 %build
@@ -63,6 +65,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Jul 11 2006 Orion Poplawski <orion@cora.nwra.com> - 2.4.2-2
+- Patch FindRuby and FindSWIG to work on Fedora (bug #198103)
+
 * Fri Jun 30 2006 Orion Poplawski <orion@cora.nwra.com> - 2.4.2-1
 - Update to 2.4.2