From e647abb348b8814154a0a73d22743c972496127b Mon Sep 17 00:00:00 2001
From: Orion Poplawski <orion@cora.nwra.com>
Date: Thu, 16 Dec 2010 09:07:14 -0700
Subject: [PATCH] - Add patch from upstream git to fix bug 652886 (qt3/qt4
 detection)

---
 cmake-2.8.3-qt4.patch | 34 ++++++++++++++++++++++++++++++++++
 cmake.spec            |  6 ++++++
 2 files changed, 40 insertions(+)
 create mode 100644 cmake-2.8.3-qt4.patch

diff --git a/cmake-2.8.3-qt4.patch b/cmake-2.8.3-qt4.patch
new file mode 100644
index 0000000..b759dd5
--- /dev/null
+++ b/cmake-2.8.3-qt4.patch
@@ -0,0 +1,34 @@
+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
+
diff --git a/cmake.spec b/cmake.spec
index 86236dd..c730c34 100644
--- a/cmake.spec
+++ b/cmake.spec
@@ -16,6 +16,8 @@ License:        BSD
 URL:            http://www.cmake.org
 Source0:        http://www.cmake.org/files/v2.8/cmake-%{version}%{?rcver}.tar.gz
 Source2:        macros.cmake
+#Patch from upstream git to fix bug 652886
+Patch0:         cmake-2.8.3-qt4.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -56,6 +58,7 @@ The %{name}-gui package contains the Qt based GUI for CMake.
 
 %prep
 %setup -q -n %{name}-%{version}%{?rcver}
+%patch0 -p1
 
 
 %build
@@ -154,6 +157,9 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
 
 
 %changelog
+* Thu Dec 16 2010 Orion Poplawski <orion@cora.nwra.com> - 2.8.3-2
+- Add patch from upstream git to fix bug 652886 (qt3/qt4 detection)
+
 * Thu Nov 4 2010 Orion Poplawski <orion@cora.nwra.com> - 2.8.3-1
 - Update to 2.8.3 final