Update to 2.8.5 RC 1

.gitignore

@@ -6,3 +6,4 @@ cmake-2.8.2.tar.gz
 /cmake-2.8.4-rc1.tar.gz
 /cmake-2.8.4-rc2.tar.gz
 /cmake-2.8.4.tar.gz
+/cmake-2.8.5-rc1.tar.gz

cmake-2.8.3-qt4.patch

@@ -1,34 +0,0 @@
-From cfba5ef111bf86e8820a4dff556b3a9edc1484cd Mon Sep 17 00:00:00 2001
-From: Clinton Stimpson <clinton@elemtech.com>
-Date: Fri, 15 Oct 2010 16:36:14 -0600
-Subject: [PATCH] Fix regression in 2dae2f1 which added find of Qt imports dir.
-
----
- Modules/FindQt4.cmake |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake
-index 45bbd2e..6129329 100644
---- a/Modules/FindQt4.cmake
-+++ b/Modules/FindQt4.cmake
-@@ -482,7 +482,7 @@ IF (QT_QMAKE_EXECUTABLE)
-   _qt4_query_qmake(QT_VERSION QTVERSION)
- 
-   # check for qt3 qmake and then try and find qmake4 or qmake-qt4 in the path
--  IF("${QTVERSION}" MATCHES "Unknown")
-+  IF(NOT QTVERSION)
-     SET(QT_QMAKE_EXECUTABLE NOTFOUND CACHE FILEPATH "" FORCE)
-     FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake4 qmake-qt4 PATHS
-       "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\4.0.0;InstallDir]/bin"
-@@ -493,7 +493,7 @@ IF (QT_QMAKE_EXECUTABLE)
-     IF(QT_QMAKE_EXECUTABLE)
-       _qt4_query_qmake(QT_VERSION QTVERSION)
-     ENDIF(QT_QMAKE_EXECUTABLE)
--  ENDIF("${QTVERSION}" MATCHES "Unknown")
-+  ENDIF(NOT QTVERSION)
- 
-   # check that we found the Qt4 qmake, Qt3 qmake output won't match here
-   STRING(REGEX MATCH "^[0-9]+\\.[0-9]+\\.[0-9]+" qt_version_tmp "${QTVERSION}")
--- 
-1.7.0
-

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 %{nil}
+%define rcver -rc1
 
 Name:           cmake
-Version:        2.8.4
+Version:        2.8.5
-Release:        1%{?dist}
+Release:        0.1.rc1%{?dist}
 Summary:        Cross-platform make system
 
 Group:          Development/Tools
@@ -155,6 +155,9 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
 
 
 %changelog
+* Tue May 31 2011 Orion Poplawski <orion@cora.nwra.com> - 2.8.5-0.1.rc1
+- Update to 2.8.5 RC 1
+
 * Thu Feb 17 2011 Orion Poplawski <orion@cora.nwra.com> - 2.8.4-1
 - Update to 2.8.4 final
 

sources

@@ -1 +1 @@
-209b7d1d04b2e00986538d74ba764fcf  cmake-2.8.4.tar.gz
+ce7320c363af1c682fe6dcb35dd885b0  cmake-2.8.5-rc1.tar.gz