[PyQt4] adapt rhel patch

[Than Ngo]

commit 29fff24870a6336a204d8462994c76dc43b6e665
Author: Than Ngo <than at redhat.com>
Date:   Fri Jan 4 19:59:11 2013 +0100

    adapt rhel patch

 PyQt-x11-gpl-4.9.5-webkit.patch |   37 -------------------------------------
 PyQt-x11-gpl-4.9.6-webkit.patch |   38 ++++++++++++++++++++++++++++++++++++++
 PyQt4.spec                      |    7 +++++--
 3 files changed, 43 insertions(+), 39 deletions(-)
---
diff --git a/PyQt-x11-gpl-4.9.6-webkit.patch b/PyQt-x11-gpl-4.9.6-webkit.patch
new file mode 100644
index 0000000..89a2257
--- /dev/null
+++ b/PyQt-x11-gpl-4.9.6-webkit.patch
@@ -0,0 +1,38 @@
+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:
+                 extra_libs=sql_libs)
+         check_module("QtSvg", "qsvgwidget.h", "new QSvgWidget()")
+         if qt_version < 0x050000: 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:
+         if "QtTest" in pyqt_modules:
+             generate_code("QtTest")
+ 
+-        if "QtWebKit" in pyqt_modules:
+-            generate_code("QtWebKit")
+-
+         if "QtXml" in pyqt_modules:
+             generate_code("QtXml")
+ 
+@@ -1303,7 +1299,7 @@ def compile_qt_program(name, mname, extr
+     opengl = (mname == "QtOpenGL")
+ 
+     qt = [mname]
+-    if mname in ("QtAssistant", "QtHelp", "QtOpenGL", "QtWebKit"):
++    if mname in ("QtAssistant", "QtHelp", "QtOpenGL"):
+         qt.append("QtCore")
+ 
+     makefile = sipconfig.ProgramMakefile(sipcfg, console=1, qt=qt, warnings=0,
+@@ -1595,7 +1591,6 @@ def needed_qt_libs(mname, qt_libs):
+         "QtSql": ["QtGui"],
+         "QtSvg": ["QtGui"],
+         "QtTest": ["QtGui"],
+-        "QtWebKit": ["QtNetwork", "QtGui"],
+         "QtXml": ["QtCore"],
+         "QtXmlPatterns": ["QtNetwork", "QtCore"],
+         "phonon": ["QtGui"],
diff --git a/PyQt4.spec b/PyQt4.spec
index 68b3982..a7d97f3 100644
--- a/PyQt4.spec
+++ b/PyQt4.spec
@@ -6,7 +6,7 @@
 Summary: Python bindings for Qt4
 Name: 	 PyQt4
 Version: 4.9.6
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 # GPLv2 exceptions(see GPL_EXCEPTIONS*.txt)
 License: GPLv3 or GPLv2 with exceptions
@@ -30,7 +30,7 @@ Patch52:  PyQt-x11-gpl-4.9.2-pyuic_shbang.patch
 Patch60:  qreal_float_support.diff
 
 # rhel patches
-Patch300: PyQt-x11-gpl-4.9.5-webkit.patch
+Patch300: PyQt-x11-gpl-4.9.6-webkit.patch
 
 BuildRequires: findutils
 BuildRequires: pkgconfig(dbus-1) pkgconfig(dbus-python)
@@ -287,6 +287,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Jan 04 2013 Than Ngo <than at redhat.com> - 4.9.6-2
+- adapt rhel patch
+
 * Sun Dec 09 2012 Rex Dieter <rdieter at fedoraproject.org> 4.9.6-1
 - 4.9.6