public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/pyproject-rpm-macros] rawhide: Define dummy %pyproject_files in the SRPM macros
@ 2026-07-10 10:49 
  0 siblings, 0 replies; only message in thread
From:  @ 2026-07-10 10:49 UTC (permalink / raw)
  To: git-commits

            A new commit has been pushed.

            Repo   : rpms/pyproject-rpm-macros
            Branch : rawhide
            Commit : 2a21dbd31123f44a25a5992af5dd3c26b8e2f029
            Author : Miro Hrončok <miro@hroncok.cz>
            Date   : 2026-07-09T12:19:57+02:00
            Stats  : +4/-0 in 1 file(s)
            URL    : https://src.fedoraproject.org/rpms/pyproject-rpm-macros/c/2a21dbd31123f44a25a5992af5dd3c26b8e2f029?branch=rawhide

            Log:
            Define dummy %pyproject_files in the SRPM macros

Apparently, when the macro is undefined and used like this:

    %files -n python3-markupsafe -f %{pyproject_files -D markupsafe}

RPM expands it literally and the -D is passed to %files, leading to:

    error: line ...: Bad option -D: %files -n python3-markupsafe -f %{pyproject_files -D markupsafe}

---
diff --git a/macros.aaa-pyproject-srpm b/macros.aaa-pyproject-srpm
index 5795c7b..dfacb68 100644
--- a/macros.aaa-pyproject-srpm
+++ b/macros.aaa-pyproject-srpm
@@ -6,6 +6,10 @@
 # Note: This takes arbitrary options, to ease addition of new options to the real macro.
 %pyproject_buildrequires(-) echo 'pyproject-rpm-macros'
 
+# Similarly, we define a dummy (to be overridden) %%pyproject_files, to avoid:
+#   error: Bad option -D: %%files -n python3-... -f %%{pyproject_files -D ...}
+%pyproject_files(-) dummy
+
 # We need to define %%pyproject_patch_dependency here in the srpm macros, along with any path-related macros it uses,
 # because this macro is normally used in %%prep, before any generated BR is installed.
 # - The backward-compatible %%_pyproject_files_pkgversion suffix is used in all pyproject-rpm-macros directories.

^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2026-07-10 10:49 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-07-10 10:49 [rpms/pyproject-rpm-macros] rawhide: Define dummy %pyproject_files in the SRPM macros 

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox