From 11b431da209aa076507547ba49a83fc383abd154 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Tue, 10 Jul 2018 16:16:02 -0500 Subject: [PATCH] 5.11.2 %build: --no-dist-info (not supported when using DESTDIR= yet) --- .gitignore | 1 + PyQt5-Timeline.patch | 10 +++++----- PyQt5-qt511.patch | 11 ----------- python-qt5.spec | 31 +++++++++++++++++-------------- sources | 2 +- 5 files changed, 24 insertions(+), 31 deletions(-) delete mode 100644 PyQt5-qt511.patch diff --git a/.gitignore b/.gitignore index 6448a86..288b591 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /PyQt5_gpl-5.10.tar.gz /PyQt5_gpl-5.10.1.tar.gz /PyQt5_gpl-5.10.2.dev1805251538.tar.gz +/PyQt5_gpl-5.11.2.tar.gz diff --git a/PyQt5-Timeline.patch b/PyQt5-Timeline.patch index c2d11a2..419fa9d 100644 --- a/PyQt5-Timeline.patch +++ b/PyQt5-Timeline.patch @@ -1,12 +1,12 @@ -diff -up PyQt5_gpl-5.10.2.dev1805251538/sip/QtCore/QtCoremod.sip.Timeline PyQt5_gpl-5.10.2.dev1805251538/sip/QtCore/QtCoremod.sip ---- PyQt5_gpl-5.10.2.dev1805251538/sip/QtCore/QtCoremod.sip.Timeline 2018-05-29 11:43:06.587926702 -0500 -+++ PyQt5_gpl-5.10.2.dev1805251538/sip/QtCore/QtCoremod.sip 2018-05-29 11:43:54.954146964 -0500 +diff -up PyQt5_gpl-5.11.2/sip/QtCore/QtCoremod.sip.Timeline PyQt5_gpl-5.11.2/sip/QtCore/QtCoremod.sip +--- PyQt5_gpl-5.11.2/sip/QtCore/QtCoremod.sip.Timeline 2018-07-10 15:25:49.295960286 -0500 ++++ PyQt5_gpl-5.11.2/sip/QtCore/QtCoremod.sip 2018-07-10 15:26:22.781340757 -0500 @@ -22,7 +22,7 @@ %Module(name=PyQt5.QtCore, call_super_init=True, default_VirtualErrorHandler=PyQt5, keyword_arguments="Optional", use_limited_api=True) --%Timeline {Qt_5_0_0 Qt_5_0_1 Qt_5_0_2 Qt_5_1_0 Qt_5_1_1 Qt_5_2_0 Qt_5_2_1 Qt_5_3_0 Qt_5_3_1 Qt_5_3_2 Qt_5_4_0 Qt_5_4_1 Qt_5_4_2 Qt_5_5_0 Qt_5_5_1 Qt_5_6_0 Qt_5_6_1 Qt_5_6_2 Qt_5_6_3 Qt_5_6_4 Qt_5_6_5 Qt_5_6_6 Qt_5_6_7 Qt_5_6_8 Qt_5_6_9 Qt_5_7_0 Qt_5_7_1 Qt_5_8_0 Qt_5_8_1 Qt_5_9_0 Qt_5_9_1 Qt_5_9_2 Qt_5_9_3 Qt_5_9_4 Qt_5_9_5 Qt_5_9_6 Qt_5_9_7 Qt_5_9_8 Qt_5_9_9 Qt_5_10_0 Qt_5_10_1} -+%Timeline {Qt_5_0_0 Qt_5_0_1 Qt_5_0_2 Qt_5_1_0 Qt_5_1_1 Qt_5_2_0 Qt_5_2_1 Qt_5_3_0 Qt_5_3_1 Qt_5_3_2 Qt_5_4_0 Qt_5_4_1 Qt_5_4_2 Qt_5_5_0 Qt_5_5_1 Qt_5_6_0 Qt_5_6_1 Qt_5_6_2 Qt_5_6_3 Qt_5_6_4 Qt_5_6_5 Qt_5_6_6 Qt_5_6_7 Qt_5_6_8 Qt_5_6_9 Qt_5_7_0 Qt_5_7_1 Qt_5_8_0 Qt_5_8_1 Qt_5_9_0 Qt_5_9_1 Qt_5_9_2 Qt_5_9_3 Qt_5_9_4 Qt_5_9_5 Qt_5_9_6 Qt_5_9_7 Qt_5_9_8 Qt_5_9_9 Qt_5_10_0 Qt_5_10_1 Qt_5_10_2 Qt_5_11_0 Qt_5_11_1} +-%Timeline {Qt_5_0_0 Qt_5_0_1 Qt_5_0_2 Qt_5_1_0 Qt_5_1_1 Qt_5_2_0 Qt_5_2_1 Qt_5_3_0 Qt_5_3_1 Qt_5_3_2 Qt_5_4_0 Qt_5_4_1 Qt_5_4_2 Qt_5_5_0 Qt_5_5_1 Qt_5_6_0 Qt_5_6_1 Qt_5_6_2 Qt_5_6_3 Qt_5_6_4 Qt_5_6_5 Qt_5_6_6 Qt_5_6_7 Qt_5_6_8 Qt_5_6_9 Qt_5_7_0 Qt_5_7_1 Qt_5_8_0 Qt_5_8_1 Qt_5_9_0 Qt_5_9_1 Qt_5_9_2 Qt_5_9_3 Qt_5_9_4 Qt_5_9_5 Qt_5_9_6 Qt_5_9_7 Qt_5_9_8 Qt_5_9_9 Qt_5_10_0 Qt_5_10_1 Qt_5_11_0 Qt_5_11_1} ++%Timeline {Qt_5_0_0 Qt_5_0_1 Qt_5_0_2 Qt_5_1_0 Qt_5_1_1 Qt_5_2_0 Qt_5_2_1 Qt_5_3_0 Qt_5_3_1 Qt_5_3_2 Qt_5_4_0 Qt_5_4_1 Qt_5_4_2 Qt_5_5_0 Qt_5_5_1 Qt_5_6_0 Qt_5_6_1 Qt_5_6_2 Qt_5_6_3 Qt_5_6_4 Qt_5_6_5 Qt_5_6_6 Qt_5_6_7 Qt_5_6_8 Qt_5_6_9 Qt_5_7_0 Qt_5_7_1 Qt_5_8_0 Qt_5_8_1 Qt_5_9_0 Qt_5_9_1 Qt_5_9_2 Qt_5_9_3 Qt_5_9_4 Qt_5_9_5 Qt_5_9_6 Qt_5_9_7 Qt_5_9_8 Qt_5_9_9 Qt_5_10_0 Qt_5_10_1 Qt_5_11_0 Qt_5_11_1 Qt_5_11_2} %Platforms {WS_X11 WS_WIN WS_MACX} diff --git a/PyQt5-qt511.patch b/PyQt5-qt511.patch deleted file mode 100644 index 2ada9a3..0000000 --- a/PyQt5-qt511.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -up PyQt5_gpl-5.10.2.dev1805251538/sip/QtTest/qtestmouse.sip.qt511 PyQt5_gpl-5.10.2.dev1805251538/sip/QtTest/qtestmouse.sip ---- PyQt5_gpl-5.10.2.dev1805251538/sip/QtTest/qtestmouse.sip.qt511 2018-05-25 20:33:17.000000000 -0500 -+++ PyQt5_gpl-5.10.2.dev1805251538/sip/QtTest/qtestmouse.sip 2018-05-29 13:33:57.896800513 -0500 -@@ -41,7 +41,6 @@ namespace QTest - void mousePress(QWidget *widget, Qt::MouseButton button, Qt::KeyboardModifiers modifier = 0, QPoint pos = QPoint(), int delay = -1); - void mouseRelease(QWidget *widget, Qt::MouseButton button, Qt::KeyboardModifiers modifier = 0, QPoint pos = QPoint(), int delay = -1); - void mouseEvent(QTest::MouseAction action, QWidget *widget, Qt::MouseButton button, Qt::KeyboardModifiers modifier, QPoint pos, int delay = -1); -- void waitForEvents() /ReleaseGIL/; - void mouseEvent(QTest::MouseAction action, QWindow *window, Qt::MouseButton button, Qt::KeyboardModifiers modifier, QPoint pos, int delay = -1); - void mousePress(QWindow *window, Qt::MouseButton button, Qt::KeyboardModifiers modifier = Qt::KeyboardModifiers(), QPoint pos = QPoint(), int delay = -1); - void mouseRelease(QWindow *window, Qt::MouseButton button, Qt::KeyboardModifiers modifier = Qt::KeyboardModifiers(), QPoint pos = QPoint(), int delay = -1); diff --git a/python-qt5.spec b/python-qt5.spec index 742ee47..d85917a 100644 --- a/python-qt5.spec +++ b/python-qt5.spec @@ -19,12 +19,10 @@ # see also https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/thread/JQQ66XJSIT2FGTK2YQY7AXMEH5IXMPUX/ %undefine _strict_symbol_defs_build -%define snap dev1805251538 - Summary: PyQt5 is Python bindings for Qt5 Name: python-qt5 -Version: 5.10.2 -Release: 0.4.%{snap}%{?dist} +Version: 5.11.2 +Release: 1%{?dist} License: GPLv3 Url: http://www.riverbankcomputing.com/software/pyqt/ @@ -43,10 +41,8 @@ Source4: pyuic5.sh ## upstreamable patches Patch0: python-qt5_sipdir.patch -# support newer Qt5 releases than 5.9.3/5.10.0 +# support newer Qt5 releases than 5.11.1 Patch1: PyQt5-Timeline.patch -# QTest dropped waitForEvents -Patch2: PyQt5-qt511.patch BuildRequires: chrpath BuildRequires: findutils @@ -80,10 +76,13 @@ BuildRequires: python2-devel python2 %global python2_dbus dbus-python %endif BuildRequires: %{python2_dbus} -BuildRequires: python2-sip-devel >= 4.19.9 +%global sip_ver 4.19.12 +BuildRequires: python2-PyQt5-sip >= %{sip_ver} +BuildRequires: python2-sip-devel >= %{sip_ver} %if 0%{?with_python3} BuildRequires: python%{python3_pkgversion}-devel python%{python3_pkgversion} -BuildRequires: python%{python3_pkgversion}-sip-devel >= 4.19.9 +BuildRequires: python%{python3_pkgversion}-PyQt5-sip >= %{sip_ver} +BuildRequires: python%{python3_pkgversion}-sip-devel >= %{sip_ver} BuildRequires: python%{python3_pkgversion}-dbus %endif # with_python3 @@ -102,7 +101,7 @@ Summary: Python 2 bindings for Qt5 Requires: python2-qt5-base%{?_isa} = %{version}-%{release} BuildRequires: qt5-qtbase-private-devel %{?_qt5:Requires: %{_qt5}%{?_isa} = %{_qt5_version}} -%{?_sip_api:Requires: sip-api(%{_sip_api_major}) >= %{_sip_api}} +%{?_sip_api:Requires: python2-PyQt5-sip-api(%{_sip_api_major}) >= %{_sip_api}} Provides: PyQt5 = %{version}-%{release} Provides: PyQt5%{?_isa} = %{version}-%{release} Provides: python2-PyQt5 = %{version}-%{release} @@ -160,7 +159,7 @@ Requires: python%{python3_pkgversion}-qt5-base%{?_isa} = %{version}-%{release} %package -n python%{python3_pkgversion}-qt5-base Summary: Python 3 bindings for Qt5 base %{?_qt5:Requires: %{_qt5}%{?_isa} = %{_qt5_version}} -%{?_sip_api:Requires: python%{python3_pkgversion}-sip-api(%{_sip_api_major}) >= %{_sip_api}} +%{?_sip_api:Requires: python%{python3_pkgversion}-PyQt5-sip-api(%{_sip_api_major}) >= %{_sip_api}} Provides: python%{python3_pkgversion}-PyQt5-base = %{version}-%{release} Provides: python%{python3_pkgversion}-PyQt5-base%{?_isa} = %{version}-%{release} Requires: %{name}-rpm-macros = %{version}-%{release} @@ -234,7 +233,6 @@ Requires: python%{python3_pkgversion}-qt5%{?_isa} = %{version}-%{release} %patch0 -p1 %patch1 -p1 -%patch2 -p1 %build @@ -249,6 +247,7 @@ pushd %{_target_platform} %{__python2} ./configure.py \ --assume-shared \ --confirm-license \ + --no-dist-info \ --qmake=%{_qt5_qmake} \ --qsci-api --qsci-api-destdir=%{_qt5_datadir}/qsci \ --verbose \ @@ -262,15 +261,15 @@ popd # Python 3 build: %if 0%{?with_python3} -mkdir %{_target_platform}-python3 cp -a * %{_target_platform}-python3/ ||: +mkdir %{_target_platform}-python3 pushd %{_target_platform}-python3 %{__python3} ./configure.py \ --assume-shared \ --confirm-license \ + --no-dist-info \ --qmake=%{_qt5_qmake} \ --no-qsci-api \ - --sip=%{_bindir}/python3-sip \ --verbose \ QMAKE_CFLAGS_RELEASE="%{optflags}" \ QMAKE_CXXFLAGS_RELEASE="%{optflags}" \ @@ -485,6 +484,10 @@ sed -i \ %changelog +* Tue Jul 10 2018 Rex Dieter - 5.11.2-1 +- 5.11.2 +- %%build: --no-dist-info (not supported when using DESTDIR= yet) + * Fri Jun 22 2018 Miro Hrončok - 5.10.2-0.4.dev1805251538 - Rebuilt for Qt update in Python 3.7 side tag diff --git a/sources b/sources index 41115f4..56c8d22 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (PyQt5_gpl-5.10.2.dev1805251538.tar.gz) = 1811649edc9f26381a0011248afb513e9f892808a3bea19c15b6e059d34e98f3a65dfc42f8bda5388c710cc0540c2e9764f3b3ef362c6515a42c89b821fbad94 +SHA512 (PyQt5_gpl-5.11.2.tar.gz) = fc60246b5e1ca0d8aeef829fe20de9dd28b77e3c151532f9dbcd92c0deec12d8308cc799901aeec3f84af745e735053d2aaad2866ef64a2426cba343e08bc2c0