From dfe8a002157fa7a7656d20cd84668f6606b6fcdf Mon Sep 17 00:00:00 2001
From: Sevag Hanssian <sevagh@protonmail.com>
Date: Mon, 14 Aug 2023 18:01:57 -0400
Subject: [PATCH] Fixes to build system

---
 Dockerfile.build  | 4 ++--
 GNUmakefile       | 2 +-
 rpm/specfile.spec | 1 +
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/Dockerfile.build b/Dockerfile.build
index 5765a6e8..f83d9a87 100644
--- a/Dockerfile.build
+++ b/Dockerfile.build
@@ -1,4 +1,4 @@
-FROM golang:1.12-stretch as build
+FROM golang:1.21-bullseye as build
 
 RUN apt-get update -y &&\
 	apt-get install -y zip 
@@ -11,7 +11,7 @@ RUN make build zip tarball
 FROM fedora as rpmbuild
 
 RUN dnf update -y &&\
-	dnf install -y make rpm-build alien
+	dnf install -y make rpm-build alien systemd-rpm-macros
 
 COPY ./rpm /goat-rpm-pkg/
 
diff --git a/GNUmakefile b/GNUmakefile
index 97f0e76a..e5a5d21d 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -11,7 +11,7 @@ all: build
 
 docker-build:
 	mkdir -p $(PKGDIR)
-	docker build -q -t "goat-builder" -f Dockerfile.build .
+	docker build -t "goat-builder" -f Dockerfile.build .
 	docker run -v $(PKGDIR):/goat-pkg goat-builder
 
 build:
diff --git a/rpm/specfile.spec b/rpm/specfile.spec
index 181d7bb9..e30a3300 100644
--- a/rpm/specfile.spec
+++ b/rpm/specfile.spec
@@ -4,6 +4,7 @@ Name: %{pkgname}
 Version: %{_version}
 Release: 1%{?dist}
 Summary: Attach and mount EBS and ENI
+BuildRequires: systemd-rpm-macros
 
 License: BSD 3-clause
 URL: https://github.com/sevagh/goat