From 677b83ab888d5cc9c3a2fa3c8cf0d0452b8e89af Mon Sep 17 00:00:00 2001 From: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com> Date: Sun, 15 Mar 2026 04:24:44 -0700 Subject: [PATCH] chore: let python macros do their thing (#10542) Signed-off-by: Owen-sz --- anda/langs/python/fx2/fx2.spec | 2 -- anda/langs/python/gay/gay.spec | 13 ++++--------- anda/langs/python/gay/update.rhai | 6 +----- .../langs/python/magic-wormhole/magic-wormhole.spec | 3 --- anda/langs/python/mpv/python-mpv.spec | 4 +--- anda/langs/python/spake2/spake2.spec | 3 --- 6 files changed, 6 insertions(+), 25 deletions(-) diff --git a/anda/langs/python/fx2/fx2.spec b/anda/langs/python/fx2/fx2.spec index f662c76340..c6872789af 100644 --- a/anda/langs/python/fx2/fx2.spec +++ b/anda/langs/python/fx2/fx2.spec @@ -50,8 +50,6 @@ popd %doc README.md %license LICENSE-0BSD.txt %{_bindir}/fx2tool -%ghost %python3_sitelib/__pycache__/*.cpython-*.pyc -%ghost %python3_sitelib/%{name}/subcommands/__pycache__/*.cpython-*.pyc %changelog * Sun Sep 28 2025 Owen Zimmerman diff --git a/anda/langs/python/gay/gay.spec b/anda/langs/python/gay/gay.spec index 7003fb1030..7ca257a703 100644 --- a/anda/langs/python/gay/gay.spec +++ b/anda/langs/python/gay/gay.spec @@ -1,17 +1,13 @@ -%global commit af18bcf210659b8b5a40624ffab791d49e831017 -%global commit_date 20241015 -%global shortcommit %(c=%{commit}; echo ${c:0:7}) - %global pypi_name gay %global _desc Colour your text / terminal to be more gay. Name: python-%{pypi_name} -Version: %commit_date.%shortcommit +Version: 1.3.4 Release: 2%?dist Summary: Colour your text / terminal to be more gay License: MIT URL: https://github.com/ms-jpq/gay -Source0: %url/archive/%commit/gay-%commit.tar.gz +Source0: %{pypi_source} BuildArch: noarch BuildRequires: python3-devel @@ -25,14 +21,13 @@ Packager: Owen Zimmerman %package -n python3-%{pypi_name} Summary: %{summary} -Provides: gay %{?python_provide:%python_provide python3-%{pypi_name}} %description -n python3-%{pypi_name} %_desc %prep -%autosetup -n gay-%{commit} +%autosetup -n %{pypi_name}-%{version} %build %pyproject_wheel @@ -44,7 +39,7 @@ Provides: gay %doc README.md %license LICENSE %{_bindir}/gay -%python3_sitelib/gay-1.3.4.dist-info/* +%python3_sitelib/gay-%{version}.dist-info/* %changelog * Tue Sep 30 2025 Owen Zimmerman diff --git a/anda/langs/python/gay/update.rhai b/anda/langs/python/gay/update.rhai index 8386a9f9f8..132085f7c0 100644 --- a/anda/langs/python/gay/update.rhai +++ b/anda/langs/python/gay/update.rhai @@ -1,5 +1 @@ -rpm.global("commit", gh_commit("ms-jpq/gay")); -if rpm.changed() { - rpm.release(); - rpm.global("commit_date", date()); -} +rpm.version(pypi("gay")); diff --git a/anda/langs/python/magic-wormhole/magic-wormhole.spec b/anda/langs/python/magic-wormhole/magic-wormhole.spec index e830f8a25f..6c2b6d76c7 100644 --- a/anda/langs/python/magic-wormhole/magic-wormhole.spec +++ b/anda/langs/python/magic-wormhole/magic-wormhole.spec @@ -52,9 +52,6 @@ rm %{buildroot}%{_usr}/wormhole_complete.* %{_bindir}/magic-wormhole %{_bindir}/wormhole %{_mandir}/man1/wormhole.1.gz -%ghost %python3_sitelib/__pycache__/*.cpython-*.pyc -%ghost %python3_sitelib/%{name}/subcommands/__pycache__/*.cpython-*.pyc -%python3_sitelib/magic_wormhole-%version.dist-info/* %changelog * Mon Nov 03 2025 Owen Zimmerman diff --git a/anda/langs/python/mpv/python-mpv.spec b/anda/langs/python/mpv/python-mpv.spec index d0ca15e65a..e7b422f89f 100644 --- a/anda/langs/python/mpv/python-mpv.spec +++ b/anda/langs/python/mpv/python-mpv.spec @@ -4,7 +4,7 @@ Name: python-%{pypi_name} Version: 1.0.8 -Release: 2%?dist +Release: 3%?dist Summary: Python interface to the awesome mpv media player License: GPL-2.0+ OR LGPL-2.1+ URL: https://github.com/jaseg/python-mpv @@ -60,8 +60,6 @@ EOL %files -n python3-%{pypi_name} -f %{pyproject_files} %doc README.rst %license LICENSE.GPL LICENSE.LGPL -%ghost %python3_sitelib/__pycache__/mpv.cpython-*.pyc -%python3_sitelib/mpv.py %endif %changelog diff --git a/anda/langs/python/spake2/spake2.spec b/anda/langs/python/spake2/spake2.spec index 64061662c8..d223f203db 100644 --- a/anda/langs/python/spake2/spake2.spec +++ b/anda/langs/python/spake2/spake2.spec @@ -40,9 +40,6 @@ Summary: %{summary} %files -n python3-%{pypi_name} -f %{pyproject_files} %doc README.md %license LICENSE -%ghost %python3_sitelib/__pycache__/*.cpython-*.pyc -%ghost %python3_sitelib/%{name}/subcommands/__pycache__/*.cpython-*.pyc -%python3_sitelib/spake2-%version.dist-info/* %changelog * Mon Nov 03 2025 Owen Zimmerman