rpms/cmake/devel cmake-2.8.0-vtk64.patch, NONE, 1.1 .cvsignore, 1.28, 1.29 cmake.spec, 1.60, 1.61 sources, 1.28, 1.29 cmake-2.6.4-vtk64.patch, 1.1, NONE

[Orion Poplawski]

Author: orion

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

Modified Files:
	.cvsignore cmake.spec sources 
Added Files:
	cmake-2.8.0-vtk64.patch 
Removed Files:
	cmake-2.6.4-vtk64.patch 
Log Message:
* Tue Sep 29 2009 Orion Poplawski <orion at cora.nwra.com> - 2.8.0-0.1.rc1
- Update to 2.8.0 RC 1


cmake-2.8.0-vtk64.patch:
 FindVTK.cmake |    5 +++++
 1 file changed, 5 insertions(+)

--- NEW FILE cmake-2.8.0-vtk64.patch ---
--- cmake-2.8.0-rc1/Modules/FindVTK.cmake.vtk64	2009-09-25 12:29:20.000000000 -0600
+++ cmake-2.8.0-rc1/Modules/FindVTK.cmake	2009-09-29 10:33:20.506713352 -0600
@@ -45,10 +45,15 @@
   SET(VTK_DIR_SEARCH "")
   FOREACH(dir ${VTK_DIR_SEARCH2})
     SET(VTK_DIR_SEARCH ${VTK_DIR_SEARCH}
+      ${dir}/../lib64/vtk-5.4
       ${dir}/../lib/vtk-5.4
+      ${dir}/../lib64/vtk-5.2
       ${dir}/../lib/vtk-5.2
+      ${dir}/../lib64/vtk-5.1
       ${dir}/../lib/vtk-5.1
+      ${dir}/../lib64/vtk-5.0
       ${dir}/../lib/vtk-5.0
+      ${dir}/../lib64/vtk
       ${dir}/../lib/vtk
       )
   ENDFOREACH(dir)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cmake/devel/.cvsignore,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- .cvsignore	29 Apr 2009 21:14:42 -0000	1.28
+++ .cvsignore	29 Sep 2009 17:36:17 -0000	1.29
@@ -1 +1 @@
-cmake-2.6.4.tar.gz
+cmake-2.8.0-rc1.tar.gz


Index: cmake.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cmake/devel/cmake.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -p -r1.60 -r1.61
--- cmake.spec	17 Sep 2009 15:19:25 -0000	1.60
+++ cmake.spec	29 Sep 2009 17:36:18 -0000	1.61
@@ -4,21 +4,21 @@
 # Set to bcond_with or use --without gui to disable qt4 gui build
 %bcond_without gui
 # Set to RC version if building RC, else %{nil}
-%define rcver %{nil}
+%define rcver -rc1
 
 Name:           cmake
-Version:        2.6.4
-Release:        4%{?dist}
+Version:        2.8.0
+Release:        0.1.rc1%{?dist}
 Summary:        Cross-platform make system
 
 Group:          Development/Tools
 License:        BSD
 URL:            http://www.cmake.org
-Source0:        http://www.cmake.org/files/v2.6/cmake-%{version}%{rcver}.tar.gz
+Source0:        http://www.cmake.org/files/v2.8/cmake-%{version}%{?rcver}.tar.gz
 Source2:        macros.cmake
 #Find UseVTK.cmake in /usr/lib64/vtk-* on 64-bit machines
 #http://public.kitware.com/mantis/view.php?id=9105
-Patch0:         cmake-2.6.4-vtk64.patch
+Patch0:         cmake-2.8.0-vtk64.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  ncurses-devel, libX11-devel
@@ -52,7 +52,7 @@ The %{name}-gui package contains the Qt 
 
 
 %prep
-%setup -q -n %{name}-%{version}%{rcver}
+%setup -q -n %{name}-%{version}%{?rcver}
 %patch0 -p1 -b .vtk64
 # Fixup permissions
 find -name \*.h -o -name \*.cxx -print0 | xargs -0 chmod -x
@@ -132,6 +132,9 @@ update-mime-database %{_datadir}/mime &>
 
 
 %changelog
+* Tue Sep 29 2009 Orion Poplawski <orion at cora.nwra.com> - 2.8.0-0.1.rc1
+- Update to 2.8.0 RC 1
+
 * Thu Sep 17 2009 Rex Dieter <rdieter at fedoraproject.org> - 2.6.4-4
 - macro.cmake: prefixes cmake with the package being builts bindir (#523878)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cmake/devel/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- sources	29 Apr 2009 21:14:42 -0000	1.28
+++ sources	29 Sep 2009 17:36:18 -0000	1.29
@@ -1 +1 @@
-50f387d0436696c4a68b5512a72c9cde  cmake-2.6.4.tar.gz
+d849a05aa043d0e28193ae3d03928c8f  cmake-2.8.0-rc1.tar.gz


--- cmake-2.6.4-vtk64.patch DELETED ---