rpms/cmake/FC-5 cmake-2.4.2-fedora.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 cmake.spec, 1.1, 1.2 sources, 1.2, 1.3

Mon Jul 31 19:33:45 UTC 2006

Author: orion

Update of /cvs/extras/rpms/cmake/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13787

Modified Files:
	.cvsignore cmake.spec sources 
Added Files:
	cmake-2.4.2-fedora.patch 
Log Message:
- Patch FindRuby and FindSWIG to work on Fedora (bug #198103)
- Update to 2.4.2
- Update for vim 7.0


cmake-2.4.2-fedora.patch:

--- NEW FILE cmake-2.4.2-fedora.patch ---
--- 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")


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cmake/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	29 Mar 2006 19:03:00 -0000	1.2
+++ .cvsignore	31 Jul 2006 19:33:45 -0000	1.3
@@ -1 +1 @@
-cmake-2.2.3.tar.gz
+cmake-2.4.2.tar.gz


Index: cmake.spec
===================================================================
RCS file: /cvs/extras/rpms/cmake/FC-5/cmake.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cmake.spec	29 Mar 2006 19:03:00 -0000	1.1
+++ cmake.spec	31 Jul 2006 19:33:45 -0000	1.2
@@ -1,13 +1,14 @@
 Name:		cmake
-Version:	2.2.3
-Release:	3%{?dist}
+Version:	2.4.2
+Release:	1%{?dist}
 Summary:	Cross-platform make system
 
 Group:		Development/Tools
 License:	BSD
 URL:		http://www.cmake.org
-Source0:	http://www.cmake.org/files/v2.2/cmake-%{version}.tar.gz
+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 @@
 
 %prep
 %setup -q
+%patch -p1 -b .fedora
 
 
 %build
@@ -36,12 +38,12 @@
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 find $RPM_BUILD_ROOT/%{_datadir}/%{name}/Modules -type f | xargs chmod -x
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/vim/vim64/syntax
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/vim/vim64/indent
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/vim/vim70/syntax
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/vim/vim70/indent
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp
 cp -a Example $RPM_BUILD_ROOT%{_datadir}/doc/%{name}-%{version}/
-install -m 0644 Docs/cmake-syntax.vim $RPM_BUILD_ROOT%{_datadir}/vim/vim64/syntax/cmake.vim
-install -m 0644 Docs/cmake-indent.vim $RPM_BUILD_ROOT%{_datadir}/vim/vim64/indent/cmake.vim
+install -m 0644 Docs/cmake-syntax.vim $RPM_BUILD_ROOT%{_datadir}/vim/vim70/syntax/cmake.vim
+install -m 0644 Docs/cmake-indent.vim $RPM_BUILD_ROOT%{_datadir}/vim/vim70/indent/cmake.vim
 install -m 0644 Docs/cmake-mode.el $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/
 
 
@@ -54,6 +56,7 @@
 %{_datadir}/doc/%{name}-%{version}/
 %{_bindir}/ccmake
 %{_bindir}/cmake
+%{_bindir}/cpack
 %{_bindir}/ctest
 %{_datadir}/%{name}/
 %{_mandir}/man1/*.1*
@@ -62,6 +65,11 @@
 
 
 %changelog
+* Mon Jul 31 2006 Orion Poplawski <orion at cora.nwra.com> - 2.4.2-1
+- Patch FindRuby and FindSWIG to work on Fedora (bug #198103)
+- Update to 2.4.2
+- Update for vim 7.0
+
 * Tue Mar 28 2006 Orion Poplawski <orion at cora.nwra.com> - 2.2.3-3
 - No subpackages, just own the emacs and vim dirs.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cmake/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	29 Mar 2006 19:03:00 -0000	1.2
+++ sources	31 Jul 2006 19:33:45 -0000	1.3
@@ -1 +1 @@
-93a22d448675a9c2ea51982f08437f01  cmake-2.2.3.tar.gz
+c774f932cbd0c77d3cd76f0f8f46e0d9  cmake-2.4.2.tar.gz


