From 17f2dfe19b89e091f35fcf245199891fb79d74bc Mon Sep 17 00:00:00 2001 From: Cristian Le Date: Apr 10 2024 18:08:23 +0000 Subject: Add option -a to include BuilArch: noarch Signed-off-by: Cristian Le --- diff --git a/macros.pyproject b/macros.pyproject index 6ca9114..0bf9a25 100644 --- a/macros.pyproject +++ b/macros.pyproject @@ -109,7 +109,7 @@ fi # Note: the three times nested questionmarked -i -f -F pattern means: If none of those options was used -- in that case, we inject our own -f -%pyproject_extras_subpkg(n:i:f:F) %{expand:%{?python_extras_subpkg:%{python_extras_subpkg%{?!-i:%{?!-f:%{?!-F: -f %{_pyproject_ghost_distinfo}}}} %**}}} +%pyproject_extras_subpkg(n:i:f:Fa) %{expand:%{?python_extras_subpkg:%{python_extras_subpkg%{?!-i:%{?!-f:%{?!-F: -f %{_pyproject_ghost_distinfo}}}} %**}}} # Escaping an actual percentage sign in path by 8 signs has been verified in RPM 4.16 and 4.17. diff --git a/pyproject-rpm-macros.spec b/pyproject-rpm-macros.spec index 443c07e..1c7a0c4 100644 --- a/pyproject-rpm-macros.spec +++ b/pyproject-rpm-macros.spec @@ -14,7 +14,7 @@ License: MIT # Increment Z when this is a bugfix or a cosmetic change # Dropping support for EOL Fedoras is *not* considered a breaking change Version: 1.12.0 -Release: 1%{?dist} +Release: 2%{?dist} # Macro files Source001: macros.pyproject @@ -171,6 +171,9 @@ export HOSTNAME="rpmbuild" # to speedup tox in network-less mock, see rhbz#1856 %changelog +* Wed Apr 10 2024 Cristian Le - 1.12.0-2 +- %%pyproject_extras_subpkg: Add option -a to include BuildArch: noarch + * Fri Jan 26 2024 Miro Hrončok - 1.12.0-1 - Namespace pyproject-rpm-macros generated text files with %%{python3_pkgversion} - That way, a single-spec can be used to build packages for multiple Python versions