From af13f593196ffc9b289a7911eaf5118166b37670 Mon Sep 17 00:00:00 2001
From: Orion Poplawski <orion@fedoraproject.org>
Date: Tue, 13 Oct 2009 22:17:43 +0000
Subject: [PATCH] - Update to 2.8.0 RC 3 - Drop vtk64 patch fixed upstream

---
 .cvsignore              |  2 +-
 cmake-2.8.0-vtk64.patch | 18 ------------------
 cmake.spec              | 12 ++++++------
 sources                 |  2 +-
 4 files changed, 8 insertions(+), 26 deletions(-)
 delete mode 100644 cmake-2.8.0-vtk64.patch

diff --git a/.cvsignore b/.cvsignore
index 80fc416..6ee7ffc 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-cmake-2.8.0-rc2.tar.gz
+cmake-2.8.0-rc3.tar.gz
diff --git a/cmake-2.8.0-vtk64.patch b/cmake-2.8.0-vtk64.patch
deleted file mode 100644
index e6963d4..0000000
--- a/cmake-2.8.0-vtk64.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- 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)
diff --git a/cmake.spec b/cmake.spec
index 8bcbfe5..e1446ba 100644
--- a/cmake.spec
+++ b/cmake.spec
@@ -4,11 +4,11 @@
 # 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 -rc2
+%define rcver -rc3
 
 Name:           cmake
 Version:        2.8.0
-Release:        0.3.rc2%{?dist}
+Release:        0.4.rc3%{?dist}
 Summary:        Cross-platform make system
 
 Group:          Development/Tools
@@ -16,9 +16,6 @@ License:        BSD
 URL:            http://www.cmake.org
 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.8.0-vtk64.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  ncurses-devel, libX11-devel
@@ -53,7 +50,6 @@ The %{name}-gui package contains the Qt based GUI for CMake.
 
 %prep
 %setup -q -n %{name}-%{version}%{?rcver}
-%patch0 -p1 -b .vtk64
 # Fixup permissions
 find -name \*.h -o -name \*.cxx -print0 | xargs -0 chmod -x
 
@@ -137,6 +133,10 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
 
 
 %changelog
+* Tue Oct 13 2009 Orion Poplawski <orion@cora.nwra.com> - 2.8.0-0.4.rc3
+- Update to 2.8.0 RC 3
+- Drop vtk64 patch fixed upstream
+
 * Fri Oct 9 2009 Orion Poplawski <orion@cora.nwra.com> - 2.8.0-0.3.rc2
 - Do out of tree build, needed for ExternalProject test
 
diff --git a/sources b/sources
index 62facd6..07fb25c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-85c51602dd00184cdc6b15db0164330d  cmake-2.8.0-rc2.tar.gz
+7cc121a0199affa0697e11fbeefd00c3  cmake-2.8.0-rc3.tar.gz