Accepting request 1058080 from KDE:Qt:PyQt

- Add pyqt-builder-add-timeline5.15.patch for Qt3D 5.15.8 - Add patch to support python 3.6 needed by SLE: * support-python3.6.patch - Update to version 1.14.0 * Added support for QtPdf, QtPdfWidgets and QtTextToSpeech for PyQt6. * SIP v6.7 is now required. OBS-URL: https://build.opensuse.org/request/show/1058080 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-pyqt-builder?expand=0&rev=12
2023-01-14 19:30:47 +00:00 · 2023-01-14 19:30:47 +00:00 · 7650a28b4a
commit 7650a28b4a
parent 6c8339bf67 56c0c1fa40
6 changed files with 92 additions and 14 deletions
--- a/PyQt-builder-1.13.0.tar.gz
+++ b/PyQt-builder-1.13.0.tar.gz
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:4877580c38ceb5320e129b381d083b0a8601c68166d8b99707f08fa0a1689eef
-size 3906564
--- a/PyQt-builder-1.14.0.tar.gz
+++ b/PyQt-builder-1.14.0.tar.gz
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6755931c6d2f8940553e0334d10c933ce5cc18b64425e94fda1accf4ff774f59
+size 3907829
--- a/pyqt-builder-add-timeline5.15.patch
+++ b/pyqt-builder-add-timeline5.15.patch
@ -0,0 +1,14 @@
+Index: PyQt-builder-1.14.0/pyqtbuild/builder.py
+===================================================================
+--- PyQt-builder-1.14.0.orig/pyqtbuild/builder.py
+++ PyQt-builder-1.14.0/pyqtbuild/builder.py
+@@ -530,7 +530,8 @@ macx {
+         patch = self.qt_version & 0xff
+ 
+         # Qt v5.12.4 was the last release where we updated for a patch version.
+-        if (major, minor) >= (5, 13):
+        # And SUSE started to use it in 5.15.8 again for qt3d-qt5
+        if (major, minor) >= (5, 13) and (major, minor, patch) < (5, 15, 8):
+             patch = 0
+         elif (major, minor) == (5, 12):
+             if patch > 4:
--- a/python-pyqt-builder.changes
+++ b/python-pyqt-builder.changes
@ -1,3 +1,22 @@
+-------------------------------------------------------------------
+Thu Jan 12 21:14:30 UTC 2023 - Ben Greiner <code@bnavigator.de>
+
+- Add pyqt-builder-add-timeline5.15.patch for Qt3D 5.15.8
+
+-------------------------------------------------------------------
+Thu Jan 12 11:22:21 UTC 2023 - Antonio Larrosa <alarrosa@suse.com>
+
+- Add patch to support python 3.6 needed by SLE:
+  * support-python3.6.patch
+
+-------------------------------------------------------------------
+Mon Oct  3 17:16:00 UTC 2022 - Ben Greiner <code@bnavigator.de>
+
+- Update to version 1.14.0
+  * Added support for QtPdf, QtPdfWidgets and QtTextToSpeech for
+    PyQt6.
+  * SIP v6.7 is now required.
+
 -------------------------------------------------------------------
 Mon Jun 20 21:19:02 UTC 2022 - Ben Greiner <code@bnavigator.de>

--- a/python-pyqt-builder.spec
+++ b/python-pyqt-builder.spec
@ -1,7 +1,7 @@
 #
-# spec file
+# spec file for package python-pyqt-builder
 #
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@ -18,25 +18,31 @@

 %define mname pyqt-builder
 Name:           python-%{mname}
-Version:        1.13.0
+Version:        1.14.0
 Release:        0
 Summary:        The PEP 517 compliant PyQt build system
 License:        GPL-2.0-only OR GPL-3.0-only OR SUSE-SIP
 URL:            https://www.riverbankcomputing.com/software/pyqt-builder
 Source0:        https://files.pythonhosted.org/packages/source/P/PyQt-builder/PyQt-builder-%{version}.tar.gz
+# PATCH-FEATURE-SUSE support-python3.6.patch alarrosa@suse.com
+Patch0:         support-python3.6.patch
+# PATCH-FEATURE-SUSE pyqt-builder-add-timeline5.15.patch code@bnavigator.de
+Patch1:         pyqt-builder-add-timeline5.15.patch
+BuildRequires:  %{python_module base >= 3.6}
+BuildRequires:  %{python_module pip}
 BuildRequires:  %{python_module setuptools}
-BuildRequires:  %{python_module base >= 3.7}
+BuildRequires:  %{python_module wheel}
 BuildRequires:  fdupes
 BuildRequires:  python-rpm-macros
-Requires:       python-sip-devel >= 6.3
 Requires:       python-packaging
+Requires:       python-sip-devel >= 6.7
 Requires(post): update-alternatives
-Requires(postun):update-alternatives
+Requires(postun): update-alternatives
 Provides:       python-PyQt-builder = %{version}-%{release}
 BuildArch:      noarch
 # SECTION Test Requirements
-BuildRequires:  %{python_module sip-devel >= 6.3}
 BuildRequires:  %{python_module packaging}
+BuildRequires:  %{python_module sip-devel >= 6.7}
 # /SECTION
 %python_subpackages

@ -50,13 +56,13 @@ optional project.py script. Any PEP 517 compliant frontend, for example
 sip-install or pip can then be used to build and install the project.

 %prep
-%setup -q -n PyQt-builder-%{version}
+%autosetup -p1 -n PyQt-builder-%{version}

 %build
-%python_build
+%pyproject_wheel

 %install
-%python_install
+%pyproject_install
 %python_clone -a %{buildroot}%{_bindir}/pyqt-bundle
 %python_clone -a %{buildroot}%{_bindir}/pyqt-qt-wheel
 %python_expand %fdupes %{buildroot}%{$python_sitelib}
@ -75,7 +81,7 @@ $python -c 'import pyqtbuild'
 %postun
 %python_uninstall_alternative pyqt-bundle

-%files %python_files
+%files %{python_files}
 %license LICENSE*
 %doc README NEWS ChangeLog
 %python_alternative %{_bindir}/pyqt-bundle
--- a/support-python3.6.patch
+++ b/support-python3.6.patch
@ -0,0 +1,39 @@
+Index: PyQt-builder-1.14.0/PKG-INFO
+===================================================================
+--- PyQt-builder-1.14.0.orig/PKG-INFO
+++ PyQt-builder-1.14.0/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-GPL3
+ License-File: LICENSE-GPL2
+Index: PyQt-builder-1.14.0/PyQt_builder.egg-info/PKG-INFO
+===================================================================
+--- PyQt-builder-1.14.0.orig/PyQt_builder.egg-info/PKG-INFO
+++ PyQt-builder-1.14.0/PyQt_builder.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-GPL3
+ License-File: LICENSE-GPL2
+Index: PyQt-builder-1.14.0/setup.py
+===================================================================
+--- PyQt-builder-1.14.0.orig/setup.py
+++ PyQt-builder-1.14.0/setup.py
+@@ -48,7 +48,7 @@ setup(
+         name='PyQt-builder',
+         version=version,
+         license='SIP',
+-        python_requires='>=3.7',
+        python_requires='>=3.6',
+         install_requires=['packaging', 'sip >=6.7, <7'],
+         packages=find_packages(),
+         package_data={