[PyQt4: 2/2] Merge branch 'f20'

[Rex Dieter]

commit 2f627a2141e08ba9549ad6231d1c9c84843522a2
Merge: bf63f8b f6549b3
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Thu Nov 14 14:22:23 2013 -0600

    Merge branch 'f20'
    
    Conflicts:
    	PyQt4.spec

 PyQt-x11-gpl-4.10.3-phonon_detect.patch |   33 +++++++++++++++++++++++++++++++
 PyQt4.spec                              |    7 +++++-
 2 files changed, 39 insertions(+), 1 deletions(-)
---
diff --cc PyQt-x11-gpl-4.10.3-phonon_detect.patch
index 0000000,0000000..d9ed609
new file mode 100644
--- /dev/null
+++ b/PyQt-x11-gpl-4.10.3-phonon_detect.patch
@@@ -1,0 -1,0 +1,33 @@@
++diff -up PyQt-x11-gpl-4.10.3/configure.py.phonon_detect PyQt-x11-gpl-4.10.3/configure.py
++--- PyQt-x11-gpl-4.10.3/configure.py.phonon_detect	2013-11-14 14:12:50.437564346 -0600
+++++ PyQt-x11-gpl-4.10.3/configure.py	2013-11-14 14:13:41.230630403 -0600
++@@ -69,6 +69,7 @@ pydbusmoddir = None
++ dbusincdirs = []
++ dbuslibdirs = []
++ dbuslibs = []
+++phononincdirs = []
++ 
++ 
++ # Under Windows qmake and the Qt DLLs must be on the system PATH otherwise the
++@@ -340,6 +341,12 @@ class ConfigurePyQt4:
++             ass_lib_dirs = None
++             ass_libs = None
++ 
+++        phonon_sout = get_command_stdout("pkg-config --cflags-only-I phonon")
+++        phonon_iflags = phonon_sout.read().strip()
+++        for f in phonon_iflags.split():
+++            if f.startswith("-I"):
+++                phononincdirs.append(f[2:])
+++
++         # Note that the order in which we check is important for the
++         # consolidated module - a module's dependencies must be checked first.
++         pyqt_modules.append("QtCore")
++@@ -372,7 +379,7 @@ class ConfigurePyQt4:
++         check_module("QtWebKit", "qwebpage.h", "new QWebPage()")
++         check_module("QtXmlPatterns", "qxmlname.h", "new QXmlName()")
++         check_module("phonon", "phonon/videowidget.h",
++-                "new Phonon::VideoWidget()")
+++                "new Phonon::VideoWidget()", extra_include_dirs=phononincdirs)
++         check_module("QtAssistant", "qassistantclient.h",
++                 "new QAssistantClient(\"foo\")", extra_lib_dirs=ass_lib_dirs,
++                 extra_libs=ass_libs)
diff --cc PyQt4.spec
index 899d24b,205ccd6..74cfc0a
--- a/PyQt4.spec
+++ b/PyQt4.spec
@@@ -8,8 -8,8 +8,8 @@@
  
  Summary: Python bindings for Qt4
  Name: 	 PyQt4
 -Version: 4.10.2
 -Release: 4%{?dist}
 +Version: 4.10.3
- Release: 1%{?dist}
++Release: 2%{?dist}
  
  # GPLv2 exceptions(see GPL_EXCEPTIONS*.txt)
  License: (GPLv3 or GPLv2 with exceptions) and BSD
@@@ -24,6 -24,7 +24,7 @@@ Patch50:  PyQt-x11-gpl-4.9.5-timestamp_
  # if /usr/include/GL/gl.h ever changes these types, we have bigger problems
  Patch51:  PyQt-x11-gpl-4.9.1-opengl_types.patch
  Patch52:  PyQt-x11-gpl-4.10-pyuic_shbang.patch
 -Patch53:  PyQt-x11-gpl-4.10.2-phonon_detect.patch
++Patch53:  PyQt-x11-gpl-4.10.3-phonon_detect.patch
  
  ## upstream patches
  # fix FTBFS on ARM
@@@ -372,9 -374,9 +374,12 @@@ diff -u ./sip/QtOpenGL/opengl_types.sip
  
  
  %changelog
 -* Thu Nov 14 2013 Rex Dieter <rdieter at fedoraproject.org> 4.10.2-4
++* Thu Nov 14 2013 Rex Dieter <rdieter at fedoraproject.org> 4.10.3-1
+ - fix build against phonon-4.7+ (kde#306261)
+ 
 +* Wed Oct 16 2013 Rex Dieter <rdieter at fedoraproject.org> 4.10.3-1
 +- 4.10.3
 +
  * Mon Oct 07 2013 Than Ngo <than at redhat.com> - 4.10.2-3
  - fix license tag
  - add missing buildroot