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

- Add test patch from cvs to fix Fedora build test build error

Browse Source
This commit is contained in:
Orion Poplawski 2009-10-30 17:32:29 +00:00
parent 24c18cd461
commit 06b0eb2a2d
2 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
cmake-2.8.0-test.patch Normal file
View File

@ -0,0 +1,19 @@
Index: Tests/CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Tests/CMakeLists.txt,v
retrieving revision 1.148
retrieving revision 1.149
diff -u -r1.148 -r1.149
--- Tests/CMakeLists.txt 29 Oct 2009 16:45:59 -0000 1.148
+++ Tests/CMakeLists.txt 30 Oct 2009 16:08:10 -0000 1.149
@@ -1251,8 +1251,8 @@
set(regex "(Problems when submitting via S*CP")
set(regex "${regex}|Error message was: ")
- set(regex "${regex}(Couldn.t resolve host ")
- set(regex "${regex}|couldn.t connect to host")
+ set(regex "${regex}([Cc]ould *n.t resolve host")
+ set(regex "${regex}|[Cc]ould *n.t connect to host")
set(regex "${regex}|libcurl was built with SSL disabled. https: not supported)")
set(regex "${regex}|Submission method .xmlrpc. not compiled into CTest")
set(regex "${regex}|Submission successful)")

5
cmake.spec
View File

@ -17,6 +17,7 @@ URL: http://www.cmake.org
Source0: http://www.cmake.org/files/v2.8/cmake-%{version}%{?rcver}.tar.gz Source0: http://www.cmake.org/files/v2.8/cmake-%{version}%{?rcver}.tar.gz
Source2: macros.cmake Source2: macros.cmake
Patch0: jni_include_path.patch Patch0: jni_include_path.patch
Patch1: cmake-2.8.0-test.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
@ -52,6 +53,7 @@ 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 -p0 %patch0 -p0
%patch1 -p0
# 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
@ -135,9 +137,10 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
%changelog %changelog
* Tue Oct 29 2009 Orion Poplawski <orion@cora.nwra.com> - 2.8.0-0.4.rc4 * Fri Oct 30 2009 Orion Poplawski <orion@cora.nwra.com> - 2.8.0-0.4.rc4
- Update to 2.8.0 RC 4 - Update to 2.8.0 RC 4
- Add FindJNI patch - Add FindJNI patch
- Add test patch from cvs to fix Fedora build test build error
* Tue Oct 13 2009 Orion Poplawski <orion@cora.nwra.com> - 2.8.0-0.4.rc3 * Tue Oct 13 2009 Orion Poplawski <orion@cora.nwra.com> - 2.8.0-0.4.rc3
- Update to 2.8.0 RC 3 - Update to 2.8.0 RC 3