From d74914ec13efe28d1e8118e23cf65653facff16c Mon Sep 17 00:00:00 2001 From: Cristian Le Date: Tue, 25 Jun 2024 12:27:56 +0200 Subject: [PATCH] %pyproject_extras_subpkg: Allow passing -a or -A to %python_extras_subpkg MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: Miro Hrončok --- macros.pyproject | 2 +- pyproject-rpm-macros.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/macros.pyproject b/macros.pyproject index 6ca9114..0132240 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:FaA) %{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 bc1bdb4..f5f40d1 100644 --- a/pyproject-rpm-macros.spec +++ b/pyproject-rpm-macros.spec @@ -13,7 +13,7 @@ License: MIT # Increment Y and reset Z when new macros or features are added # 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.1 +Version: 1.12.2 Release: 1%{?dist} # Macro files @@ -171,6 +171,9 @@ export HOSTNAME="rpmbuild" # to speedup tox in network-less mock, see rhbz#1856 %changelog +* Tue Jun 25 2024 Cristian Le - 1.12.2-1 +- %%pyproject_extras_subpkg: Allow passing -a or -A to %%python_extras_subpkg + * Tue Jun 04 2024 Miro Hrončok - 1.12.1-1 - Add a temporary workaround for RPM 4.20 alpha 2 leaking \x1f (unit separators) - Related: rhbz#2284187