From 01798d1d0ed28b82d44e2ca4cf74ecff99e9f9a3 Mon Sep 17 00:00:00 2001 From: MSVSphere Packaging Team Date: Wed, 8 Nov 2023 16:42:57 +0300 Subject: [PATCH] import python-qt5-5.15.9-1.el9 --- .gitignore | 2 +- .python-qt5.metadata | 2 +- SOURCES/PyQt5-Timeline.patch | 13 ------------- SPECS/python-qt5.spec | 12 ++++++++---- 4 files changed, 10 insertions(+), 19 deletions(-) delete mode 100644 SOURCES/PyQt5-Timeline.patch diff --git a/.gitignore b/.gitignore index 2818abe..696a2ae 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/PyQt5-5.15.6.tar.gz +SOURCES/PyQt5-5.15.9.tar.gz diff --git a/.python-qt5.metadata b/.python-qt5.metadata index 76e3f60..de42277 100644 --- a/.python-qt5.metadata +++ b/.python-qt5.metadata @@ -1 +1 @@ -8d6c8ab553320779a1c0a6396067c04b5c2177b7 SOURCES/PyQt5-5.15.6.tar.gz +1f68db8900204587a32eacac94e9fa5d2d204ec8 SOURCES/PyQt5-5.15.9.tar.gz diff --git a/SOURCES/PyQt5-Timeline.patch b/SOURCES/PyQt5-Timeline.patch deleted file mode 100644 index 447d2ee..0000000 --- a/SOURCES/PyQt5-Timeline.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/sip/QtCore/QtCoremod.sip b/sip/QtCore/QtCoremod.sip -index b525bc5..5bd2470 100644 ---- a/sip/QtCore/QtCoremod.sip -+++ b/sip/QtCore/QtCoremod.sip -@@ -22,7 +22,7 @@ - - %Module(name=PyQt5.QtCore, call_super_init=True, default_VirtualErrorHandler=PyQt5, keyword_arguments="Optional", use_limited_api=True, py_ssize_t_clean=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 Qt_5_14_0 Qt_5_15_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_13_1 Qt_5_13_2 Qt_5_14_0 Qt_5_14_2 Qt_5_15_0 Qt_5_15_1 Qt_5_15_2} - - %Platforms {WS_X11 WS_WIN WS_MACX} - diff --git a/SPECS/python-qt5.spec b/SPECS/python-qt5.spec index 91563e3..c0b1424 100644 --- a/SPECS/python-qt5.spec +++ b/SPECS/python-qt5.spec @@ -22,7 +22,7 @@ Summary: PyQt5 is Python bindings for Qt5 Name: python-qt5 -Version: 5.15.6 +Version: 5.15.9 Release: 1%{?dist} License: GPLv3 @@ -35,8 +35,8 @@ Source1: macros.pyqt5 ## upstream patches ## upstreamable patches -# support newer Qt5 releases -Patch1: PyQt5-Timeline.patch +# support newer Qt5 releases, but may not be needed anymore? -- rdieter +# Patch0: PyQt5-Timeline.patch BuildRequires: make BuildRequires: chrpath @@ -164,7 +164,7 @@ Requires: python%{python3_pkgversion}-qt5%{?_isa} = %{version}-%{release} %prep %setup -q -n PyQt5-%{version}%{?snap:.%{snap}} -%patch1 -p1 +# patch0 -p1 %build @@ -310,6 +310,10 @@ sed -i \ %changelog +* Tue Apr 18 2023 Jan Grulich - 5.15.9-1 +- 5.15.9 + Resolves: bz#2175758 + * Tue May 03 2022 Jan Grulich - 5.15.6-1 - 5.15.6 + sync with Fedora Resolves: bz#2061728