From 64651911bfb1dd48b0c27ff915fe3cd36218641b Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Sat, 4 Apr 2020 14:50:42 -0500 Subject: [PATCH] 5.14.2 --- .gitignore | 1 + PyQt5-Timeline.patch | 10 +++++----- python-qt5.spec | 13 +++++++++---- python-qt5_sipdir.patch | 8 ++++---- sources | 2 +- 5 files changed, 20 insertions(+), 14 deletions(-) diff --git a/.gitignore b/.gitignore index 9ea48ee..9bc486d 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ /PyQt5_gpl-5.13.0.tar.gz /PyQt5_gpl-5.13.1.tar.gz /PyQt5-5.13.2.tar.gz +/PyQt5-5.14.2.tar.gz diff --git a/PyQt5-Timeline.patch b/PyQt5-Timeline.patch index 9a269d1..6e4d588 100644 --- a/PyQt5-Timeline.patch +++ b/PyQt5-Timeline.patch @@ -1,12 +1,12 @@ -diff -up PyQt5_gpl-5.13.1/sip/QtCore/QtCoremod.sip.Timeline PyQt5_gpl-5.13.1/sip/QtCore/QtCoremod.sip ---- PyQt5_gpl-5.13.1/sip/QtCore/QtCoremod.sip.Timeline 2019-09-07 14:37:20.000000000 -0500 -+++ PyQt5_gpl-5.13.1/sip/QtCore/QtCoremod.sip 2019-10-01 09:23:44.472524437 -0500 +diff -up PyQt5-5.14.2/sip/QtCore/QtCoremod.sip.Timeline PyQt5-5.14.2/sip/QtCore/QtCoremod.sip +--- PyQt5-5.14.2/sip/QtCore/QtCoremod.sip.Timeline 2020-04-04 14:32:08.613934536 -0500 ++++ PyQt5-5.14.2/sip/QtCore/QtCoremod.sip 2020-04-04 14:33:08.067305715 -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 Qt_5_11_0 Qt_5_11_1 Qt_5_11_2 Qt_5_11_3 Qt_5_12_0 Qt_5_12_1 Qt_5_12_2 Qt_5_12_3 Qt_5_12_4 Qt_5_13_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_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 Qt_5_11_3 Qt_5_12_0 Qt_5_12_1 Qt_5_12_2 Qt_5_12_3 Qt_5_12_4 Qt_5_12_5 Qt_5_12_6 Qt_5_13_0 Qt_5_13_1 Qt_5_13_2} +-%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 Qt_5_11_3 Qt_5_12_0 Qt_5_12_1 Qt_5_12_2 Qt_5_12_3 Qt_5_12_4 Qt_5_13_0 Qt_5_14_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_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 Qt_5_11_3 Qt_5_12_0 Qt_5_12_1 Qt_5_12_2 Qt_5_12_3 Qt_5_12_4 Qt_5_13_0 Qt_5_14_0 Qt_5_14_1 Qt_5_14_2 Qt_5_14_3 Qt_5_15_0} %Platforms {WS_X11 WS_WIN WS_MACX} diff --git a/python-qt5.spec b/python-qt5.spec index 20e9ffb..f1461c3 100644 --- a/python-qt5.spec +++ b/python-qt5.spec @@ -29,6 +29,8 @@ %global py3_sip %{_bindir}/python3-sip %endif +%global sip_ver 4.19.20 + # see also https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/thread/JQQ66XJSIT2FGTK2YQY7AXMEH5IXMPUX/ %undefine _strict_symbol_defs_build @@ -36,12 +38,13 @@ Summary: PyQt5 is Python bindings for Qt5 Name: python-qt5 -Version: 5.13.2 -Release: 5%{?dist} +Version: 5.14.2 +Release: 1%{?dist} License: GPLv3 Url: http://www.riverbankcomputing.com/software/pyqt/ -Source0: https://www.riverbankcomputing.com/static/Downloads/PyQt5/%{version}/PyQt5-%{version}%{?snap:.%{snap}}.tar.gz +#Source0: https://www.riverbankcomputing.com/static/Downloads/PyQt5/%{version}/PyQt5-%{version}%{?snap:.%{snap}}.tar.gz +Source0: https://files.pythonhosted.org/packages/4d/81/b9a66a28fb9a7bbeb60e266f06ebc4703e7e42b99e3609bf1b58ddd232b9/PyQt5-%{version}.tar.gz Source1: macros.pyqt5 # wrapper, see https://bugzilla.redhat.com/show_bug.cgi?id=1193107#c9 @@ -90,7 +93,6 @@ BuildRequires: python2-enum34 %global python2_dbus dbus-python %endif BuildRequires: %{python2_dbus} -%global sip_ver 4.19.19 BuildRequires: python2-pyqt5-sip >= %{sip_ver} BuildRequires: python2-sip-devel >= %{sip_ver} %endif # with_python2 @@ -552,6 +554,9 @@ sed -i \ %changelog +* Sat Apr 04 2020 Rex Dieter - 5.14.2-1 +- 5.14.2 + * Thu Jan 30 2020 Fedora Release Engineering - 5.13.2-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/python-qt5_sipdir.patch b/python-qt5_sipdir.patch index 92eb2da..6b3414c 100644 --- a/python-qt5_sipdir.patch +++ b/python-qt5_sipdir.patch @@ -1,6 +1,6 @@ -diff -up PyQt5_gpl-5.9/configure.py.sipdir PyQt5_gpl-5.9/configure.py ---- PyQt5_gpl-5.9/configure.py.sipdir 2017-07-03 12:24:48.000000000 -0500 -+++ PyQt5_gpl-5.9/configure.py 2017-07-05 20:31:35.319524089 -0500 +diff -up PyQt5-5.14.2/configure.py.qt5_sipdir PyQt5-5.14.2/configure.py +--- PyQt5-5.14.2/configure.py.qt5_sipdir 2020-04-02 09:58:06.029642000 -0500 ++++ PyQt5-5.14.2/configure.py 2020-04-04 14:50:00.549639237 -0500 @@ -25,6 +25,7 @@ import os import shutil import stat @@ -9,7 +9,7 @@ diff -up PyQt5_gpl-5.9/configure.py.sipdir PyQt5_gpl-5.9/configure.py # Initialise the constants. -@@ -485,7 +486,7 @@ class TargetConfiguration: +@@ -511,7 +512,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') diff --git a/sources b/sources index 77986f3..c960e6d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (PyQt5-5.13.2.tar.gz) = 9a16450d8fe2a7e94e182ebb03cc785c6de516e356251753abfb79af3958230043f2db59750cde0a6f1fd6cf5568eb8b7ae76d5a3fbcfe9f7807e02867973b55 +SHA512 (PyQt5-5.14.2.tar.gz) = 56d9b2970ff50f2af0bfd889ad1226bf64087a6210cc545c5a0188352d1651343fcda9d53f04b041273f61bf31baf43af4a1854c1b580d50c28cff82f59c24ec