From 6f82c26ceababca2d1d84050a76a758b30a3261e Mon Sep 17 00:00:00 2001 From: Raboneko <119771935+raboneko@users.noreply.github.com> Date: Tue, 30 Sep 2025 00:21:01 -0700 Subject: [PATCH] fix: python packages (#6584) (#6594) (cherry picked from commit 4effe1102d08a9b39e29556e292cb751e3969a5c) Co-authored-by: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com> --- anda/langs/python/fx2/fx2.spec | 10 ++++------ anda/langs/python/jschon/jschon.spec | 6 ++++-- anda/langs/python/pyvcd/pyvcd.spec | 8 ++------ anda/tools/qmk_cli/anda.hcl | 3 ++- anda/tools/qmk_cli/qmk_cli.spec | 11 +++++------ 5 files changed, 17 insertions(+), 21 deletions(-) diff --git a/anda/langs/python/fx2/fx2.spec b/anda/langs/python/fx2/fx2.spec index c38b4c8385..f662c76340 100644 --- a/anda/langs/python/fx2/fx2.spec +++ b/anda/langs/python/fx2/fx2.spec @@ -3,7 +3,7 @@ Name: python-%{pypi_name} Version: 0.13 -Release: 1%?dist +Release: 2%?dist Summary: Chip support package for Cypress EZ-USB FX2 series microcontrollers License: 0BSD URL: https://github.com/whitequark/libfx2 @@ -18,11 +18,6 @@ BuildRequires: python3-setuptools_scm Requires: python3dist(libusb1) -Provides: fx2 -Provides: python3-fx2 -Provides: libfx2 -Provides: python3-libfx2 - Packager: Owen Zimmerman %description @@ -30,6 +25,9 @@ Packager: Owen Zimmerman %package -n python3-%{pypi_name} Summary: %{summary} +Provides: libfx2 +Provides: fx2 +Provides: python3-libfx2 %{?python_provide:%python_provide python3-%{pypi_name}} %description -n python3-%{pypi_name} diff --git a/anda/langs/python/jschon/jschon.spec b/anda/langs/python/jschon/jschon.spec index 86ea58b475..6207922308 100644 --- a/anda/langs/python/jschon/jschon.spec +++ b/anda/langs/python/jschon/jschon.spec @@ -3,7 +3,7 @@ Name: python-%{pypi_name} Version: 0.11.1 -Release: 1%?dist +Release: 2%?dist Summary: An object-oriented JSON Schema implementation for Python License: MIT URL: https://github.com/marksparkza/jschon @@ -37,7 +37,7 @@ Provides: jschon %_desc %prep -%autosetup -n jschon-%{version} +%git_clone %{url}.git %{version} %build %pyproject_wheel @@ -51,6 +51,8 @@ Provides: jschon %license LICENSE %ghost %python3_sitelib/__pycache__/*.cpython-*.pyc %ghost %python3_sitelib/%{name}/subcommands/__pycache__/*.cpython-*.pyc +%{python3_sitelib}/jschon/catalog/json-schema-2019-09/*.json +%{python3_sitelib}/jschon/catalog/json-schema-2020-12/*.json %python3_sitelib/jschon-%version.dist-info/* %changelog diff --git a/anda/langs/python/pyvcd/pyvcd.spec b/anda/langs/python/pyvcd/pyvcd.spec index 4a3af4ece5..ddde4591e0 100644 --- a/anda/langs/python/pyvcd/pyvcd.spec +++ b/anda/langs/python/pyvcd/pyvcd.spec @@ -3,7 +3,7 @@ Name: python-%{pypi_name} Version: 0.4.0 -Release: 1%?dist +Release: 2%?dist Summary: Python package for writing Value Change Dump (VCD) files License: MIT URL: https://github.com/SanDisk-Open-Source/pyvcd @@ -22,11 +22,6 @@ BuildRequires: python3-devel BuildRequires: python3-installer BuildRequires: git -Requires: python3 - -Provides: pyvcd -Provides: python3-pyvcd - Packager: Owen Zimmerman %description @@ -34,6 +29,7 @@ Packager: Owen Zimmerman %package -n python3-%{pypi_name} Summary: %{summary} +Provides: pyvcd %{?python_provide:%python_provide python3-%{pypi_name}} %description -n python3-%{pypi_name} diff --git a/anda/tools/qmk_cli/anda.hcl b/anda/tools/qmk_cli/anda.hcl index 874dae703f..af0f652324 100644 --- a/anda/tools/qmk_cli/anda.hcl +++ b/anda/tools/qmk_cli/anda.hcl @@ -1,5 +1,6 @@ project pkg { - rpm { + arches = ["x86_64"] + rpm { spec = "qmk_cli.spec" } } diff --git a/anda/tools/qmk_cli/qmk_cli.spec b/anda/tools/qmk_cli/qmk_cli.spec index 0ab99a936f..3243ba3307 100644 --- a/anda/tools/qmk_cli/qmk_cli.spec +++ b/anda/tools/qmk_cli/qmk_cli.spec @@ -5,12 +5,13 @@ Name: python-%{pypi_name} Version: 1.1.8 -Release: 1%?dist +Release: 2%?dist Summary: A program to help users work with QMK License: MIT URL: https://github.com/qmk/qmk_cli Source0: %url/archive/refs/tags/%version.tar.gz Patch0: nonexistant-deps.patch +BuildArch: noarch BuildRequires: python3-devel BuildRequires: python3-pip @@ -39,11 +40,6 @@ Requires: python3-pyusb Requires: python3-pyserial Requires: python3-pillow -Provides: qmk -Provides: qmk_cli -Provides: qmk-cli -Provides: python3-qmk_cli - Packager: Owen Zimmerman %description @@ -51,6 +47,9 @@ Packager: Owen Zimmerman %package -n python3-%{pypi_name} Summary: %{summary} +Provides: qmk +Provides: qmk_cli +Provides: qmk-cli %{?python_provide:%python_provide python3-%{pypi_name}} %description -n python3-%{pypi_name}