rpms/cmake
5
0
Fork 0
Code Issues Pull Requests Releases Activity

- Update to 2.6.4

Browse Source 
- Drop patch for bug #475876 fixed upstream
This commit is contained in:
Orion Poplawski 2009-04-29 21:14:42 +00:00
parent 1ea9fac37c
commit fdd7d81f30
4 changed files with 8 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.cvsignore
View File

@ -1 +1 @@
cmake-2.6.3.tar.gz cmake-2.6.4.tar.gz

19
cmake-2.6.3-#475876.patch
View File

@ -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);
}

10
cmake.spec
View File

@ -7,8 +7,8 @@
%define rcver %{nil} %define rcver %{nil}
Name: cmake Name: cmake
Version: 2.6.3 Version: 2.6.4
Release: 3%{?dist} Release: 1%{?dist}
Summary: Cross-platform make system Summary: Cross-platform make system
Group: Development/Tools Group: Development/Tools
@ -18,7 +18,6 @@ Source0: http://www.cmake.org/files/v2.6/cmake-%{version}%{rcver}.tar.gz
Source2: macros.cmake Source2: macros.cmake
# fix crash during kdepimlibs build # fix crash during kdepimlibs build
# https://bugzilla.redhat.com/show_bug.cgi?id=475876 # 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) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: ncurses-devel, libX11-devel BuildRequires: ncurses-devel, libX11-devel
@ -53,7 +52,6 @@ The %{name}-gui package contains the Qt based GUI for CMake.
%prep %prep
%setup -q -n %{name}-%{version}%{rcver} %setup -q -n %{name}-%{version}%{rcver}
%patch0 -p1 -b .475876
# Fixup permissions # Fixup permissions
find -name \*.h -o -name \*.cxx -print0 | xargs -0 chmod -x find -name \*.h -o -name \*.cxx -print0 | xargs -0 chmod -x
@ -132,6 +130,10 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
%changelog %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 * Mon Mar 16 2009 Rex Dieter <rdieter@fedoraproject.org> - 2.6.3-3
- macros.cmake: +%%_cmake_version - macros.cmake: +%%_cmake_version

2
sources
View File

@ -1 +1 @@
5ba47a94ce276f326abca1fd72a7e7c6 cmake-2.6.3.tar.gz 50f387d0436696c4a68b5512a72c9cde cmake-2.6.4.tar.gz