From acc82c417d15e11a003ec04ddf4a517139e115b2 Mon Sep 17 00:00:00 2001 From: Jan Grulich Date: Tue, 2 Dec 2025 09:21:44 +0100 Subject: [PATCH] 1.19.0 Resolves: RHEL-109197 --- .gitignore | 1 + PyQt-builder.spec | 17 +++++++---- ...builder-lower-setuptools-requirement.patch | 30 +++++++++++++++++++ sources | 2 +- 4 files changed, 44 insertions(+), 6 deletions(-) create mode 100644 pyqt-builder-lower-setuptools-requirement.patch diff --git a/.gitignore b/.gitignore index 74a7081..efe44c1 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ /PyQt-builder-1.15.3.tar.gz /PyQt-builder-1.15.4.tar.gz /pyqt_builder-1.17.0.tar.gz +/pyqt_builder-1.19.0.tar.gz diff --git a/PyQt-builder.spec b/PyQt-builder.spec index d196ce7..58bcefb 100644 --- a/PyQt-builder.spec +++ b/PyQt-builder.spec @@ -1,13 +1,16 @@ %global pypi_name pyqt_builder Name: PyQt-builder -Version: 1.17.0 +Version: 1.19.0 Release: 1%{?dist} Summary: The PEP 517 compliant PyQt build system License: BSD-2-Clause URL: https://www.riverbankcomputing.com/software/pyqt/ Source0: %{pypi_source} + +Patch: pyqt-builder-lower-setuptools-requirement.patch + BuildArch: noarch BuildRequires: python3-devel @@ -32,22 +35,26 @@ rm -rf %{pypi_name}.egg-info %install %pyproject_install +%pyproject_save_files pyqtbuild # These dll files are from openssl and microsoft visiual studio -# While we can redistribute them, we don't have source and it's +# While we can redistribute them, we don't have source and it's # unlikely anyone will want to bundle a windows executable from linux. rm -rf %{buildroot}/%{python3_sitelib}/pyqtbuild/bundle/dlls +sed -r -i '/\/pyqtbuild\/bundle\/dlls/d' %{pyproject_files} %check %py3_check_import pyqtbuild -%files +%files -f %{pyproject_files} %license LICENSE %{_bindir}/pyqt-bundle %{_bindir}/pyqt-qt-wheel -%{python3_sitelib}/pyqtbuild -%{python3_sitelib}/PyQt_builder-%{version}.dist-info %changelog +* Tue Dec 02 2025 Jan Grulich - 1.19.0-1 +- 1.19.0 + Resolves: RHEL-109197 + * Mon Dec 09 2024 Jan Grulich - 1.17.0-1 - 1.17.0 Resolves: RHEL-70412 diff --git a/pyqt-builder-lower-setuptools-requirement.patch b/pyqt-builder-lower-setuptools-requirement.patch new file mode 100644 index 0000000..da0c6b1 --- /dev/null +++ b/pyqt-builder-lower-setuptools-requirement.patch @@ -0,0 +1,30 @@ +diff --git a/pyproject.toml b/pyproject.toml +index 6d3f7cf..a6a487a 100644 +--- a/pyproject.toml ++++ b/pyproject.toml +@@ -1,7 +1,7 @@ + # The project configuration for PyQt-builder. + + [build-system] +-requires = ["setuptools>=77", "setuptools_scm>=8"] ++requires = ["setuptools>=69", "setuptools_scm>=8"] + build-backend = "setuptools.build_meta" + + [tool.setuptools_scm] +@@ -14,8 +14,6 @@ readme = "README.md" + urls.homepage = "https://github.com/Python-PyQt/PyQt-builder" + dependencies = ["packaging", "sip >=6.7, <7"] + requires-python = ">=3.8" +-license = "BSD-2-Clause" +-license-files = ["LICENSE"] + dynamic = ["version"] + + [[project.authors]] +@@ -25,3 +23,7 @@ email = "phil@riverbankcomputing.com" + [project.scripts] + pyqt-bundle = "pyqtbuild.bundle.bundle_main:main" + pyqt-qt-wheel = "pyqtbuild.bundle.qt_wheel_main:main" ++ ++[project.license] ++text = "BSD-2-Clause" ++files = ["LICENSE"] diff --git a/sources b/sources index 8f5af7b..dd7de7d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (pyqt_builder-1.17.0.tar.gz) = e8e2755611cbe1430ec50af3189bcf06152b7fe524787e0823a594be9fd18fb8ff7055fead4b55d4025b97f2e856ccf3bac8cbc9019f9cfe1658f1f3e402133f +SHA512 (pyqt_builder-1.19.0.tar.gz) = 17dff686795e1b1f41a9c575c85c94a8d2d4ba95785dc723ec8f03fbb88e44472b70eb0e4ef9139580f1be0232d0ad324fedb088da3e9518d908587a0d619aa8