rpms/cmake/devel cmake-2.6.3-#475876.patch, NONE, 1.1 cmake.spec, 1.54, 1.55

[Kevin Kofler]

Author: kkofler

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

Modified Files:
	cmake.spec 
Added Files:
	cmake-2.6.3-#475876.patch 
Log Message:
* Mon Mar 09 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 2.6.3-2
- Fix crash during kdepimlibs build (#475876)

cmake-2.6.3-#475876.patch:

--- NEW FILE cmake-2.6.3-#475876.patch ---
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);
     }


Index: cmake.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cmake/devel/cmake.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- cmake.spec	24 Feb 2009 04:23:11 -0000	1.54
+++ cmake.spec	9 Mar 2009 02:00:11 -0000	1.55
@@ -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 @@
 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 @@
 
 %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 @@
 
 
 %changelog
+* Mon Mar 09 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 2.6.3-2
+- Fix crash during kdepimlibs build (#475876)
+
 * Mon Feb 23 2009 Orion Poplawski <orion at cora.nwra.com> - 2.6.3-1
 - Update to 2.6.3 final