From dcf64d141ed586ca3e999c33e50b687650e1006e Mon Sep 17 00:00:00 2001
From: "Eric D. Helms" <ericdhelms@gmail.com>
Date: Tue, 30 Aug 2022 12:52:26 -0400
Subject: [PATCH] Allow passing macros to SRPM build

---
 obal/data/modules/srpm.py                          | 10 ++++++++--
 obal/data/roles/build_package/tasks/koji_build.yml |  1 +
 obal/data/roles/build_srpm/tasks/main.yaml         |  1 +
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/obal/data/modules/srpm.py b/obal/data/modules/srpm.py
index 54ffd34c..25b6af7c 100644
--- a/obal/data/modules/srpm.py
+++ b/obal/data/modules/srpm.py
@@ -83,7 +83,7 @@ def fetch_remote_sources(source_location, source_system, sources_dir):
                 zip_file.extract(zip_info, sources_dir)
 
 
-def build_srpm(module, package, base_dir, sources_dir, scl=None):
+def build_srpm(module, package, base_dir, sources_dir, scl=None, macros=None):
     """
     Build the SRPM and return the path to the result
     """
@@ -101,6 +101,10 @@ def build_srpm(module, package, base_dir, sources_dir, scl=None):
     if scl:
         command += ['--define', 'scl %s' %  scl]
 
+    if macros is not None:
+        for (macro, value) in macros.items():
+            command += ['--define', '%s %s' % (macro, value)]
+
     command += [os.path.join(base_dir, '%s.spec' % os.path.basename(package))]
 
     try:
@@ -128,6 +132,7 @@ def main():
         argument_spec=dict(
             package=dict(type='str', required=False),
             scl=dict(type='str', required=False),
+            macros=dict(type='dict', required=False),
             output=dict(type='path', required=False),
             source_location=dict(type='str', required=False),
             source_system=dict(type='str', required=False),
@@ -137,6 +142,7 @@ def main():
     package = module.params['package']
     output = module.params['output']
     scl = module.params['scl']
+    macros = module.params['macros']
     source_location = module.params['source_location']
     source_system = module.params['source_system']
 
@@ -158,7 +164,7 @@ def main():
         copy_sources(spec_file, package, sources_dir)
         shutil.copy(spec_file, base_dir)
 
-        result = build_srpm(module, package, base_dir, sources_dir, scl)
+        result = build_srpm(module, package, base_dir, sources_dir, scl, macros)
 
         if not os.path.exists(output):
             os.mkdir(output)
diff --git a/obal/data/roles/build_package/tasks/koji_build.yml b/obal/data/roles/build_package/tasks/koji_build.yml
index aff429d0..35af9c33 100644
--- a/obal/data/roles/build_package/tasks/koji_build.yml
+++ b/obal/data/roles/build_package/tasks/koji_build.yml
@@ -44,6 +44,7 @@
         package: "{{ inventory_dir }}/{{ package_base_dir }}/{{ inventory_hostname }}"
         output: "{{ build_package_srpm_directory | default(srpm_directory.path) }}"
         scl: "{{ scl | default(omit) }}"
+        macros: "{{ tag.macros | default(omit) }}"
         source_location: "{{ source_location | default(omit) }}"
         source_system: "{{ source_system | default(omit) }}"
       register: srpm_build
diff --git a/obal/data/roles/build_srpm/tasks/main.yaml b/obal/data/roles/build_srpm/tasks/main.yaml
index 89d94faa..630e5406 100644
--- a/obal/data/roles/build_srpm/tasks/main.yaml
+++ b/obal/data/roles/build_srpm/tasks/main.yaml
@@ -4,6 +4,7 @@
     package: "{{ inventory_dir }}/{{ package_base_dir }}/{{ inventory_hostname }}"
     output: "{{ build_srpm_output_dir }}"
     scl: "{{ build_srpm_scl | default(omit) }}"
+    macros: "{{ macros | default(omit) }}"
     source_location: "{{ source_location | default(omit) }}"
     source_system: "{{ source_system | default(omit) }}"
   register: srpm_build