import python-qt5-5.15.0-2.el8

2021-11-09 04:52:36 -05:00 · 2021-11-09 04:52:36 -05:00 · 4d33ea7705
parent 58c6083b6f
commit 4d33ea7705
5 changed files with 30 additions and 21 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1 +1 @@
-SOURCES/PyQt5_gpl-5.13.1.tar.gz
+SOURCES/PyQt5-5.15.0.tar.gz
--- a/.python-qt5.metadata
+++ b/.python-qt5.metadata
@ -1 +1 @@
-7be4319ca785305677509a928dd29a484cd5873a SOURCES/PyQt5_gpl-5.13.1.tar.gz
+928746291aca68a3bb9f1e56053728a942887ab8 SOURCES/PyQt5-5.15.0.tar.gz
--- a/SOURCES/PyQt5-Timeline.patch
+++ b/SOURCES/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.15.0/sip/QtCore/QtCoremod.sip.Timeline PyQt5-5.15.0/sip/QtCore/QtCoremod.sip
+--- PyQt5-5.15.0/sip/QtCore/QtCoremod.sip.Timeline	2020-08-17 17:37:35.734819568 -0500
+++ PyQt5-5.15.0/sip/QtCore/QtCoremod.sip	2020-08-17 17:39:54.179090085 -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_13_0 Qt_5_13_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 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}
 
--- a/SOURCES/python-qt5_sipdir.patch
+++ b/SOURCES/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')
--- a/SPECS/python-qt5.spec
+++ b/SPECS/python-qt5.spec
@ -20,17 +20,19 @@
 ## f29+ no longer using separate sipdir for python3
 %global py3_sipdir %{_datadir}/sip/PyQt5

+%global sip_ver 4.19.23
+
 # see also https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/thread/JQQ66XJSIT2FGTK2YQY7AXMEH5IXMPUX/
 %undefine _strict_symbol_defs_build

 Summary: PyQt5 is Python bindings for Qt5
 Name:    python-qt5
-Version: 5.13.1
-Release: 1%{?dist}
+Version: 5.15.0
+Release: 2%{?dist}

 License: GPLv3
 Url:     http://www.riverbankcomputing.com/software/pyqt/
-Source0: http://www.riverbankcomputing.com/static/Downloads/PyQt5/%{version}/PyQt5_gpl-%{version}.tar.gz
+Source0: https://files.pythonhosted.org/packages/8c/90/82c62bbbadcca98e8c6fa84f1a638de1ed1c89e85368241e9cc43fcbc320/PyQt5-%{version}.tar.gz
 Source1: macros.pyqt5
 # wrapper, see https://bugzilla.redhat.com/show_bug.cgi?id=1193107#c9
 Source2: pylupdate5.sh
@ -49,6 +51,7 @@ BuildRequires: chrpath
 BuildRequires: findutils
 BuildRequires: pkgconfig(dbus-1)
 BuildRequires: pkgconfig(dbus-python)
+BuildRequires: qt5-qtbase-private-devel
 BuildRequires: pkgconfig(Qt5Core) >= 5.5
 BuildRequires: pkgconfig(Qt5Bluetooth)
 BuildRequires: pkgconfig(Qt5DBus)
@ -60,7 +63,7 @@ BuildRequires: pkgconfig(Qt5Nfc)
 BuildRequires: pkgconfig(Qt5Network) pkgconfig(Qt5OpenGL)
 BuildRequires: pkgconfig(Qt5Positioning)
 BuildRequires: pkgconfig(Qt5Quick) pkgconfig(Qt5QuickWidgets)
-BuildRequires: pkgconfig(Qt5Script)
+#BuildRequires: pkgconfig(Qt5Script)
 BuildRequires: pkgconfig(Qt5Sensors)
 BuildRequires: pkgconfig(Qt5SerialPort)
 BuildRequires: pkgconfig(Qt5Sql) pkgconfig(Qt5Svg) pkgconfig(Qt5Test)
@ -68,7 +71,7 @@ BuildRequires: pkgconfig(Qt5X11Extras)
 BuildRequires: pkgconfig(Qt5Xml) pkgconfig(Qt5XmlPatterns)
 BuildRequires: pkgconfig(Qt5WebChannel)
 BuildRequires: pkgconfig(Qt5WebSockets)
-%global sip_ver 4.19.19
+
 %if 0%{?with_python3}
 BuildRequires: python%{python3_pkgversion}-devel python%{python3_pkgversion}
 BuildRequires: python%{python3_pkgversion}-dbus
@ -170,7 +173,7 @@ Requires:  python%{python3_pkgversion}-qt5%{?_isa} = %{version}-%{release}


 %prep
-%setup -q -n PyQt5_gpl-%{version}
+%setup -q -n PyQt5-%{version}

 %patch0 -p1
 %patch1 -p1
@ -193,11 +196,9 @@ pushd %{_target_platform}-python3
  %{?py3_sip:--sip=%{_bindir}/python3-sip} \
  %{?py3_sipdir:--sipdir=%{py3_sipdir}} \
  --verbose \
-  %{?python3_sip_incdir} \
-  --dbus=/usr/include/dbus-1.0/ \
+  --dbus=%{_includedir}/dbus-1.0/ \
  QMAKE_CFLAGS_RELEASE="%{optflags}" \
-  QMAKE_CXXFLAGS_RELEASE="%{optflags}" \
-  QMAKE_CXXFLAGS_RELEASE="%{optflags} -I/usr/%{_lib}/dbus-1.0/include/" \
+  QMAKE_CXXFLAGS_RELEASE="%{optflags} `pkg-config --cflags dbus-python`" \
  QMAKE_LFLAGS_RELEASE="%{?__global_ldflags}"

 %make_build
@ -354,6 +355,14 @@ sed -i \


 %changelog
+* Wed Apr 28 2021 Jan Grulich <jgrulich@redhat.com> - 5.15.0-2
+- Rebuild (binutils)
+  Resolves: bz#1949066
+
+* Tue Apr 13 2021 Jan Grulich <jgrulich@redhat.com> - 5.15.0-1
+- 5.15.0
+  Resolves: bz#1949066
+
 * Fri Nov 22 2019 Jan Grulich <jgrulich@redhat.com> - 5.13.1-1
 - 5.13.1
  Resolves: bz#1775603