From d1560ef06cd89c37eca86f06c6def6581a3b87b8 Mon Sep 17 00:00:00 2001
From: Orion Poplawski <orion@nwra.com>
Date: Wed, 23 Oct 2013 11:09:46 -0600
Subject: [PATCH] Remove UseQt4 automatic dependency adding

---
 cmake-qtdeps.patch | 54 ++++++++++++++++++++++++++++++++++++++++++++++
 cmake.spec         |  9 +++++++-
 2 files changed, 62 insertions(+), 1 deletion(-)
 create mode 100644 cmake-qtdeps.patch

diff --git a/cmake-qtdeps.patch b/cmake-qtdeps.patch
new file mode 100644
index 0000000..a22eb0d
--- /dev/null
+++ b/cmake-qtdeps.patch
@@ -0,0 +1,54 @@
+diff -up cmake-2.8.12/Modules/UseQt4.cmake.qtdeps cmake-2.8.12/Modules/UseQt4.cmake
+--- cmake-2.8.12/Modules/UseQt4.cmake.qtdeps	2013-10-07 09:31:00.000000000 -0600
++++ cmake-2.8.12/Modules/UseQt4.cmake	2013-10-23 10:39:14.763568925 -0600
+@@ -56,39 +56,13 @@ if (QT_USE_QT3SUPPORT)
+   add_definitions(-DQT3_SUPPORT)
+ endif ()
+ 
+-# list dependent modules, so dependent libraries are added
+-set(QT_QT3SUPPORT_MODULE_DEPENDS QTGUI QTSQL QTXML QTNETWORK QTCORE)
+-set(QT_QTSVG_MODULE_DEPENDS QTGUI QTXML QTCORE)
+-set(QT_QTUITOOLS_MODULE_DEPENDS QTGUI QTXML QTCORE)
+-set(QT_QTHELP_MODULE_DEPENDS QTGUI QTSQL QTXML QTNETWORK QTCORE)
+-if(QT_QTDBUS_FOUND)
+-  set(QT_PHONON_MODULE_DEPENDS QTGUI QTDBUS QTCORE)
+-else()
+-  set(QT_PHONON_MODULE_DEPENDS QTGUI QTCORE)
+-endif()
+-set(QT_QTDBUS_MODULE_DEPENDS QTXML QTCORE)
+-set(QT_QTXMLPATTERNS_MODULE_DEPENDS QTNETWORK QTCORE)
+-set(QT_QAXCONTAINER_MODULE_DEPENDS QTGUI QTCORE)
+-set(QT_QAXSERVER_MODULE_DEPENDS QTGUI QTCORE)
+-set(QT_QTSCRIPTTOOLS_MODULE_DEPENDS QTGUI QTCORE)
+-set(QT_QTWEBKIT_MODULE_DEPENDS QTXMLPATTERNS QTGUI QTCORE)
+-set(QT_QTDECLARATIVE_MODULE_DEPENDS QTSCRIPT QTSVG QTSQL QTXMLPATTERNS QTGUI QTCORE)
+-set(QT_QTMULTIMEDIA_MODULE_DEPENDS QTGUI QTCORE)
+-set(QT_QTOPENGL_MODULE_DEPENDS QTGUI QTCORE)
+-set(QT_QTSCRIPT_MODULE_DEPENDS QTCORE)
+-set(QT_QTGUI_MODULE_DEPENDS QTCORE)
+-set(QT_QTTEST_MODULE_DEPENDS QTCORE)
+-set(QT_QTXML_MODULE_DEPENDS QTCORE)
+-set(QT_QTSQL_MODULE_DEPENDS QTCORE)
+-set(QT_QTNETWORK_MODULE_DEPENDS QTCORE)
+-
+ # Qt modules  (in order of dependence)
+ foreach(module QT3SUPPORT QTOPENGL QTASSISTANT QTDESIGNER QTMOTIF QTNSPLUGIN
+                QAXSERVER QAXCONTAINER QTDECLARATIVE QTSCRIPT QTSVG QTUITOOLS QTHELP
+                QTWEBKIT PHONON QTSCRIPTTOOLS QTMULTIMEDIA QTXMLPATTERNS QTGUI QTTEST
+                QTDBUS QTXML QTSQL QTNETWORK QTCORE)
+ 
+-  if (QT_USE_${module} OR QT_USE_${module}_DEPENDS)
++  if (QT_USE_${module})
+     if (QT_${module}_FOUND)
+       if(QT_USE_${module})
+         string(REPLACE "QT" "" qt_module_def "${module}")
+@@ -104,9 +78,6 @@ foreach(module QT3SUPPORT QTOPENGL QTASS
+       if(QT_IS_STATIC)
+         set(QT_LIBRARIES ${QT_LIBRARIES} ${QT_${module}_LIB_DEPENDENCIES})
+       endif()
+-      foreach(depend_module ${QT_${module}_MODULE_DEPENDS})
+-        set(QT_USE_${depend_module}_DEPENDS 1)
+-      endforeach()
+     else ()
+       message("Qt ${module} library not found.")
+     endif ()
diff --git a/cmake.spec b/cmake.spec
index e08256b..2c1ae70 100644
--- a/cmake.spec
+++ b/cmake.spec
@@ -13,7 +13,7 @@
 
 Name:           cmake
 Version:        2.8.12
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Cross-platform make system
 
 Group:          Development/Tools
@@ -51,6 +51,8 @@ Patch6:         cmake-strict_aliasing.patch
 # Patch away .png extension in icon name in desktop file.
 # http://www.cmake.org/Bug/view.php?id=14315
 Patch7:         cmake-desktop_icon.patch
+# Remove automatic Qt module dep adding
+Patch8:         cmake-qtdeps.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gcc-gfortran
@@ -108,6 +110,7 @@ The %{name}-gui package contains the Qt based GUI for CMake.
 
 %prep
 %setup -q -n %{name}-%{version}%{?rcver}
+# We cannot use backups with patches to Modules as they end up being installed
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
@@ -116,6 +119,7 @@ The %{name}-gui package contains the Qt based GUI for CMake.
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
+%patch8 -p1
 # Setup copyright docs for main package
 mkdir _doc
 find Source Utilities -type f -iname copy\* | while read f
@@ -227,6 +231,9 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
 
 
 %changelog
+* Wed Oct 23 2013 Orion Poplawski <orion@cora.nwra.com> - 2.8.12-3
+- Remove UseQt4 automatic dependency adding
+
 * Thu Oct 10 2013 Orion Poplawski <orion@cora.nwra.com> - 2.8.12-2
 - Autoload cmake-mode in emacs (bug #1017779)