[cmake/f13/master] Add patch to find phonon headers (bug #622554)

[Orion Poplawski]

commit 3f25115cbabffdaeb168cd3870299d57afb783f9
Author: Orion Poplawski <orion at cora.nwra.com>
Date:   Mon Aug 9 13:02:02 2010 -0600

    Add patch to find phonon headers (bug #622554)

 cmake-2.8.0-phonon.patch |   33 +++++++++++++++++++++++++++++++++
 cmake.spec               |    8 +++++++-
 2 files changed, 40 insertions(+), 1 deletions(-)
---
diff --git a/cmake-2.8.0-phonon.patch b/cmake-2.8.0-phonon.patch
new file mode 100644
index 0000000..a10155a
--- /dev/null
+++ b/cmake-2.8.0-phonon.patch
@@ -0,0 +1,33 @@
+From 55a3967edac59cd0fdd7605b4f56404da01833fc Mon Sep 17 00:00:00 2001
+From: Clinton Stimpson <clinton at elemtech.com>
+Date: Wed, 13 Jan 2010 17:34:31 -0500
+Subject: [PATCH] Fix bug #10114. Find phonon on some installations.
+
+---
+ Modules/FindQt4.cmake |   10 ++++++++++
+ 1 files changed, 10 insertions(+), 0 deletions(-)
+
+diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake
+index 01bf95e..063c4f5 100644
+--- a/Modules/FindQt4.cmake
++++ b/Modules/FindQt4.cmake
+@@ -670,6 +670,16 @@ IF (QT4_QMAKE_FOUND)
+               ${QT_LIBRARY_DIR}/${QT_MODULE}.framework/Headers
+               NO_DEFAULT_PATH
+       )
++    # phonon doesn't seem consistent, let's try phonondefs.h for some
++    # installations
++    IF(${QT_MODULE} STREQUAL "phonon")
++      FIND_PATH(QT_${_upper_qt_module}_INCLUDE_DIR phonondefs.h
++                PATHS
++                ${QT_HEADERS_DIR}/${QT_MODULE}
++                ${QT_LIBRARY_DIR}/${QT_MODULE}.framework/Headers
++                NO_DEFAULT_PATH
++        )
++    ENDIF(${QT_MODULE} STREQUAL "phonon")
+   ENDFOREACH(QT_MODULE)
+ 
+   IF(WIN32)
+-- 
+1.7.2.1
+
diff --git a/cmake.spec b/cmake.spec
index 7a08641..3122fd3 100644
--- a/cmake.spec
+++ b/cmake.spec
@@ -8,7 +8,7 @@
 
 Name:           cmake
 Version:        2.8.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Cross-platform make system
 
 Group:          Development/Tools
@@ -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
+#Backported pactch to find phonon headers
+Patch0:         cmake-2.8.0-phonon.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  ncurses-devel, libX11-devel
@@ -50,6 +52,7 @@ The %{name}-gui package contains the Qt based GUI for CMake.
 
 %prep
 %setup -q -n %{name}-%{version}%{?rcver}
+%patch0 -p1 -b .phonon
 # Fixup permissions
 find -name \*.h -o -name \*.cxx -print0 | xargs -0 chmod -x
 
@@ -133,6 +136,9 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
 
 
 %changelog
+* Mon Aug 9 2010 Orion Poplawski <orion at cora.nwra.com> - 2.8.0-3
+- Add patch to find phonon headers (bug #622554)
+
 * Thu Jan 14 2010 Rex Dieter <rdieter at fedorproject.org> - 2.8.0-2
 - macros.cmake: drop -DCMAKE_SKIP_RPATH:BOOL=ON from %%cmake