diff --git a/.cvsignore b/.cvsignore index e9a8547..f805166 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -cmake-2.8.0-rc5.tar.gz +cmake-2.8.0-rc6.tar.gz diff --git a/cmake-2.8.0-test.patch b/cmake-2.8.0-test.patch deleted file mode 100644 index 59e7ca6..0000000 --- a/cmake-2.8.0-test.patch +++ /dev/null @@ -1,19 +0,0 @@ -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)") diff --git a/cmake.spec b/cmake.spec index 86ecd91..e140d60 100644 --- a/cmake.spec +++ b/cmake.spec @@ -4,11 +4,11 @@ # Set to bcond_with or use --without gui to disable qt4 gui build %bcond_without gui # Set to RC version if building RC, else %{nil} -%define rcver -rc5 +%define rcver -rc6 Name: cmake Version: 2.8.0 -Release: 0.6.rc5%{?dist} +Release: 0.7.rc6%{?dist} Summary: Cross-platform make system Group: Development/Tools @@ -133,6 +133,9 @@ update-mime-database %{_datadir}/mime &> /dev/null || : %changelog +* Tue Nov 10 2009 Orion Poplawski - 2.8.0-0.7.rc6 +- Update to 2.8.0 RC 6 + * Wed Nov 4 2009 Orion Poplawski - 2.8.0-0.6.rc5 - Update to 2.8.0 RC 5 - Drop patches fixed upstream diff --git a/jni_include_path.patch b/jni_include_path.patch deleted file mode 100644 index c40a45b..0000000 --- a/jni_include_path.patch +++ /dev/null @@ -1,23 +0,0 @@ -Index: Modules/FindJNI.cmake -=================================================================== -RCS file: /cvsroot/CMake/CMake/Modules/FindJNI.cmake,v -retrieving revision 1.45 -diff -u -r1.45 FindJNI.cmake ---- Modules/FindJNI.cmake 22 Oct 2009 10:57:00 -0000 1.45 -+++ Modules/FindJNI.cmake 29 Oct 2009 16:25:07 -0000 -@@ -195,14 +195,13 @@ - ) - - FIND_PATH(JAVA_INCLUDE_PATH2 jni_md.h -- ${JAVA_AWT_INCLUDE_DIRECTORIES} -+ ${JAVA_INCLUDE_PATH} - ${JAVA_INCLUDE_PATH}/win32 - ${JAVA_INCLUDE_PATH}/linux - ${JAVA_INCLUDE_PATH}/freebsd - ) - - FIND_PATH(JAVA_AWT_INCLUDE_PATH jawt.h -- ${JAVA_AWT_INCLUDE_DIRECTORIES} - ${JAVA_INCLUDE_PATH} - ) - diff --git a/sources b/sources index 7f7b0dd..a7ccb21 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -588c63ff01ee8f21a8411b5a336001ed cmake-2.8.0-rc5.tar.gz +307d5a8d04188ed65b60f9d78d4314b0 cmake-2.8.0-rc6.tar.gz