From b74e2464e9e87f9f960447a065097aa22a629981 Mon Sep 17 00:00:00 2001
From: David Duncan <davdunc@amazon.com>
Date: Wed, 20 Jan 2021 14:56:50 +0000
Subject: [PATCH 1/5] Revert "Add BuildRequires: make"

This reverts commit 18e0081befa6500922fdc4f3db94f83a427edd5f.
---
 ec2-hibinit-agent.spec | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ec2-hibinit-agent.spec b/ec2-hibinit-agent.spec
index 9cfbc94..45506e2 100644
--- a/ec2-hibinit-agent.spec
+++ b/ec2-hibinit-agent.spec
@@ -21,7 +21,6 @@ Source0:        https://github.com/aws/%{project}/archive/v%{version}/%{name}-%{
 
 BuildArch:  noarch
 
-BuildRequires: make
 BuildRequires: systemd-rpm-macros
 BuildRequires: python3-devel
 BuildRequires: selinux-policy

From 2b394465497b880d44aa6e6b44b65deec980bdda Mon Sep 17 00:00:00 2001
From: David Duncan <davdunc@amazon.com>
Date: Thu, 1 Jul 2021 03:17:13 +0000
Subject: [PATCH 2/5] Update to v1.0.4 from upstream repository

---
 .gitignore             |  1 +
 ec2-hibinit-agent.spec | 23 +++++++++++++++++++++--
 sources                |  2 +-
 3 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index f31ea6e..be8c07a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /ec2-hibinit-agent-1.0.3.tar.gz
+/ec2-hibinit-agent-1.0.4.tar.gz
diff --git a/ec2-hibinit-agent.spec b/ec2-hibinit-agent.spec
index 45506e2..84f0b00 100644
--- a/ec2-hibinit-agent.spec
+++ b/ec2-hibinit-agent.spec
@@ -11,8 +11,8 @@
 %global _format() export %1=""; for x in %{modulenames}; do %1+=%2; %1+=" "; done;
 
 Name:           ec2-hibinit-agent
-Version:        1.0.3
-Release:        3%{?dist}
+Version:        1.0.4
+Release:        1%{?dist}
 Summary:        Hibernation setup utility for Amazon EC2
 
 License:        ASL 2.0
@@ -139,6 +139,25 @@ fi
 %selinux_relabel_post -s %{selinuxtype}
 
 %changelog
+* Thu Jul 01 2021 David Duncan <davdunc@amazon.com> - 1.0.4-1
+- Update to v1.0.4
+
+* Sat Jun 05 2021 Python Maint <python-maint@redhat.com> - 1.0.3-8
+- Rebuilt for Python 3.10
+
+* Fri Jun 04 2021 Python Maint <python-maint@redhat.com> - 1.0.3-7
+- Rebuilt for Python 3.10
+
+* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 1.0.3-6
+- Rebuilt for updated systemd-rpm-macros
+  See https://pagure.io/fesco/issue/2583.
+
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.3-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Thu Jan 21 17:27:18 UTC 2021 David Duncan <davdunc@amazon.com> - 1.0.3-4
+- Add BuildRequires: make, FESCo issue: #2500
+
 * Tue Nov 03 2020 Mohamed Aboubakr <mabouba@amazon.com> - 1.0.3-3
 - Moving selinux folder in packaging directory.
 - Use make file to generate .pp.bz2 file
diff --git a/sources b/sources
index fdd6506..6141781 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (ec2-hibinit-agent-1.0.3.tar.gz) = 5a44fdde6cb95c6a989f47b6b69d8611a114e02dbc44ea2421587662b75d6dd9b7e922cc4cf8976d76ed78e3c1bcd3a1e12254e90d31d5c3cf3357b49abd1236
+SHA512 (ec2-hibinit-agent-1.0.4.tar.gz) = a0d857ef7bd561e61dcbf7597261451907af24123a6c7b0048e6fbcafea2456dfe4f5436162e8b0912bc720a60370c3f85b15024d1a71dcd1995758d49565d34

From ca8f595a272b785e1712eaf3831a0245c988a62b Mon Sep 17 00:00:00 2001
From: David Duncan <davdunc@davidduncan.org>
Date: Tue, 25 Apr 2023 07:12:05 -0500
Subject: [PATCH 3/5] 1.0.5


From 635e8260eb6f32a86a11cbc708069035acb28025 Mon Sep 17 00:00:00 2001
From: David Duncan <davdunc@davidduncan.org>
Date: Tue, 25 Apr 2023 07:13:20 -0500
Subject: [PATCH 4/5] 1.0.5

---
 .gitignore | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 6c7c561..a3be67c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,5 @@
 /ec2-hibinit-agent-1.0.3.tar.gz
 /ec2-hibinit-agent-1.0.4.tar.gz
-<<<<<<< HEAD
-=======
+/ec2-hibinit-agent-1.0.5.tar.gz
 *.~undo-tree~
 amazon-ec2-hibinit-agent.spec
-/ec2-hibinit-agent-1.0.5.tar.gz
->>>>>>> rawhide

From 08cf0ca75549a738c17e352d1a4bab62cc82f675 Mon Sep 17 00:00:00 2001
From: David Duncan <davdunc@davidduncan.org>
Date: Tue, 25 Apr 2023 07:14:19 -0500
Subject: [PATCH 5/5] 1.0.5

---
 sources | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/sources b/sources
index 5ef7733..60c6846 100644
--- a/sources
+++ b/sources
@@ -1,5 +1 @@
-<<<<<<< HEAD
-SHA512 (ec2-hibinit-agent-1.0.4.tar.gz) = a0d857ef7bd561e61dcbf7597261451907af24123a6c7b0048e6fbcafea2456dfe4f5436162e8b0912bc720a60370c3f85b15024d1a71dcd1995758d49565d34
-=======
 SHA512 (ec2-hibinit-agent-1.0.5.tar.gz) = e6201d006fc18a6fab06bd4026333b7e5310511560ff237e724262a12d60f73f507bf314d224059d314705899aaf3c4d10226dbce776e797c03ee4b0ab819982
->>>>>>> rawhide