rpms/cmake/F-10 cmake-2.6.3-#475876.patch, NONE, 1.1 .cvsignore, 1.23, 1.24 cmake.spec, 1.47, 1.48 sources, 1.23, 1.24

[Kevin Kofler]

Author: kkofler

Update of /cvs/pkgs/rpms/cmake/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12224/F-10

Modified Files:
	.cvsignore cmake.spec sources 
Added Files:
	cmake-2.6.3-#475876.patch 
Log Message:
Sync from devel:

* 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

* Tue Feb 17 2009 Orion Poplawski <orion at cora.nwra.com> - 2.6.3-0.4.rc13
- Update to 2.6.3-RC-13

* Tue Jan 13 2009 Orion Poplawski <orion at cora.nwra.com> - 2.6.3-0.3.rc8
- Update to 2.6.3-RC-8

* Sun Jan 04 2009 Rex Dieter <rdieter at fedoraproject.org> - 2.6.3-0.2.rc5
- macros.cmake: add -DCMAKE_SKIP_RPATH:BOOL=ON
- fix Release tag

* Wed Dec 10 2008 Orion Poplawski <orion at cora.nwra.com> - 2.6.3-0.rc5.1
- Update to 2.6.3-RC-5

* Tue Dec 2 2008 Rex Dieter <rdieter at fedoraproject.org> - 2.6.2-3
- Add -DCMAKE_VERBOSE_MAKEFILE=ON to %%cmake (#474053)
- preserve timestamp of macros.cmake
- cosmetics

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: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cmake/F-10/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- .cvsignore	29 Sep 2008 21:24:39 -0000	1.23
+++ .cvsignore	10 Mar 2009 06:22:59 -0000	1.24
@@ -1 +1 @@
-cmake-2.6.2.tar.gz
+cmake-2.6.3.tar.gz


Index: cmake.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cmake/F-10/cmake.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- cmake.spec	9 Jan 2009 12:54:42 -0000	1.47
+++ cmake.spec	10 Mar 2009 06:22:59 -0000	1.48
@@ -7,8 +7,8 @@
 %define rcver %{nil}
 
 Name:           cmake
-Version:        2.6.2
-Release:        3%{?dist}
+Version:        2.6.3
+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
@@ -26,8 +29,6 @@
 %if %{with gui}
 BuildRequires: qt4-devel, desktop-file-utils
 %define qt_gui --qt-gui
-%else
-%define qt_gui %{nil}
 %endif
 Requires:       rpm
 
@@ -41,7 +42,6 @@
 generation, code generation, and template instantiation.
 
 
-%if %{with gui}
 %package        gui
 Summary:        Qt GUI for %{name}
 Group:          Development/Tools
@@ -49,11 +49,11 @@
 
 %description    gui
 The %{name}-gui package contains the Qt based GUI for CMake.
-%endif
 
 
 %prep
 %setup -q -n %{name}-%{version}%{rcver}
+%patch0 -p1 -b .475876
 # Fixup permissions
 find -name \*.h -o -name \*.cxx -print0 | xargs -0 chmod -x
 
@@ -65,7 +65,7 @@
             --docdir=/share/doc/%{name}-%{version} --mandir=/share/man \
             --%{?with_bootstrap:no-}system-libs \
             --parallel=`/usr/bin/getconf _NPROCESSORS_ONLN` \
-            %{qt_gui}
+            %{?qt_gui}
 make VERBOSE=1 %{?_smp_mflags}
 
 
@@ -77,8 +77,7 @@
 cp -a Example $RPM_BUILD_ROOT%{_datadir}/doc/%{name}-%{version}/
 install -m 0644 Docs/cmake-mode.el $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/
 # RPM macros
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/rpm
-install -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/rpm/
+install -p -m0644 -D %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/rpm/macros.cmake
 %if %{with gui}
 # Desktop file
 desktop-file-install --delete-original \
@@ -130,9 +129,29 @@
 
 
 %changelog
-* Fri Jan 09 2009 Rex Dieter <rdieter at fedoraproject.org>  2.6.2-3
-- macros.cmake: add -DCMAKE_VERBOSE_MAKEFILE=ON (#474053)
+* 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
+
+* Tue Feb 17 2009 Orion Poplawski <orion at cora.nwra.com> - 2.6.3-0.4.rc13
+- Update to 2.6.3-RC-13
+
+* Tue Jan 13 2009 Orion Poplawski <orion at cora.nwra.com> - 2.6.3-0.3.rc8
+- Update to 2.6.3-RC-8
+
+* Sun Jan 04 2009 Rex Dieter <rdieter at fedoraproject.org> - 2.6.3-0.2.rc5
 - macros.cmake: add -DCMAKE_SKIP_RPATH:BOOL=ON
+- fix Release tag
+
+* Wed Dec 10 2008 Orion Poplawski <orion at cora.nwra.com> - 2.6.3-0.rc5.1
+- Update to 2.6.3-RC-5
+
+* Tue Dec 2 2008 Rex Dieter <rdieter at fedoraproject.org> - 2.6.2-3
+- Add -DCMAKE_VERBOSE_MAKEFILE=ON to %%cmake (#474053)
+- preserve timestamp of macros.cmake
+- cosmetics
 
 * Tue Oct 21 2008 Orion Poplawski <orion at cora.nwra.com> - 2.6.2-2
 - Allow conditional build of gui


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cmake/F-10/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources	29 Sep 2008 21:24:39 -0000	1.23
+++ sources	10 Mar 2009 06:22:59 -0000	1.24
@@ -1 +1 @@
-9e82aa3beb991aa8e5797cf330618d42  cmake-2.6.2.tar.gz
+5ba47a94ce276f326abca1fd72a7e7c6  cmake-2.6.3.tar.gz