From c0f17387ea0d34c311acd434284b373ad6f8b80d Mon Sep 17 00:00:00 2001
From: MSVSphere Packaging Team <packager@msvsphere-os.ru>
Date: Mon, 7 Oct 2024 21:11:49 +0300
Subject: [PATCH] import python-rpm-macros-3.9-54.el9

---
 SOURCES/macros.python-srpm   | 15 +++++++++++++--
 SPECS/python-rpm-macros.spec |  5 ++++-
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/SOURCES/macros.python-srpm b/SOURCES/macros.python-srpm
index b5a7d54..9c5c905 100644
--- a/SOURCES/macros.python-srpm
+++ b/SOURCES/macros.python-srpm
@@ -194,15 +194,19 @@
     end
 }
 
-%python_extras_subpkg(n:i:f:F) %{expand:%{lua:
+%python_extras_subpkg(n:i:f:FaA) %{expand:%{lua:
     local option_n = '-n (name of the base package)'
     local option_i = '-i (buildroot path to metadata)'
     local option_f = '-f (builddir path to a filelist)'
     local option_F = '-F (skip %%files section)'
+    local option_a = '-a (insert BuildArch: noarch)'
+    local option_A = '-A (do not insert BuildArch: noarch (default))'
     local value_n = rpm.expand('%{-n*}')
     local value_i = rpm.expand('%{-i*}')
     local value_f = rpm.expand('%{-f*}')
     local value_F = rpm.expand('%{-F}')
+    local value_a = rpm.expand('%{-a}')
+    local value_A = rpm.expand('%{-A}')
     local args = rpm.expand('%{*}')
     if value_n == '' then
         rpm.expand('%{error:%%%0: missing option ' .. option_n .. '}')
@@ -219,6 +223,9 @@
     if value_f ~= '' and value_F ~= '' then
         rpm.expand('%{error:%%%0: simultaneous ' .. option_f .. ' and ' .. option_F .. ' options are not possible}')
     end
+    if value_a ~= '' and value_A ~= '' then
+        rpm.expand('%{error:%%%0: simultaneous ' .. option_a .. ' and ' .. option_A .. ' options are not possible}')
+    end
     if args == '' then
         rpm.expand('%{error:%%%0 requires at least one argument with "extras" name}')
     end
@@ -246,7 +253,11 @@
         elseif value_f ~= '' then
             files = '%files -n ' .. rpmname .. ' -f ' .. value_f
         end
-        for i, line in ipairs({pkgdef, summary, requires, description, files, ''}) do
+        local tags = summary .. '\\\n' .. requires
+        if value_a ~= '' then
+            tags = tags .. '\\\nBuildArch: noarch'
+        end
+        for i, line in ipairs({pkgdef, tags, description, files, ''}) do
             print(line .. '\\\n')
         end
     end
diff --git a/SPECS/python-rpm-macros.spec b/SPECS/python-rpm-macros.spec
index 8b38b89..d5288d3 100644
--- a/SPECS/python-rpm-macros.spec
+++ b/SPECS/python-rpm-macros.spec
@@ -1,6 +1,6 @@
 Name:           python-rpm-macros
 Version:        3.9
-Release:        53%{?dist}
+Release:        54%{?dist}
 Summary:        The common Python RPM macros
 URL:            https://src.fedoraproject.org/rpms/python-rpm-macros/
 
@@ -126,6 +126,9 @@ install -m 644 pathfix.py %{buildroot}%{_rpmconfigdir}/redhat/
 
 
 %changelog
+* Tue Jun 25 2024 Cristian Le <fedora@lecris.me> - 3.9-54
+- %%python_extras_subpkg: Add option -a to include BuildArch: noarch
+
 * Thu Mar 28 2024 MSVSphere Packaging Team <packager@msvsphere-os.ru> - 3.9-53
 - Rebuilt for MSVSphere 9.4 beta