From 1a13d2d311e11bf74bd0c741ced6c5d7105d83fe Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Tue, 23 Jan 2018 15:22:49 -0600 Subject: [PATCH] PyQt5-5.10 --- .gitignore | 1 + PyQt5-Timeline.patch | 8 ++++---- python-qt5.spec | 15 +++++++++------ sources | 2 +- 4 files changed, 15 insertions(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index 4582df1..187331c 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /PyQt5_gpl-5.9.tar.gz /PyQt5_gpl-5.9.1.tar.gz /PyQt5_gpl-5.9.2.tar.gz +/PyQt5_gpl-5.10.tar.gz diff --git a/PyQt5-Timeline.patch b/PyQt5-Timeline.patch index df76a17..05ecc02 100644 --- a/PyQt5-Timeline.patch +++ b/PyQt5-Timeline.patch @@ -1,11 +1,11 @@ -diff -up PyQt5_gpl-5.9.2/sip/QtCore/QtCoremod.sip.qt_tags PyQt5_gpl-5.9.2/sip/QtCore/QtCoremod.sip ---- PyQt5_gpl-5.9.2/sip/QtCore/QtCoremod.sip.qt_tags 2017-11-23 08:44:13.000000000 -0600 -+++ PyQt5_gpl-5.9.2/sip/QtCore/QtCoremod.sip 2018-01-08 10:28:31.144420871 -0600 +diff -up PyQt5_gpl-5.10/sip/QtCore/QtCoremod.sip.timeline PyQt5_gpl-5.10/sip/QtCore/QtCoremod.sip +--- PyQt5_gpl-5.10/sip/QtCore/QtCoremod.sip.timeline 2018-01-23 04:20:38.000000000 -0600 ++++ PyQt5_gpl-5.10/sip/QtCore/QtCoremod.sip 2018-01-23 14:17:34.408329178 -0600 @@ -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} +-%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_10_0} +%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_10_0 Qt_5_10_1} %Platforms {WS_X11 WS_WIN WS_MACX} diff --git a/python-qt5.spec b/python-qt5.spec index c36b144..bae5b23 100644 --- a/python-qt5.spec +++ b/python-qt5.spec @@ -18,8 +18,8 @@ Summary: PyQt5 is Python bindings for Qt5 Name: python-qt5 -Version: 5.9.2 -Release: 5%{?dist} +Version: 5.10 +Release: 1%{?dist} License: GPLv3 Url: http://www.riverbankcomputing.com/software/pyqt/ @@ -38,7 +38,7 @@ Source4: pyuic5.sh ## upstreamable patches Patch0: python-qt5_sipdir.patch -# support newer Qt5 releases than just 5.9.3 +# support newer Qt5 releases than 5.9.3/5.10.0 Patch1: PyQt5-Timeline.patch BuildRequires: chrpath @@ -73,10 +73,10 @@ BuildRequires: python2-devel python2 %global python2_dbus dbus-python %endif BuildRequires: %{python2_dbus} -BuildRequires: sip-devel >= 4.19.4 +BuildRequires: python2-sip-devel >= 4.19.7 %if 0%{?with_python3} BuildRequires: python3-devel python3 -BuildRequires: python3-sip-devel >= 4.19.4 +BuildRequires: python3-sip-devel >= 4.19.7 BuildRequires: python3-dbus %endif # with_python3 @@ -113,7 +113,7 @@ Obsoletes: python-qt5 < 5.5.1-10 Summary: Development files for %{name} Requires: %{name}%{?_isa} = %{version}-%{release} Requires: qt5-qtbase-devel -Requires: sip-devel +Requires: python2-sip-devel Provides: PyQt5-devel = %{version}-%{release} Provides: python2-PyQt5-devel = %{version}-%{release} %description devel @@ -463,6 +463,9 @@ sed -i \ %changelog +* Tue Jan 23 2018 Rex Dieter - 5.10-1 +- PyQt5-5.10 + * Mon Jan 08 2018 Rex Dieter - 5.9.2-5 - explicitly support Qt5 newer than just 5.9.3 (+5.9.4,5.10.0,5.10.1) diff --git a/sources b/sources index 928b558..809701c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (PyQt5_gpl-5.9.2.tar.gz) = 5af2e65addaed7dd02d8dbf7a7c63767e565fc8edeb7b51e5991a00cda29f75b666529097646e821aaff556f350a929fd451f548bba76e97355b7fe10bd913bc +SHA512 (PyQt5_gpl-5.10.tar.gz) = a86520870536618857ed3ee1601af45f5a0b456de192a5d6a3f8fa734e5cf49b8ce373928c0f4aeaae365d3fa95db03b5f59ae2903bc5eb2304b7edf22198033