From 0d9ce182cd9d623e21594c2869ad8abd26886dd4 Mon Sep 17 00:00:00 2001
From: Carl George <carl@george.computer>
Date: Fri, 4 Feb 2022 13:53:04 -0600
Subject: [PATCH 1/2] Require path instead of package name for mailx

Resolves: rhbz#2050852
---
 dehydrated.spec | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/dehydrated.spec b/dehydrated.spec
index 399ee6c..8aad3bf 100644
--- a/dehydrated.spec
+++ b/dehydrated.spec
@@ -1,7 +1,8 @@
 Summary: A client for signing certificates with an ACME server
 Name: dehydrated
 Version: 0.7.0
-Release: 3%{?dist}
+Release: 4%{?dist}
+>>>>>>> f35bfc2 (Require path instead of package name for mailx)
 License: MIT
 URL: https://github.com/dehydrated-io/dehydrated
 Source0: https://github.com/dehydrated-io/dehydrated/releases/download/v%{version}/dehydrated-%{version}.tar.gz
@@ -21,7 +22,8 @@ BuildRequires: systemd
 Requires: coreutils
 Requires: curl
 Requires: grep
-Requires: mailx
+# provided by either mailx or s-nail
+Requires: /usr/bin/mailx
 Requires: openssl
 Requires: sed
 
@@ -136,6 +138,9 @@ systemctl start dehydrated.timer >/dev/null 2>&1 || :
 %{_mandir}/man1/dehydrated.1*
 
 %changelog
+* Fri Feb 04 2022 Carl George <carl@george.computer> - 0.7.0-4
+- Resolves: rhbz#2050852 Require path instead of package name for mailx
+
 * Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.7.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
 

From c80a01ea47d12207bf7afe07d5196e560c621f8b Mon Sep 17 00:00:00 2001
From: Paul Wouters <paul.wouters@aiven.io>
Date: Mon, 7 Feb 2022 09:41:35 -0500
Subject: [PATCH 2/2] fixup merge conflict

---
 dehydrated.spec | 1 -
 1 file changed, 1 deletion(-)

diff --git a/dehydrated.spec b/dehydrated.spec
index 8aad3bf..55f9123 100644
--- a/dehydrated.spec
+++ b/dehydrated.spec
@@ -2,7 +2,6 @@ Summary: A client for signing certificates with an ACME server
 Name: dehydrated
 Version: 0.7.0
 Release: 4%{?dist}
->>>>>>> f35bfc2 (Require path instead of package name for mailx)
 License: MIT
 URL: https://github.com/dehydrated-io/dehydrated
 Source0: https://github.com/dehydrated-io/dehydrated/releases/download/v%{version}/dehydrated-%{version}.tar.gz