Merge branch 'rawhide' into epel8

This reverts commit 18e0081bef.

ec2-hibinit-agent.spec

@@ -26,7 +26,6 @@ Patch2:         0002-rhel-fix-swapoff-breaks-hibernate-process.patch
 
 BuildArch:  noarch
 
-BuildRequires: make
 BuildRequires: systemd-rpm-macros
 BuildRequires: python3-devel
 BuildRequires: python3-setuptools
@@ -34,9 +33,9 @@ BuildRequires: selinux-policy
 BuildRequires: selinux-policy-devel
 
 %{?selinux_requires}
-Requires: acpid 
-Requires: grubby 
-Requires: systemd 
+Requires: acpid
+Requires: grubby
+Requires: systemd
 Requires: tuned
 
 %description
@@ -47,11 +46,11 @@ An EC2 agent that creates a setup for instance hibernation
 # Fix build with setuptools 62.1
 # https://github.com/aws/amazon-ec2-hibinit-agent/issues/24
 sed -i "20i packages=[]," setup.py
- 
+
 %build
 %py3_build
 
-# Makefile generates pp.bz2 from .tt file. 
+# Makefile generates pp.bz2 from .tt file.
 # Generating tt file https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/7/html/selinux_users_and_administrators_guide/security-enhanced_linux-the-sepolicy-suite-sepolicy_generate
 make -C %{_builddir}/%{project}-%{version}/packaging/rhel/ec2hibernatepolicy
 
@@ -60,7 +59,7 @@ make -C %{_builddir}/%{project}-%{version}/packaging/rhel/ec2hibernatepolicy
 
 mkdir -p %{buildroot}%{python3_sitelib}
 mkdir -p "%{buildroot}%{_unitdir}"
-mkdir -p %{buildroot}%{_sysconfdir}/acpi/events 
+mkdir -p %{buildroot}%{_sysconfdir}/acpi/events
 mkdir -p %{buildroot}%{_sharedstatedir}/hibinit-agent
 mkdir -p %{buildroot}%{_sysconfdir}/acpi/actions