diff --git a/.gitignore b/.gitignore index 7be8987..3ea50a3 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -/PyQt-gpl-5.4.2.tar.gz /PyQt-gpl-5.5.1.tar.gz +/PyQt5_gpl-5.6.tar.gz diff --git a/PyQt5_gpl-5.6-dbus_ftbfs.patch b/PyQt5_gpl-5.6-dbus_ftbfs.patch new file mode 100644 index 0000000..6830dda --- /dev/null +++ b/PyQt5_gpl-5.6-dbus_ftbfs.patch @@ -0,0 +1,12 @@ +diff -up PyQt5_gpl-5.6/configure.py.dbus PyQt5_gpl-5.6/configure.py +--- PyQt5_gpl-5.6/configure.py.dbus 2016-04-24 22:16:43.120281591 -0500 ++++ PyQt5_gpl-5.6/configure.py 2016-04-25 10:16:52.465218805 -0500 +@@ -2141,7 +2141,7 @@ def check_dbus(target_config, verbose): + else: + dlist = target_config.dbus_inc_dirs + +- target_config.dbus_inc_dirs = [] ++ #target_config.dbus_inc_dirs = [] + + for d in dlist: + if os.access(os.path.join(d, 'dbus', 'dbus-python.h'), os.F_OK): diff --git a/python-qt5.spec b/python-qt5.spec index 357ce8f..cfde98f 100644 --- a/python-qt5.spec +++ b/python-qt5.spec @@ -18,16 +18,16 @@ Summary: PyQt5 is Python bindings for Qt5 Name: python-qt5 -Version: 5.5.1 -Release: 20%{?dist} +Version: 5.6 +Release: 1%{?dist} # all BSD, except for GPLv2+ dbus bindings and examples License: BSD and GPLv2+ Url: http://www.riverbankcomputing.com/software/pyqt/ %if 0%{?snap:1} -Source0: http://www.riverbankcomputing.com/static/Downloads/PyQt5/PyQt-gpl-%{version}%{?snap:-snapshot-%{snap}}.tar.gz +Source0: http://www.riverbankcomputing.com/static/Downloads/PyQt5/PyQt5_gpl-%{version}%{?snap:-snapshot-%{snap}}.tar.gz %else -Source0: http://downloads.sourceforge.net/project/pyqt/PyQt5/PyQt-%{version}/PyQt-gpl-%{version}.tar.gz +Source0: http://downloads.sourceforge.net/project/pyqt/PyQt5/PyQt-%{version}/PyQt5_gpl-%{version}.tar.gz %endif Source1: macros.pyqt5 # wrapper, see https://bugzilla.redhat.com/show_bug.cgi?id=1193107#c9 @@ -37,6 +37,7 @@ Source2: pyuic5.sh ## upstreamable patches Patch0: python-qt5_sipdir.patch +Patch1: PyQt5_gpl-5.6-dbus_ftbfs.patch BuildRequires: chrpath BuildRequires: findutils @@ -63,10 +64,10 @@ BuildRequires: pkgconfig(Qt5Xml) pkgconfig(Qt5XmlPatterns) BuildRequires: pkgconfig(Qt5WebChannel) BuildRequires: pkgconfig(Qt5WebSockets) BuildRequires: python2-devel python2 -BuildRequires: sip-devel >= 4.16.9 +BuildRequires: sip-devel >= 4.18 %if 0%{?with_python3} BuildRequires: python3-devel python3 -BuildRequires: python3-sip-devel >= 4.16.8 +BuildRequires: python3-sip-devel >= 4.18 BuildRequires: python3-dbus %endif # with_python3 @@ -88,6 +89,8 @@ Requires: dbus-python Provides: PyQt5 = %{version}-%{release} Provides: PyQt5%{?_isa} = %{version}-%{release} +Provides: python2-PyQt5 = %{version}-%{release} +Provides: python2-PyQt5%{?_isa} = %{version}-%{release} Provides: python2-qt5 = %{version}-%{release} Provides: python2-qt5%{?_isa} = %{version}-%{release} @@ -100,6 +103,7 @@ Requires: %{name}%{?_isa} = %{version}-%{release} Requires: qt5-qtbase-devel Requires: sip-devel Provides: PyQt5-devel = %{version}-%{release} +Provides: python2-PyQt5-devel = %{version}-%{release} %description devel Files needed to build other bindings for C++ classes that inherit from any of the Qt5 classes (e.g. KDE or your own). @@ -118,6 +122,7 @@ Summary: Python 3 bindings for Qt5 Obsoletes: python3-qt5 < 5.5.1-10 %endif Provides: python3-PyQt5 = %{version}-%{release} +Provides: python3-PyQt5%{?_isa} = %{version}-%{release} Requires: %{name}-rpm-macros = %{version}-%{release} Requires: python3-dbus %description -n python3-qt5 @@ -174,8 +179,10 @@ Requires: python3-qt5%{?_isa} = %{version}-%{release} %prep -%setup -q -n PyQt-gpl-%{version}%{?snap:-snapshot-%{snap}} +%setup -q -n PyQt5_gpl-%{version}%{?snap:-snapshot-%{snap}} + %patch0 -p1 +%patch1 -p1 %build @@ -188,7 +195,6 @@ pushd %{_target_platform} %{__python2} ../configure.py \ --assume-shared \ --confirm-license \ - --no-timestamp \ --qmake=%{_qt5_qmake} \ --qsci-api --qsci-api-destdir=%{_qt5_datadir}/qsci \ --verbose \ @@ -207,7 +213,6 @@ pushd %{_target_platform}-python3 %{__python3} ../configure.py \ --assume-shared \ --confirm-license \ - --no-timestamp \ --qmake=%{_qt5_qmake} \ --no-qsci-api \ --verbose \ @@ -404,6 +409,9 @@ sed -i \ %changelog +* Mon Apr 25 2016 Rex Dieter - 5.6-1 +- PyQt5-5.6 + * Wed Apr 13 2016 Rex Dieter - 5.5.1-20 - rebuild (sip), re-enable -webengine for secondary archs diff --git a/python-qt5_sipdir.patch b/python-qt5_sipdir.patch index 8f42211..d284bef 100644 --- a/python-qt5_sipdir.patch +++ b/python-qt5_sipdir.patch @@ -1,6 +1,6 @@ -diff -rupN PyQt-gpl-5.4.1/configure.py PyQt-gpl-5.4.1-new/configure.py ---- PyQt-gpl-5.4.1/configure.py 2015-02-26 13:17:00.000000000 +0100 -+++ PyQt-gpl-5.4.1-new/configure.py 2015-06-05 00:12:06.326506542 +0200 +diff -up PyQt5_gpl-5.6/configure.py.orig PyQt5_gpl-5.6/configure.py +--- PyQt5_gpl-5.6/configure.py.orig 2016-04-24 05:55:08.000000000 -0500 ++++ PyQt5_gpl-5.6/configure.py 2016-04-24 18:39:26.144925768 -0500 @@ -25,6 +25,7 @@ import os import shutil import stat @@ -9,10 +9,10 @@ diff -rupN PyQt-gpl-5.4.1/configure.py PyQt-gpl-5.4.1-new/configure.py # Initialise the constants. -@@ -463,7 +464,7 @@ class TargetConfiguration: - self.py_version = py_config.version +@@ -476,7 +477,7 @@ class TargetConfiguration: self.pyqt_bin_dir = py_config.bin_dir self.pyqt_module_dir = py_config.module_dir + self.pyqt_stubs_dir = os.path.join(py_config.module_dir, 'PyQt5') - self.pyqt_sip_dir = os.path.join(py_config.data_dir, 'sip', 'PyQt5') + self.pyqt_sip_dir = os.path.join(sipconfig.Configuration().default_sip_dir, 'PyQt5') self.pyuic_interpreter = py_config.pyuic_interpreter diff --git a/sources b/sources index 58e67cf..5d2bd02 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -586ed481b734c665b52fbb4f32161ff7 PyQt-gpl-5.5.1.tar.gz +dbfc885c0548e024ba5260c4f44e0481 PyQt5_gpl-5.6.tar.gz