rpms/PyQt4/F-11 PyQt-x11-gpl-4.6.2-phonon.patch, NONE, 1.1 PyQt4.spec, 1.28, 1.29

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/PyQt4/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24091

Modified Files:
	PyQt4.spec 
Added Files:
	PyQt-x11-gpl-4.6.2-phonon.patch 
Log Message:
* Fri Nov 27 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.6.2-5
- phonon bindings missing (#541685)


PyQt-x11-gpl-4.6.2-phonon.patch:
 configure.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE PyQt-x11-gpl-4.6.2-phonon.patch ---
diff -up PyQt-x11-gpl-4.6.2/configure.py.phonon PyQt-x11-gpl-4.6.2/configure.py
--- PyQt-x11-gpl-4.6.2/configure.py.phonon	2009-11-27 16:40:15.076610119 -0600
+++ PyQt-x11-gpl-4.6.2/configure.py	2009-11-27 16:41:42.656347184 -0600
@@ -341,7 +341,7 @@ class ConfigurePyQt4:
         check_module("QtWebKit", "qwebpage.h", "new QWebPage()")
         check_module("QtXml", "qdom.h", "new QDomDocument()")
         check_module("QtXmlPatterns", "qxmlname.h", "new QXmlName()")
-        check_module("phonon", "Phonon/VideoWidget",
+        check_module("phonon", "videowidget.h",
                 "new Phonon::VideoWidget()")
         check_module("QtAssistant", "qassistantclient.h",
                 "new QAssistantClient(\"foo\")", extra_lib_dirs=ass_lib_dirs,


Index: PyQt4.spec
===================================================================
RCS file: /cvs/pkgs/rpms/PyQt4/F-11/PyQt4.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- PyQt4.spec	25 Nov 2009 13:11:13 -0000	1.28
+++ PyQt4.spec	28 Nov 2009 00:52:57 -0000	1.29
@@ -4,7 +4,7 @@
 Summary: Python bindings for Qt4
 Name: 	 PyQt4
 Version: 4.6.2
-Release: 3%{?dist}
+Release: 5%{?dist}
 
 # GPLv2 exceptions(see GPL_EXCEPTIONS*.txt)
 License: GPLv3 or GPLv2 with exceptions
@@ -16,6 +16,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 Patch1:  PyQt-x11-gpl-4.4.4-64bit.patch
 # HACK! FIXME: ping upstream why this isn't working right. -- Rex
 Patch2:  PyQt-x11-gpl-4.5.2-QT_SHARED.patch
+Patch3:  PyQt-x11-gpl-4.6.2-phonon.patch
 Patch4:  PyQt-x11-gpl-4.5.1-pyuic_shebang.patch
 
 BuildRequires: chrpath
@@ -57,6 +58,7 @@ of the Qt4 classes (e.g. KDE or your own
 
 %patch1 -p1 -b .64bit
 %patch2 -p1 -b .QT_SHARED
+%patch3 -p1 -b .phonon
 %patch4 -p1 
 
 ## permissions
@@ -104,6 +106,12 @@ ln -s %{_bindir}/pyuic4 \
       %{buildroot}%{python_sitearch}/PyQt4/uic/pyuic.py
 
 
+%check
+# verify phonon built ok
+test -f %{buildroot}%{python_sitearch}/PyQt4/phonon.so
+test -d %{buildroot}%{_datadir}/sip/PyQt4/phonon
+
+
 %clean
 rm -rf %{buildroot}
 
@@ -129,10 +137,17 @@ rm -rf %{buildroot}
 %{_bindir}/pyuic4
 %{python_sitearch}/PyQt4/uic/pyuic.py*
 %{_datadir}/sip/PyQt4/
+%if 0%{?fedora}
 %{_qt4_prefix}/qsci/api/python/PyQt4.api
-
+%endif
 
 %changelog
+* Fri Nov 27 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.6.2-5
+- phonon bindings missing (#541685)
+
+* Wed Nov 25 2009 Than Ngo <than at redhat.com> - 4.6.2-4
+- fix conditional for RHEL
+
 * Wed Nov 25 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.6.2-3
 - PyQt4-4.6.2 breaks QStringList in QVariant, rebuild with sip-4.9.3 (#541211)