From 3f31cf947fcf2aeb40ccb6b4d0d13bec7a4a7b22 Mon Sep 17 00:00:00 2001
From: Oyvind Albrigtsen <oalbrigt@redhat.com>
Date: Wed, 24 Oct 2018 11:56:19 +0200
Subject: [PATCH] - Rebase to resource-agents 4.2.0 upstream release. - spec:
 fix missing systemd config files

---
 resource-agents.spec | 30 +++++++++++++++++++++++++-----
 sources              |  2 +-
 2 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/resource-agents.spec b/resource-agents.spec
index 397e323..0af4b01 100644
--- a/resource-agents.spec
+++ b/resource-agents.spec
@@ -20,7 +20,23 @@
 #
 
 %global upstream_prefix ClusterLabs-resource-agents
-%global upstream_version 5a1edf2b
+%global upstream_version b222ea88
+
+# Whether this platform defaults to using systemd as an init system
+# (needs to be evaluated prior to BuildRequires being enumerated and
+# installed as it's intended to conditionally select some of these, and
+# for that there are only few indicators with varying reliability:
+# - presence of systemd-defined macros (when building in a full-fledged
+#   environment, which is not the case with ordinary mock-based builds)
+# - systemd-aware rpm as manifested with the presence of particular
+#   macro (rpm itself will trivially always be present when building)
+# - existence of /usr/lib/os-release file, which is something heavily
+#   propagated by systemd project
+# - when not good enough, there's always a possibility to check
+#   particular distro-specific macros (incl. version comparison)
+%define systemd_native (%{?_unitdir:1}%{!?_unitdir:0}%{nil \
+  } || %{?__transaction_systemd_inhibit:1}%{!?__transaction_systemd_inhibit:0}%{nil \
+  } || %(test -f /usr/lib/os-release; test $? -ne 0; echo $?))
 
 # SSLeay (required by ldirectord)
 %if 0%{?suse_version}
@@ -35,8 +51,8 @@
 
 Name:		resource-agents
 Summary:	Open Source HA Reusable Cluster Resource Scripts
-Version:	4.1.1
-Release:	1%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}.2
+Version:	4.2.0
+Release:	1%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}
 License:	GPLv2+ and LGPLv2+
 URL:		https://github.com/ClusterLabs/resource-agents
 %if 0%{?fedora} || 0%{?centos_version} || 0%{?rhel}
@@ -130,10 +146,10 @@ Requires:	perl-Net-IMAP-Simple-SSL
 Requires(post):	/sbin/chkconfig
 Requires(preun):/sbin/chkconfig
 %endif
-%if %{defined systemd_requires}
+%if %{systemd_native}
 BuildRequires:  systemd
-%{?systemd_requires}
 %endif
+%{?systemd_requires}
 
 %description -n ldirectord
 The Linux Director Daemon (ldirectord) was written by Jacob Rief.
@@ -336,6 +352,10 @@ ccs_update_schema > /dev/null 2>&1 ||:
 %endif
 
 %changelog
+* Wed Oct 24 2018 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.2.0-1
+- Rebase to resource-agents 4.2.0 upstream release.
+- spec: fix missing systemd config files
+
 * Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 4.1.1-1.2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
 
diff --git a/sources b/sources
index 2da0f50..a723ea3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (ClusterLabs-resource-agents-5a1edf2b.tar.gz) = 1a3964c02a59743a7953ea07568a1e75e791e73f2c6b9a21cf1593d18cd52f0201468816bd957a2953406e2dd5b5a8623d744fff0442eea1000db753464bf10b
+SHA512 (ClusterLabs-resource-agents-b222ea88.tar.gz) = 24143343e44004821ada6b76b626ea4478ad75e01d313171c04028ca57cc6848afb4fe1ed6c19d66a1002728d4f79813a18519f5d3a1ade4893de4278dd79753