From 3ec8f6be0ed04cc6c9d19506856ca7d576159667 Mon Sep 17 00:00:00 2001
From: Oyvind Albrigtsen <oalbrigt@redhat.com>
Date: Mon, 8 Feb 2016 16:07:25 +0100
Subject: [PATCH] Rebase to resource-agents 3.9.7 upstream release.

---
 .gitignore           |  1 +
 resource-agents.spec | 38 ++++++++++++++++++++++++++++++++++----
 sources              |  3 +--
 3 files changed, 36 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index 7bd60dc..609a3be 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,3 +15,4 @@ resource-agents-3.0.14.tar.bz2
 /ClusterLabs-resource-agents-39c1f6e.tar.gz
 /ClusterLabs-resource-agents-1e3e9db.tar.gz
 /ClusterLabs-resource-agents-f79322c.tar.gz
+/ClusterLabs-resource-agents-e697f43.tar.gz
diff --git a/resource-agents.spec b/resource-agents.spec
index 851c345..9df0b41 100644
--- a/resource-agents.spec
+++ b/resource-agents.spec
@@ -20,7 +20,7 @@
 #
 
 %global upstream_prefix ClusterLabs-resource-agents
-%global upstream_version f79322c
+%global upstream_version e697f43
 
 # SSLeay (required by ldirectord)
 %if 0%{?suse_version}
@@ -35,8 +35,8 @@
 
 Name:		resource-agents
 Summary:	Open Source HA Reusable Cluster Resource Scripts
-Version:	3.9.6
-Release:	2%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}.2
+Version:	3.9.7
+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}
@@ -129,6 +129,10 @@ Requires:	perl-Net-IMAP-Simple-SSL
 Requires(post):	/sbin/chkconfig
 Requires(preun):/sbin/chkconfig
 %endif
+%if %{defined systemd_requires}
+BuildRequires:  systemd
+%{?systemd_requires}
+%endif
 
 %description -n ldirectord
 The Linux Director Daemon (ldirectord) was written by Jacob Rief.
@@ -176,6 +180,9 @@ export CFLAGS
 
 %configure \
 	%{conf_opt_fatal} \
+%if %{defined _unitdir}
+    --with-systemdsystemunitdir=%{_unitdir} \
+%endif
 	--with-pkg-name=%{name} \
 	--with-ras-set=%{rasset}
 
@@ -239,6 +246,9 @@ rm -rf %{buildroot}
 %{_datadir}/%{name}/ocft/caselib
 %{_datadir}/%{name}/ocft/README
 %{_datadir}/%{name}/ocft/README.zh_CN
+%{_datadir}/%{name}/ocft/helpers.sh
+%{_datadir}/%{name}/ocft/runocft
+%{_datadir}/%{name}/ocft/runocft.prereq
 
 %{_sbindir}/ocf-tester
 %{_sbindir}/ocft
@@ -273,12 +283,24 @@ ccs_update_schema > /dev/null 2>&1 ||:
 
 %if 0%{?fedora}
 %preun -n ldirectord
+%if %{defined _unitdir}
+%systemd_preun ldirectord.service
+%else
 /sbin/chkconfig --del ldirectord
-%postun -n ldirectord -p /sbin/ldconfig
+%endif
+%postun -n ldirectord
+/sbin/ldconfig
+%if %{defined _unitdir}
+%systemd_postun_with_restart ldirectord.service
+%endif
 %post -n ldirectord
+%if %{defined _unitdir}
+%systemd_post ldirectord.service
+%else
 /sbin/chkconfig --add ldirectord
 %endif
 %endif
+%endif
 
 %if %{with linuxha}
 %files -n ldirectord
@@ -290,7 +312,12 @@ ccs_update_schema > /dev/null 2>&1 ||:
 %dir %{_sysconfdir}/ha.d
 %dir %{_sysconfdir}/ha.d/resource.d
 %{_sysconfdir}/ha.d/resource.d/ldirectord
+%if %{defined _unitdir}
+%{_unitdir}/ldirectord.service
+%exclude %{_sysconfdir}/init.d/ldirectord
+%else
 %{_sysconfdir}/init.d/ldirectord
+%endif
 %if 0%{?suse_version}
 /sbin/rcldirectord
 %endif
@@ -300,6 +327,9 @@ ccs_update_schema > /dev/null 2>&1 ||:
 %endif
 
 %changelog
+* Mon Feb  8 2016 Oyvind Albrigtsen <oalbrigt@redhat.com> - 3.9.7-1
+- Rebase to resource-agents 3.9.7 upstream release.
+
 * Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 3.9.6-2.2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
 
diff --git a/sources b/sources
index 1786b38..8b82582 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-4320bfe86ce811364fb5f1537d42b866  ClusterLabs-resource-agents-1e3e9db.tar.gz
-641880c5dbb9d5af1ce8fdd458436f17  ClusterLabs-resource-agents-f79322c.tar.gz
+778730910eb4b243dc9ff3fa618cf148  ClusterLabs-resource-agents-e697f43.tar.gz