rpms/kdelibs/devel kdelibs-4.3.1-buildsys_phonon.patch, NONE, 1.1 kdelibs.spec, 1.505, 1.506

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/kdelibs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10669

Modified Files:
	kdelibs.spec 
Added Files:
	kdelibs-4.3.1-buildsys_phonon.patch 
Log Message:
* Sun Aug 23 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.0-7
- buildsys_phonon patch (to be compatible with newer kde-qt.git qt builds)


kdelibs-4.3.1-buildsys_phonon.patch:
 FindQt4.cmake |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE kdelibs-4.3.1-buildsys_phonon.patch ---
diff -up kdelibs-4.3.0/cmake/modules/FindQt4.cmake.phonon kdelibs-4.3.0/cmake/modules/FindQt4.cmake
--- kdelibs-4.3.0/cmake/modules/FindQt4.cmake.phonon	2009-06-03 06:54:39.000000000 -0500
+++ kdelibs-4.3.0/cmake/modules/FindQt4.cmake	2009-08-23 13:20:43.382639081 -0500
@@ -739,9 +739,10 @@ IF (QT4_QMAKE_FOUND)
     )
   
   # Set QT_PHONON_INCLUDE_DIR
-  FIND_PATH(QT_PHONON_INCLUDE_DIR phonon
+  FIND_PATH(QT_PHONON_INCLUDE_DIR Phonon
     PATHS
     ${QT_INCLUDE_DIR}/phonon
+    ${QT_HEADERS_DIR}/phonon
     NO_DEFAULT_PATH
     )
 


Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.505
retrieving revision 1.506
diff -u -p -r1.505 -r1.506
--- kdelibs.spec	19 Aug 2009 09:39:14 -0000	1.505
+++ kdelibs.spec	23 Aug 2009 18:43:21 -0000	1.506
@@ -4,7 +4,7 @@
 
 Summary: K Desktop Environment 4 - Libraries
 Version: 4.3.0
-Release: 6%{?dist}
+Release: 7%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -94,6 +94,7 @@ Patch103: kdelibs-4.3.1-copyurls.patch
 Patch104: kdelibs-4.3.1-copyrename.patch
 # http://bugs.kde.org/200815
 Patch105: kdelibs-4.3.1-toolbarEditCrash.patch
+Patch106: kdelibs-4.3.1-buildsys_phonon.patch
 
 BuildRequires: qt4-devel >= 4.5.0
 # qt4%{_?_isa} isn't provided yet -- Rex
@@ -234,6 +235,8 @@ sed -i -e "s|@@VERSION_RELEASE@@|%{versi
 %patch103 -p0 -b .copyurls
 %patch104 -p0 -b .copyrename
 %patch105 -p0 -b .toolbarEditCrash
+%patch106 -p1 -b .buildsys_phonon
+
 
 %build
 
@@ -415,6 +418,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sun Aug 23 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.0-7
+- buildsys_phonon patch (to be compatible with newer kde-qt.git qt builds)
+
 * Wed Aug 19 2009 Lukáš Tinkl <ltinkl at redhat.com> - 4.3.0-6
 - fix crash when editting toolbars (kdebug:200815)