From b852c59b02e49483f5f11f2a738cdaebdc88af13 Mon Sep 17 00:00:00 2001
From: Wayne Heaney <42350981+wheaney@users.noreply.github.com>
Date: Tue, 29 Oct 2024 13:45:47 -0700
Subject: [PATCH 1/2] Update rpm.rb

Fix how buildroot is specified to better conform with the rpmbuild CLI. The old way was failing with `File not found` errors.
---
 lib/fpm/package/rpm.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/fpm/package/rpm.rb b/lib/fpm/package/rpm.rb
index a925256561..33242785de 100644
--- a/lib/fpm/package/rpm.rb
+++ b/lib/fpm/package/rpm.rb
@@ -473,7 +473,7 @@ def output(output_path)
     args += ["--define", "dist .#{attributes[:rpm_dist]}"] if attributes[:rpm_dist]
 
     args += [
-      "--define", "buildroot #{build_path}/BUILD",
+      "--buildroot", "#{build_path}/BUILD",
       "--define", "_topdir #{build_path}",
       "--define", "_sourcedir #{build_path}",
       "--define", "_rpmdir #{build_path}/RPMS",

From 0fb0d2615200176adafb1d38354462228022e5b3 Mon Sep 17 00:00:00 2001
From: Wayne Heaney <42350981+wheaney@users.noreply.github.com>
Date: Mon, 4 Nov 2024 22:02:31 -0800
Subject: [PATCH 2/2] Update rpm.rb

Leave old `--define` argument in place for `buildroot`
---
 lib/fpm/package/rpm.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/fpm/package/rpm.rb b/lib/fpm/package/rpm.rb
index 33242785de..861568bc06 100644
--- a/lib/fpm/package/rpm.rb
+++ b/lib/fpm/package/rpm.rb
@@ -474,6 +474,7 @@ def output(output_path)
 
     args += [
       "--buildroot", "#{build_path}/BUILD",
+      "--define", "buildroot #{build_path}/BUILD",
       "--define", "_topdir #{build_path}",
       "--define", "_sourcedir #{build_path}",
       "--define", "_rpmdir #{build_path}/RPMS",