From 66a9033eb4000a5fcc820bbf57896e9806a72979 Mon Sep 17 00:00:00 2001 From: Maxwell G Date: Sat, 25 Jun 2022 22:47:55 -0500 Subject: [PATCH] Define %forgesetupargs in %pypi_source so users can call %forgeautosetup or %forgesetup and not have to define extra vars or pass -n to %setup. --- macros.python-srpm | 10 +++++++++- python-rpm-macros.spec | 6 +++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/macros.python-srpm b/macros.python-srpm index 7104f7f..978ad46 100644 --- a/macros.python-srpm +++ b/macros.python-srpm @@ -186,7 +186,15 @@ \ local first = string.sub(src, 1, 1) \ - print(url .. first .. '/' .. src .. '/' .. src .. '-' .. ver .. '.' .. ext) + local archivename = src .. '-' .. ver + print(url .. first .. '/' .. src .. '/' .. archivename .. '.' .. ext) +\ + -- Plug into the forge macros so users can run %forgesetup or %forgeautosetup + -- and not have to specify -n to %setup / %autosetup + -- and potentially define extra vars + local fedora = require "fedora.common" + fedora.safeset("forgesetupargs0", '-n ' .. archivename, true) + fedora.safeset("forgesetupargs", '-n ' .. archivename, true) } %py_provides() %{lua: diff --git a/python-rpm-macros.spec b/python-rpm-macros.spec index 126fdca..23ad248 100644 --- a/python-rpm-macros.spec +++ b/python-rpm-macros.spec @@ -49,7 +49,7 @@ elseif posix.stat('macros.python-srpm') then end } Version: %{__default_python3_version} -Release: 1%{?dist} +Release: 2%{?dist} BuildArch: noarch @@ -151,6 +151,10 @@ grep -E '^#[^%%]*%%[^%%]' %{buildroot}%{rpmmacrodir}/macros.* && exit 1 || true %changelog +* Sun Jun 26 2022 Maxwell G - 3.11-2 +- Define %%forgesetupargs in %%pypi_source so users can call %%forgeautosetup + or %%forgesetup and not have to define extra vars or pass -n to %setup. + * Mon Jun 13 2022 Tomáš Hrnčiar - 3.11-1 - Update main Python to Python 3.11 - https://fedoraproject.org/wiki/Changes/Python3.11