From 306088d910f556e9ee3237a35e2a3f0f62ccedb88d0eb44525484acaf7e63cb8 Mon Sep 17 00:00:00 2001 From: Benjamin Greiner Date: Sun, 21 Apr 2024 16:19:16 +0000 Subject: [PATCH] Accepting request 1169542 from home:bnavigator:branches:KDE:Qt:PyQt - Update to 6.7.0 * Add support for Qt 6.7 OBS-URL: https://build.opensuse.org/request/show/1169542 OBS-URL: https://build.opensuse.org/package/show/KDE:Qt:PyQt/python-PyQt6-WebEngine?expand=0&rev=24 --- PyQt6_WebEngine-6.6.0.tar.gz | 3 --- PyQt6_WebEngine-6.7.0.tar.gz | 3 +++ python-PyQt6-WebEngine.changes | 6 ++++++ python-PyQt6-WebEngine.spec | 36 +++++++++++++++++++--------------- 4 files changed, 29 insertions(+), 19 deletions(-) delete mode 100644 PyQt6_WebEngine-6.6.0.tar.gz create mode 100644 PyQt6_WebEngine-6.7.0.tar.gz diff --git a/PyQt6_WebEngine-6.6.0.tar.gz b/PyQt6_WebEngine-6.6.0.tar.gz deleted file mode 100644 index b8463ac..0000000 --- a/PyQt6_WebEngine-6.6.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d50b984c3f85e409e692b156132721522d4e8cf9b6c25e0cf927eea2dfb39487 -size 31817 diff --git a/PyQt6_WebEngine-6.7.0.tar.gz b/PyQt6_WebEngine-6.7.0.tar.gz new file mode 100644 index 0000000..a5f4252 --- /dev/null +++ b/PyQt6_WebEngine-6.7.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:68edc7adb6d9e275f5de956881e79cca0d71fad439abeaa10d823bff5ac55001 +size 32593 diff --git a/python-PyQt6-WebEngine.changes b/python-PyQt6-WebEngine.changes index edc9320..0948224 100644 --- a/python-PyQt6-WebEngine.changes +++ b/python-PyQt6-WebEngine.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sun Apr 21 13:58:16 UTC 2024 - Ben Greiner + +- Update to 6.7.0 + * Add support for Qt 6.7 + ------------------------------------------------------------------- Thu Jan 25 20:33:30 UTC 2024 - Ben Greiner diff --git a/python-PyQt6-WebEngine.spec b/python-PyQt6-WebEngine.spec index dd4966f..3566f3a 100644 --- a/python-PyQt6-WebEngine.spec +++ b/python-PyQt6-WebEngine.spec @@ -1,5 +1,5 @@ # -# spec file +# spec file for package python-PyQt6-WebEngine # # Copyright (c) 2024 SUSE LLC # @@ -16,22 +16,24 @@ # -%define mname PyQt6-WebEngine -%define muname PyQt6_WebEngine +%define qtlib WebEngine %define pyqt_build_for_qt6 1 +%define plainpython python %{?sle15_python_module_pythons} -Name: python-%{mname} -Version: 6.6.0 +Name: python-PyQt6-%{qtlib} +Version: 6.7.0 Release: 0 Summary: Python bindings for the Qt WebEngine framework License: GPL-3.0-only Group: Development/Libraries/Python URL: https://www.riverbankcomputing.com/software/pyqt3d -Source: https://files.pythonhosted.org/packages/source/P/%{mname}/%{muname}-%{version}.tar.gz +# boo#1222514 +# Source: https://files.pythonhosted.org/packages/source/P/PyQt6-%%{qtlib}/PyQt6_%%{qtlib}-%%{version}.tar.gz +Source: https://riverbankcomputing.com/pypi/packages/PyQt6-%{qtlib}/PyQt6_%{qtlib}-%{version}.tar.gz BuildRequires: %{python_module PyQt6-devel >= 6.2} -BuildRequires: %{python_module devel >= 3.7} -BuildRequires: %{python_module pyqt-builder >= 1.11} -BuildRequires: %{python_module sip-devel >= 6} +BuildRequires: %{python_module devel} +BuildRequires: %{python_module pyqt-builder >= 1.11 with %python-pyqt-builder < 2} +BuildRequires: %{python_module sip-devel >= 6.8 with %python-sip-devel < 7} BuildRequires: fdupes BuildRequires: python-pyqt-rpm-macros BuildRequires: python-rpm-macros @@ -41,13 +43,14 @@ BuildRequires: cmake(Qt6WebEngineCore) BuildRequires: cmake(Qt6WebEngineQuick) BuildRequires: cmake(Qt6WebEngineWidgets) %requires_ge python-PyQt6 +%requires_ge python-PyQt6-sip Provides: python-qtwebengine-qt6 = %{version}-%{release} # Mirror with qt6-webengine ExclusiveArch: aarch64 x86_64 riscv64 %python_subpackages %description -PyQt6-WebEngine is a set of Python bindings for The Qt Company’s Qt WebEngine +PyQt6-WebEngine is a set of Python bindings for The Qt Company's Qt WebEngine framework. The framework provides the ability to embed web content in applications and is based on the Chrome browser. The bindings sit on top of PyQt6 and are implemented as three separate modules corresponding to the different @@ -57,15 +60,16 @@ libraries that make up the framework. Summary: Devel files for %{name} Group: Development/Tools/IDE Requires: python-PyQt6-devel -Supplements: (eric and python-%{mname}) -Supplements: (python-PyQt6-devel and python-%{mname}) +Requires: %plainpython(abi) = %{python_version} +Supplements: (eric and python-PyQt6-%{qtlib}) +Supplements: (python-PyQt6-devel and python-PyQt6-%{qtlib}) %description devel This package provides Qt6 API files for the Eric IDE and the SIP files used to generate the Python bindings for %{name} %prep -%autosetup -p1 -n %{muname}-%{version} +%autosetup -p1 -n PyQt6_%{qtlib}-%{version} %build %pyqt_build @@ -82,18 +86,18 @@ $python -c 'from PyQt6 import QtWebEngineCore, QtWebEngineQuick, QtWebEngineWidg %files %{python_files} %license LICENSE -%doc NEWS README +%doc NEWS README.md %dir %{python_sitearch}/PyQt6/ %{python_sitearch}/PyQt6/QtWebEngineCore.* %{python_sitearch}/PyQt6/QtWebEngineQuick.* %{python_sitearch}/PyQt6/QtWebEngineWidgets.* -%{python_sitearch}/%{muname}-%{version}*-info/ +%{python_sitearch}/PyQt6_%{qtlib}-%{version}.dist-info/ %exclude %{pyqt6_sipdir} %files %{python_files devel} %license LICENSE %dir %{_qt6_datadir}/qsci/api/python_%{python_bin_suffix}/ -%{_qt6_datadir}/qsci/api/python_%{python_bin_suffix}/%{mname}.api +%{_qt6_datadir}/qsci/api/python_%{python_bin_suffix}/PyQt6-%{qtlib}.api %dir %{pyqt6_sipdir} %{pyqt6_sipdir}/QtWebEngineCore %{pyqt6_sipdir}/QtWebEngineQuick