From bf4a9d54efdb2c41823bcafe92492730faaddaefc7ca9cdb26f220440c3e07c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Wed, 21 Aug 2024 17:20:36 +0200 Subject: [PATCH] Sync from SUSE:SLFO:Main python-PyQt6-sip revision 8267b76470055bb962fcc51eee7bf469 --- python-PyQt6-sip.changes | 7 ++++++ python-PyQt6-sip.spec | 14 +++++------ support-python3.6.patch | 53 ---------------------------------------- 3 files changed, 14 insertions(+), 60 deletions(-) delete mode 100644 support-python3.6.patch diff --git a/python-PyQt6-sip.changes b/python-PyQt6-sip.changes index b92a246..0ce9bdc 100644 --- a/python-PyQt6-sip.changes +++ b/python-PyQt6-sip.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Jan 25 20:33:30 UTC 2024 - Ben Greiner + +- Drop support-python3.6.patch + * python-foo prefixed packages for SLE15 with python3.6 should be + handled by an SLE internal maintenance request to python3-foo + ------------------------------------------------------------------- Wed Oct 18 05:13:44 UTC 2023 - llyyr diff --git a/python-PyQt6-sip.spec b/python-PyQt6-sip.spec index b4f03f2..56deeed 100644 --- a/python-PyQt6-sip.spec +++ b/python-PyQt6-sip.spec @@ -1,7 +1,7 @@ # # spec file for package python-PyQt6-sip # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -24,10 +24,10 @@ Summary: The sip module support for PyQt6 License: GPL-2.0-only OR GPL-3.0-only OR SUSE-SIP URL: https://www.riverbankcomputing.com/software/sip/ Source0: https://files.pythonhosted.org/packages/source/P/PyQt6-sip/PyQt6_sip-%{version}.tar.gz -# PATCH-FIX-SLE support-python3.6.patch alarrosa@suse.com -- Let python-PyQt6-sip work with SLE's python3.6 -Patch0: support-python3.6.patch -BuildRequires: %{python_module devel >= 3.6} +BuildRequires: %{python_module devel >= 3.7} +BuildRequires: %{python_module pip} BuildRequires: %{python_module setuptools} +BuildRequires: %{python_module wheel} BuildRequires: fdupes BuildRequires: python-rpm-macros %python_subpackages @@ -47,16 +47,16 @@ without a library to be wrapped. %build export CFLAGS="%{optflags}" -%python_build +%pyproject_wheel %install -%python_install +%pyproject_install %python_expand %fdupes %{buildroot}%{$python_sitearch} %files %{python_files} %license LICENSE LICENSE-GPL2 LICENSE-GPL3 %dir %{python_sitearch}/PyQt6 %{python_sitearch}/PyQt6/sip* -%{python_sitearch}/PyQt6_sip-%{version}*info +%{python_sitearch}/PyQt6_sip-%{version}.dist-info %changelog diff --git a/support-python3.6.patch b/support-python3.6.patch deleted file mode 100644 index e886287..0000000 --- a/support-python3.6.patch +++ /dev/null @@ -1,53 +0,0 @@ -diff --git a/PKG-INFO b/PKG-INFO -index a623a2d..d4ef17b 100644 ---- a/PKG-INFO -+++ b/PKG-INFO -@@ -9,7 +9,7 @@ License: SIP - Platform: X11 - Platform: macOS - Platform: Windows --Requires-Python: >=3.7 -+Requires-Python: >=3.6 - License-File: LICENSE - License-File: LICENSE-GPL2 - License-File: LICENSE-GPL3 -diff --git a/PyQt6_sip.egg-info/PKG-INFO b/PyQt6_sip.egg-info/PKG-INFO -index b0e3b68..6c98da4 100644 ---- a/PyQt6_sip.egg-info/PKG-INFO -+++ b/PyQt6_sip.egg-info/PKG-INFO -@@ -9,7 +9,7 @@ License: SIP - Platform: X11 - Platform: macOS - Platform: Windows --Requires-Python: >=3.7 -+Requires-Python: >=3.6 - License-File: LICENSE - License-File: LICENSE-GPL2 - License-File: LICENSE-GPL3 -diff --git a/setup.py b/setup.py -index 13bfdb0..f09e4df 100644 ---- a/setup.py -+++ b/setup.py -@@ -40,6 +40,6 @@ setup( - name='PyQt6_sip', - version='13.6.0', - license='SIP', -- python_requires='>=3.7', -+ python_requires='>=3.6', - ext_modules=[module] - ) -diff --git a/sip.h b/sip.h -index 89830b8..af9e3fb 100644 ---- a/sip.h -+++ b/sip.h -@@ -24,8 +24,8 @@ - #include - - /* Sanity check on the Python version. */ --#if PY_VERSION_HEX < 0x03070000 --#error "This version of PyQt6.sip requires Python v3.7 or later" -+#if PY_VERSION_HEX < 0x03060000 -+#error "This version of PyQt6.sip requires Python v3.6 or later" - #endif - -