[PyQt4] adapt rhel patch

[Than Ngo]

commit 68f6cd4b7a49ca6511855b11a3877be6a842d4a3
Author: Than Ngo <than at redhat.com>
Date:   Tue Apr 2 14:37:53 2013 +0200

    adapt rhel patch

 ...-webkit.patch => PyQt-x11-gpl-4.10-webkit.patch |   20 ++++++++++----------
 PyQt4.spec                                         |    7 +++++--
 2 files changed, 15 insertions(+), 12 deletions(-)
---
diff --git a/PyQt-x11-gpl-4.9.6-webkit.patch b/PyQt-x11-gpl-4.10-webkit.patch
similarity index 62%
rename from PyQt-x11-gpl-4.9.6-webkit.patch
rename to PyQt-x11-gpl-4.10-webkit.patch
index 89a2257..fba9349 100644
--- a/PyQt-x11-gpl-4.9.6-webkit.patch
+++ b/PyQt-x11-gpl-4.10-webkit.patch
@@ -1,15 +1,15 @@
-diff -up PyQt-x11-gpl-4.9.6/configure.py.orig PyQt-x11-gpl-4.9.6/configure.py
---- PyQt-x11-gpl-4.9.6/configure.py.orig	2013-01-04 18:16:19.994856182 +0100
-+++ PyQt-x11-gpl-4.9.6/configure.py	2013-01-04 18:18:24.130527629 +0100
-@@ -382,7 +382,6 @@ class ConfigurePyQt4:
+diff -up PyQt-x11-gpl-4.10/configure.py.webkit PyQt-x11-gpl-4.10/configure.py
+--- PyQt-x11-gpl-4.10/configure.py.webkit	2013-04-02 14:19:41.012879837 +0200
++++ PyQt-x11-gpl-4.10/configure.py	2013-04-02 14:21:15.233319365 +0200
+@@ -387,7 +387,6 @@ class ConfigurePyQt4:
                  extra_libs=sql_libs)
          check_module("QtSvg", "qsvgwidget.h", "new QSvgWidget()")
-         if qt_version < 0x050000: check_module("QtTest", "QtTest", "QTest::qSleep(0)")
+         check_module("QtTest", "QtTest", "QTest::qSleep(0)")
 -        check_module("QtWebKit", "qwebpage.h", "new QWebPage()")
          check_module("QtXml", "qdom.h", "new QDomDocument()")
- 
-         # Qt v5-beta1 causes compiler error messages.  Wait to see if it fixed
-@@ -531,9 +530,6 @@ class ConfigurePyQt4:
+         check_module("QtXmlPatterns", "qxmlname.h", "new QXmlName()")
+         check_module("phonon", "phonon/videowidget.h",
+@@ -530,9 +529,6 @@ class ConfigurePyQt4:
          if "QtTest" in pyqt_modules:
              generate_code("QtTest")
  
@@ -19,7 +19,7 @@ diff -up PyQt-x11-gpl-4.9.6/configure.py.orig PyQt-x11-gpl-4.9.6/configure.py
          if "QtXml" in pyqt_modules:
              generate_code("QtXml")
  
-@@ -1303,7 +1299,7 @@ def compile_qt_program(name, mname, extr
+@@ -1310,7 +1306,7 @@ def compile_qt_program(name, mname, extr
      opengl = (mname == "QtOpenGL")
  
      qt = [mname]
@@ -28,7 +28,7 @@ diff -up PyQt-x11-gpl-4.9.6/configure.py.orig PyQt-x11-gpl-4.9.6/configure.py
          qt.append("QtCore")
  
      makefile = sipconfig.ProgramMakefile(sipcfg, console=1, qt=qt, warnings=0,
-@@ -1595,7 +1591,6 @@ def needed_qt_libs(mname, qt_libs):
+@@ -1609,7 +1605,6 @@ def needed_qt_libs(mname, qt_libs):
          "QtSql": ["QtGui"],
          "QtSvg": ["QtGui"],
          "QtTest": ["QtGui"],
diff --git a/PyQt4.spec b/PyQt4.spec
index 020c6b8..ddf36ff 100644
--- a/PyQt4.spec
+++ b/PyQt4.spec
@@ -8,7 +8,7 @@
 Summary: Python bindings for Qt4
 Name: 	 PyQt4
 Version: 4.10
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 # GPLv2 exceptions(see GPL_EXCEPTIONS*.txt)
 License: GPLv3 or GPLv2 with exceptions
@@ -32,7 +32,7 @@ Patch52:  PyQt-x11-gpl-4.10-pyuic_shbang.patch
 Patch60:  qreal_float_support.diff
 
 # rhel patches
-Patch300: PyQt-x11-gpl-4.9.6-webkit.patch
+Patch300: PyQt-x11-gpl-4.10-webkit.patch
 
 BuildRequires: chrpath
 BuildRequires: findutils
@@ -295,6 +295,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Apr 02 2013 Than Ngo <than at redhat.com> - 4.10-3
+- adapt rhel patch
+
 * Fri Mar 22 2013 Rex Dieter <rdieter at fedoraproject.org> 4.10-2
 - introduce qscintilla, webkit feature macros