From 9e15821a9e3dabfd64239d1f3dc421fbe20a0207 Mon Sep 17 00:00:00 2001
From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Jul 18 2023 07:08:11 +0000
Subject: Merge branch 'c9s-sig-hyperscale' into c8s-sig-hyperscale


---

diff --git a/systemd.spec b/systemd.spec
index 34233ef..e14ae25 100644
--- a/systemd.spec
+++ b/systemd.spec
@@ -192,11 +192,9 @@ BuildRequires:  perl
 BuildRequires:  perl(IPC::SysV)
 # %generate_buildrequires doesn't work on c8s so we just add all of them as
 # BuildRequires instead.
-%if 0%{?el8}
 BuildRequires:  gnu-efi
 BuildRequires:  gnu-efi-devel
 BuildRequires:  python3dist(pyelftools)
-%endif
 
 %ifnarch %ix86
 # bpftool is not built for i368
@@ -602,18 +600,6 @@ sed -r 's|/system/|/user/|g' %{SOURCE16} >10-timeout-abort.conf.user
 mkdir selinux
 cp %SOURCE100 %SOURCE101 %SOURCE102 %SOURCE103 selinux
 
-%if 0%{!?el8}
-%generate_buildrequires
-%if 0%{?have_gnu_efi}
-if grep -q gnu-efi meson_options.txt; then
-  echo 'gnu-efi'
-  echo 'gnu-efi-devel'
-else
-  echo 'python3dist(pyelftools)'
-fi
-%endif
-%endif
-
 %build
 %global ntpvendor %(source /etc/os-release; echo ${ID})
 %{!?ntpvendor: echo 'NTP vendor zone is not set!'; exit 1}
@@ -1263,7 +1249,10 @@ fi
 
 %changelog
 
-* Mon Jul 17 2023 Daan De Meyer <daan.j.demeyer@glail.com> - 253.5-1.1
+* Tue Jul 18 2023 Daan De Meyer <daan.j.demeyer@gmail.com> - 253.5-1.1
+- Remove %generate_buildrequires in general instead of only on c8s
+
+* Mon Jul 17 2023 Daan De Meyer <daan.j.demeyer@gmail.com> - 253.5-1.1
 - Add back python3-zstd on c9s now that it's been added to EPEL 9
 - Add back support for c8s builds (without ukify)
 - Add full backport of bpftool version requirement lowering