[rpms/pyproject-rpm-macros] f43: Fixup a regression in %pyproject_extras_subpkg

[rpms/pyproject-rpm-macros] f43: Fixup a regression in %pyproject_extras_subpkg

[@ 2026-07-26 19:42 UTC (permalink / raw)]

            A new commit has been pushed.

            Repo   : rpms/pyproject-rpm-macros
            Branch : f43
            Commit : dcb7c4300a1b023255d8c2d2c968a413a6148dfc
            Author : Miro Hrončok <miro@hroncok.cz>
            Date   : 2026-07-26T20:36:43+02:00
            Stats  : +5/-14 in 2 file(s)
            URL    : https://src.fedoraproject.org/rpms/pyproject-rpm-macros/c/dcb7c4300a1b023255d8c2d2c968a413a6148dfc?branch=f43

            Log:
            Fixup a regression in %pyproject_extras_subpkg

The inner %python_extras_subpkg macro was not expanded.

---
diff --git a/macros.pyproject b/macros.pyproject
index 46b6289..7c72902 100644
--- a/macros.pyproject
+++ b/macros.pyproject
@@ -171,19 +171,7 @@ fi
 }, {
     {"D", {"i", "f", "F"}},
 })}\
-%{expand:\\\
-%{?python_extras_subpkg:\\\
-%{python_extras_subpkg\\\
-  %{!?__pyproject_opt_i:%{!?__pyproject_opt_f:%{!?__pyproject_opt_F:\\\
-    -f %{_pyproject_ghost_distinfo %{?__pyproject_optflag_D}}}}}\\\
-  %{?__pyproject_optflag_n}\\\
-  %{?__pyproject_optflag_i}\\\
-  %{?__pyproject_optflag_f}\\\
-  %{?__pyproject_optflag_F}\\\
-  %{?__pyproject_optflag_a}\\\
-  %{?__pyproject_optflag_A}\\\
-  %{?__pyproject_positional_args}\\\
-}}%{__pyproject_getopt_restore}}
+%{expand:%{?python_extras_subpkg:%{python_extras_subpkg%{!?__pyproject_opt_i:%{!?__pyproject_opt_f:%{!?__pyproject_opt_F: -f %{_pyproject_ghost_distinfo %{?__pyproject_optflag_D}}}}} %{?__pyproject_optflag_n} %{?__pyproject_optflag_i} %{?__pyproject_optflag_f} %{?__pyproject_optflag_F} %{?__pyproject_optflag_a} %{?__pyproject_optflag_A} %{?__pyproject_positional_args}}}%{__pyproject_getopt_restore}}
 
 
 # Escaping shell-globs, percentage signs and spaces was reworked in RPM 4.19+

diff --git a/pyproject-rpm-macros.spec b/pyproject-rpm-macros.spec
index 94633ba..e0e30c7 100644
--- a/pyproject-rpm-macros.spec
+++ b/pyproject-rpm-macros.spec
@@ -14,7 +14,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.23.1
+Version:        1.23.2
 Release:        1%{?dist}
 
 # Macro files
@@ -179,6 +179,9 @@ export HOSTNAME="rpmbuild"  # to speedup tox in network-less mock, see rhbz#1856
 
 
 %changelog
+* Sun Jul 26 2026 Miro Hrončok <mhroncok@redhat.com> - 1.23.2-1
+- Fixup a regression in %%pyproject_extras_subpkg
+
 * Thu Jul 23 2026 Miro Hrončok <mhroncok@redhat.com> - 1.23.1-1
 - getopt: Fix global macro clobbering with save/restore stack
 - %%pyproject_extras_subpkg: Add long options support