[rpms/pyproject-rpm-macros] rawhide: %pyproject_extras_subpkg: Make -D/--dist-name mutually exclusive with -i/-f/-F

[rpms/pyproject-rpm-macros] rawhide: %pyproject_extras_subpkg: Make -D/--dist-name mutually exclusive with -i/-f/-F

[@ 2026-07-24 19:58 UTC (permalink / raw)]

            A new commit has been pushed.

            Repo   : rpms/pyproject-rpm-macros
            Branch : rawhide
            Commit : 0de09dc65f46e1aaff259cef6a69f291ea98aeb9
            Author : Miro Hrončok <miro@hroncok.cz>
            Date   : 2026-07-24T16:05:06+02:00
            Stats  : +12/-9 in 3 file(s)
            URL    : https://src.fedoraproject.org/rpms/pyproject-rpm-macros/c/0de09dc65f46e1aaff259cef6a69f291ea98aeb9?branch=rawhide

            Log:
            %pyproject_extras_subpkg: Make -D/--dist-name mutually exclusive with -i/-f/-F

-D selects the auto-generated ghost dist-info file.
When the user provides their own dist-info path (-i), filelist (-f),
or disables the filelist entirely (-F), -D is not applicable.
Make this explicit via exclusion rules rather than silently ignoring it.

Assisted-By: Claude Opus 4.6

---
diff --git a/README.md b/README.md
index d258acc..58930e2 100644
--- a/README.md
+++ b/README.md
@@ -651,15 +651,15 @@ Here is a complete reference of all options:
 
 ### `%pyproject_extras_subpkg`
 
-| Short      | Long                      | Description                                                                                 |
-|------------|---------------------------|---------------------------------------------------------------------------------------------|
-| `-n NAME`  | `--name NAME`             | Name of the base RPM package (required)                                                     |
-| `-D NAME`  | `--dist-name NAME`        | Select %ghost .dist-info for a specific distribution package (not applicable with -i/-f/-F) |
-| `-a`       | `--noarch`                | Insert BuildArch: noarch                                                                    |
-| `-A`       | `--no-noarch`             | Do not insert BuildArch: noarch (default)                                                   |
-| `-i PATH`  | `--dist-info-path PATH`   | Custom buildroot path to the .dist-info metadata folder (optional, advanced usage)          |
-| `-f FILE`  | `--filelist FILE`         | Custom path to a filelist (optional, advanced usage)                                        |
-| `-F`       | `--no-filelist`           | Skip %files section entirely (optional, advanced usage)                                     |
+| Short      | Long                      | Description                                                                                     |
+|------------|---------------------------|-------------------------------------------------------------------------------------------------|
+| `-n NAME`  | `--name NAME`             | Name of the base RPM package (required)                                                         |
+| `-D NAME`  | `--dist-name NAME`        | Select %ghost .dist-info for a specific distribution package (mutually exclusive with -i/-f/-F) |
+| `-a`       | `--noarch`                | Insert BuildArch: noarch                                                                        |
+| `-A`       | `--no-noarch`             | Do not insert BuildArch: noarch (default)                                                       |
+| `-i PATH`  | `--dist-info-path PATH`   | Custom buildroot path to the .dist-info metadata folder (optional, advanced usage)              |
+| `-f FILE`  | `--filelist FILE`         | Custom path to a filelist (optional, advanced usage)                                            |
+| `-F`       | `--no-filelist`           | Skip %files section entirely (optional, advanced usage)                                         |
 
 ### `%tox`
 

diff --git a/macros.pyproject b/macros.pyproject
index 204f844..d877475 100644
--- a/macros.pyproject
+++ b/macros.pyproject
@@ -167,6 +167,8 @@ fi
     {short="a", long="noarch"},
     {short="A", long="no-noarch"},
     {short="D", long="dist-name", value=true},
+}, {
+    {"D", {"i", "f", "F"}},
 })}\
 %{expand:\\\
 %{?python_extras_subpkg:\\\

diff --git a/pyproject-rpm-macros.spec b/pyproject-rpm-macros.spec
index f148b8e..cb49fc3 100644
--- a/pyproject-rpm-macros.spec
+++ b/pyproject-rpm-macros.spec
@@ -182,6 +182,7 @@ export HOSTNAME="rpmbuild"  # to speedup tox in network-less mock, see rhbz#1856
 * 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
+- %%pyproject_extras_subpkg: Make -D/--dist-name mutually exclusive with -i/-f/-F
 
 * Thu Jul 16 2026 Fedora Release Engineering <releng@fedoraproject.org> - 1.23.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild