From c9ade098ed7899d95d483f8a7c697e419d9e87e7 Mon Sep 17 00:00:00 2001
From: Mike McLean <mikem@redhat.com>
Date: Jul 15 2019 14:40:54 +0000
Subject: adjust tag macro namespace


---

diff --git a/builder/kojid b/builder/kojid
index 8d0f8ee..3f84887 100755
--- a/builder/kojid
+++ b/builder/kojid
@@ -276,7 +276,11 @@ class BuildRoot(object):
             opts['module_hotfixes'] = self.config['extra']['mock.yum.module_hotfixes']
         if self.internal_dev_setup is not None:
             opts['internal_dev_setup'] = bool(self.internal_dev_setup)
-        opts['tag_macros'] = dict([ _ for _ in self.config['extra'].items() if _[0].startswith('%') ])
+        opts['tag_macros'] = {}
+        for key in self.config['extra']:
+            if key.startswith('rpm.macro.'):
+                macro = '%' + key[10:]
+                opts['tag_macros'][macro] = self.config['extra'][key]
         output = koji.genMockConfig(self.name, self.br_arch, managed=True, **opts)
 
         #write config