From 60de740b2197824139c902560d5c1c8703852792 Mon Sep 17 00:00:00 2001
From: Otto Urpelainen <oturpe@iki.fi>
Date: Aug 24 2021 23:30:18 +0000
Subject: Use rpkg layouts for rpmdefines


Earlier, `rpkg`'s layout mechanism was bypassed and rpmdefines were set in a
fixed way by `fedpkg`. This breaks the new results dir feature from
https://pagure.io/rpkg/pull-request/540

Rpmdefines are changed to be read from selected layout here, including the new
`rpmfilename` layout property.

Signed-off-by: Otto Urpelainen <oturpe@iki.fi>

---

diff --git a/fedpkg/__init__.py b/fedpkg/__init__.py
index 0cbaebe..a9e1532 100644
--- a/fedpkg/__init__.py
+++ b/fedpkg/__init__.py
@@ -188,11 +188,12 @@ class Commands(pyrpkg.Commands):
             raise pyrpkg.rpkgError('Could not find the release/dist from branch name '
                                    '%s\nPlease specify with --release' %
                                    self.branch_merge)
-        self._rpmdefines = ["--define '_sourcedir %s'" % self.path,
-                            "--define '_specdir %s'" % self.path,
-                            "--define '_builddir %s'" % self.path,
-                            "--define '_srcrpmdir %s'" % self.path,
-                            "--define '_rpmdir %s'" % self.path,
+        self._rpmdefines = ["--define '_sourcedir %s'" % self.layout.sourcedir,
+                            "--define '_specdir %s'" % self.layout.specdir,
+                            "--define '_builddir %s'" % self.layout.builddir,
+                            "--define '_srcrpmdir %s'" % self.layout.srcrpmdir,
+                            "--define '_rpmdir %s'" % self.layout.rpmdir,
+                            "--define '_rpmfilename %s'" % self.layout.rpmfilename,
                             "--define 'dist %%{?distprefix}.%s'" % self._disttag,
                             "--define '%s %s'" % (self._distvar,
                                                   self._distval),
diff --git a/test/test_commands.py b/test/test_commands.py
index ebfe196..e9fefb7 100644
--- a/test/test_commands.py
+++ b/test/test_commands.py
@@ -181,11 +181,12 @@ class TestLoadRpmDefines(CommandTestCase):
     def assert_rpmdefines(self, extra_rpmdefines=[]):
         """Assert Commands._rpmdefines after calling load_rpmdefines"""
         expected_rpmdefines = [
-            "--define '_sourcedir %s'" % self.cmd.path,
-            "--define '_specdir %s'" % self.cmd.path,
-            "--define '_builddir %s'" % self.cmd.path,
-            "--define '_srcrpmdir %s'" % self.cmd.path,
-            "--define '_rpmdir %s'" % self.cmd.path,
+            "--define '_sourcedir %s'" % self.cmd.layout.sourcedir,
+            "--define '_specdir %s'" % self.cmd.layout.specdir,
+            "--define '_builddir %s'" % self.cmd.layout.builddir,
+            "--define '_srcrpmdir %s'" % self.cmd.layout.srcrpmdir,
+            "--define '_rpmdir %s'" % self.cmd.layout.rpmdir,
+            "--define '_rpmfilename %s'" % self.cmd.layout.rpmfilename,
             "--define 'dist %%{?distprefix}.%s'" % self.cmd._disttag,
             "--define '%s %s'" % (self.cmd._distvar, self.cmd._distval),
             "--eval '%%undefine %s'" % self.cmd._distunset,