[python-qt5] 5.3.2-2

[Rex Dieter]

commit 03a2e65a7e1d8c629e8510b4639c0bdf87ac030a
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Thu Nov 6 08:06:39 2014 -0600

    5.3.2-2
    
    - Build failure in sipQtWebKitWidgestQWebInspector: qprinter.h not found (#1160932)
    - python2_sitelib should be python2_sitearch (#1161121)

 PyQt5-5.3.2-add-dep-to-QtWebKitWidgets.patch |   12 ++++++++++++
 python-qt5.spec                              |   26 ++++++++++++++++++--------
 2 files changed, 30 insertions(+), 8 deletions(-)
---
diff --git a/PyQt5-5.3.2-add-dep-to-QtWebKitWidgets.patch b/PyQt5-5.3.2-add-dep-to-QtWebKitWidgets.patch
new file mode 100644
index 0000000..3548f3d
--- /dev/null
+++ b/PyQt5-5.3.2-add-dep-to-QtWebKitWidgets.patch
@@ -0,0 +1,12 @@
+diff -up PyQt-gpl-5.3.2/configure.py.add-dep-to-QtWebKitWidgets PyQt-gpl-5.3.2/configure.py
+--- PyQt-gpl-5.3.2/configure.py.add-dep-to-QtWebKitWidgets	2014-09-12 16:58:40.000000000 -0500
++++ PyQt-gpl-5.3.2/configure.py	2014-11-06 07:54:42.829242627 -0600
+@@ -87,7 +87,7 @@ MODULE_METADATA = {
+     'QtSvg':                ModuleMetadata(qmake_QT=['svg']),
+     'QtTest':               ModuleMetadata(qmake_QT=['testlib', 'widgets']),
+     'QtWebKit':             ModuleMetadata(qmake_QT=['webkit', 'network']),
+-    'QtWebKitWidgets':      ModuleMetadata(qmake_QT=['webkitwidgets']),
++    'QtWebKitWidgets':      ModuleMetadata(qmake_QT=['webkitwidgets', 'printsupport']),
+     'QtWebSockets':         ModuleMetadata(qmake_QT=['websockets']),
+     'QtWidgets':            ModuleMetadata(qmake_QT=['widgets']),
+     'QtWinExtras':          ModuleMetadata(qmake_QT=['winextras', 'widgets']),
diff --git a/python-qt5.spec b/python-qt5.spec
index 81bcf47..13ca901 100644
--- a/python-qt5.spec
+++ b/python-qt5.spec
@@ -7,7 +7,7 @@
 Summary: Python bindings for Qt5
 Name: 	 python-qt5 
 Version: 5.3.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 # all BSD, except for GPLv2+ dbus bindings and examples
 License: BSD and GPLv2+
@@ -18,11 +18,18 @@ Source0: http://www.riverbankcomputing.com/static/Downloads/PyQt5/PyQt-gpl-%{ver
 Source0: http://downloads.sourceforge.net/project/pyqt/PyQt5/PyQt-%{version}/PyQt-gpl-%{version}.tar.gz
 %endif
 
+## upstream patches
+
 ## upstreamable patches
+# fix build, https://bugzilla.redhat.com/1160932
+Patch1: PyQt5-5.3.2-add-dep-to-QtWebKitWidgets.patch
 
 BuildRequires: chrpath
 BuildRequires: findutils
-BuildRequires: pkgconfig(dbus-1) pkgconfig(dbus-python)
+BuildRequires: pkgconfig(dbus-1)
+# dbus-python-1.2.0-7 fixed to use sitearch, https://bugzilla.redhat.com/1161121
+%global dbus_python_ver 1.2.0-7
+BuildRequires: dbus-python >= %{dbus_python_ver}, pkgconfig(dbus-python)
 BuildRequires: pkgconfig(phonon4qt5)
 
 BuildRequires: pkgconfig(Qt5Core) >= 5.3
@@ -48,7 +55,7 @@ BuildRequires: python3-sip-devel >= 4.16
 BuildRequires: python3-dbus
 %endif # with_python3
 
-Requires: dbus-python
+Requires: dbus-python >= %{dbus_python_ver}
 %{?_qt5_version:Requires: qt5-qtbase%{?_isa} >= %{_qt5_version}}
 %{?_sip_api:Requires: sip-api(%{_sip_api_major}) >= %{_sip_api}}
 
@@ -78,7 +85,7 @@ of the Qt5 classes (e.g. KDE or your own).
 Summary: Python 3 bindings for Qt5
 %{?_sip_api:Requires: python3-sip-api(%{_sip_api_major}) >= %{_sip_api}}
 Provides: python3-PyQt5 = %{version}-%{release}
-Requires: python3-dbus
+Requires: python3-dbus >= %{dbus_python_ver}
 %description -n python3-qt5
 %{summary}.
 
@@ -102,6 +109,8 @@ BuildArch: noarch
 %prep
 %setup -n PyQt-gpl-%{version}%{?snap:-snapshot-%{snap}}
 
+%patch1 -p1 -b .add-dep-to-QtWebKitWidgets
+
 %if 0%{?with_python3}
 rm -rf %{py3dir}
 cp -a . %{py3dir}
@@ -160,7 +169,7 @@ rm -rfv %{buildroot}%{python3_sitearch}/PyQt5/uic/port_v2/
 %files
 %doc NEWS README
 %doc LICENSE
-%{python2_sitelib}/dbus/mainloop/pyqt5.so
+%{python2_sitearch}/dbus/mainloop/pyqt5.so
 %{_qt5_plugindir}/PyQt5/
 %dir %{python2_sitearch}/PyQt5/
 %{python2_sitearch}/PyQt5/__init__.py*
@@ -205,7 +214,7 @@ rm -rfv %{buildroot}%{python3_sitearch}/PyQt5/uic/port_v2/
 %files -n python3-qt5
 %doc NEWS README
 %doc LICENSE
-%{python3_sitelib}/dbus/mainloop/pyqt5.so
+%{python3_sitearch}/dbus/mainloop/pyqt5.so
 %dir %{python3_sitearch}/PyQt5/
 %{python3_sitearch}/PyQt5/__pycache__/
 %{python3_sitearch}/PyQt5/__init__.py*
@@ -248,8 +257,9 @@ rm -rfv %{buildroot}%{python3_sitearch}/PyQt5/uic/port_v2/
 
 
 %changelog
-* Wed Nov 05 2014 Rex Dieter <rdieter at fedoraproject.org> 5.3.2-2
-- rebuild
+* Thu Nov 06 2014 Rex Dieter <rdieter at fedoraproject.org> - 5.3.2-2
+- Build failure in sipQtWebKitWidgestQWebInspector: qprinter.h not found (#1160932)
+- python2_sitelib should be python2_sitearch (#1161121)
 
 * Mon Sep 15 2014 Rex Dieter <rdieter at fedoraproject.org> 5.3.2-1
 - PyQt-gpl-5.3.2