From 7de84763e8d5e5f545eb97d47420214f475816f5 Mon Sep 17 00:00:00 2001
From: Kevin Kofler <kkofler@fedoraproject.org>
Date: Mar 09 2009 02:00:11 +0000
Subject: - Fix crash during kdepimlibs build (#475876)


---

diff --git a/cmake-2.6.3-#475876.patch b/cmake-2.6.3-#475876.patch
new file mode 100644
index 0000000..9fd9b28
--- /dev/null
+++ b/cmake-2.6.3-#475876.patch
@@ -0,0 +1,19 @@
+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 7b07e3b..baf2b9f 100644
--- a/cmake.spec
+++ b/cmake.spec
@@ -8,7 +8,7 @@
 
 Name:           cmake
 Version:        2.6.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Cross-platform make system
 
 Group:          Development/Tools
@@ -16,6 +16,9 @@ License:        BSD
 URL:            http://www.cmake.org
 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
@@ -50,6 +53,7 @@ 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
 
@@ -125,6 +129,9 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
 
 
 %changelog
+* Mon Mar 09 2009 Kevin Kofler <Kevin@tigcc.ticalc.org> - 2.6.3-2
+- Fix crash during kdepimlibs build (#475876)
+
 * Mon Feb 23 2009 Orion Poplawski <orion@cora.nwra.com> - 2.6.3-1
 - Update to 2.6.3 final