From fdd7d81f307b32c5da17eb4980b6b882b333afc3 Mon Sep 17 00:00:00 2001
From: Orion Poplawski <orion@fedoraproject.org>
Date: Wed, 29 Apr 2009 21:14:42 +0000
Subject: [PATCH] - Update to 2.6.4 - Drop patch for bug #475876 fixed upstream

---
 .cvsignore                |  2 +-
 cmake-2.6.3-#475876.patch | 19 -------------------
 cmake.spec                | 10 ++++++----
 sources                   |  2 +-
 4 files changed, 8 insertions(+), 25 deletions(-)
 delete mode 100644 cmake-2.6.3-#475876.patch

diff --git a/.cvsignore b/.cvsignore
index 602224e..d8a0347 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-cmake-2.6.3.tar.gz
+cmake-2.6.4.tar.gz
diff --git a/cmake-2.6.3-#475876.patch b/cmake-2.6.3-#475876.patch
deleted file mode 100644
index 9fd9b28..0000000
--- a/cmake-2.6.3-#475876.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -ur cmake-2.6.3/Source/cmIncludeDirectoryCommand.cxx cmake-2.6.3-#475876/Source/cmIncludeDirectoryCommand.cxx
---- cmake-2.6.3/Source/cmIncludeDirectoryCommand.cxx	2009-02-21 21:36:52.000000000 +0100
-+++ cmake-2.6.3-#475876/Source/cmIncludeDirectoryCommand.cxx	2009-03-09 02:55:46.000000000 +0100
-@@ -95,13 +95,13 @@
- 
-   // remove any leading or trailing spaces and \r
-   pos = ret.size()-1;
--  while(ret[pos] == ' ' || ret[pos] == '\r')
-+  while(ret.size() && (ret[pos] == ' ' || ret[pos] == '\r'))
-     {
-     ret.erase(pos);
-     pos--;
-     }
-   pos = 0;
--  while(ret.size() && ret[pos] == ' ' || ret[pos] == '\r')
-+  while(ret.size() && (ret[pos] == ' ' || ret[pos] == '\r'))
-     {
-     ret.erase(pos,1);
-     }
diff --git a/cmake.spec b/cmake.spec
index 9f99f4f..8968178 100644
--- a/cmake.spec
+++ b/cmake.spec
@@ -7,8 +7,8 @@
 %define rcver %{nil}
 
 Name:           cmake
-Version:        2.6.3
-Release:        3%{?dist}
+Version:        2.6.4
+Release:        1%{?dist}
 Summary:        Cross-platform make system
 
 Group:          Development/Tools
@@ -18,7 +18,6 @@ Source0:        http://www.cmake.org/files/v2.6/cmake-%{version}%{rcver}.tar.gz
 Source2:        macros.cmake
 # fix crash during kdepimlibs build
 # https://bugzilla.redhat.com/show_bug.cgi?id=475876
-Patch0:         cmake-2.6.3-#475876.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  ncurses-devel, libX11-devel
@@ -53,7 +52,6 @@ The %{name}-gui package contains the Qt based GUI for CMake.
 
 %prep
 %setup -q -n %{name}-%{version}%{rcver}
-%patch0 -p1 -b .475876
 # Fixup permissions
 find -name \*.h -o -name \*.cxx -print0 | xargs -0 chmod -x
 
@@ -132,6 +130,10 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
 
 
 %changelog
+* Wed Apr 29 2009 Orion Poplawski <orion@cora.nwra.com> - 2.6.4-1
+- Update to 2.6.4
+- Drop patch for bug #475876 fixed upstream
+
 * Mon Mar 16 2009 Rex Dieter <rdieter@fedoraproject.org> - 2.6.3-3
 - macros.cmake: +%%_cmake_version
 
diff --git a/sources b/sources
index f645c42..804ecf1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5ba47a94ce276f326abca1fd72a7e7c6  cmake-2.6.3.tar.gz
+50f387d0436696c4a68b5512a72c9cde  cmake-2.6.4.tar.gz