From d5932021461b5f5b9b2ff7b00a343b273f5aa0af Mon Sep 17 00:00:00 2001
From: Oyvind Albrigtsen <oalbrigt@redhat.com>
Date: Wed, 10 Jan 2018 10:22:35 +0100
Subject: [PATCH] - Rebase to resource-agents 4.1.0 upstream release

---
 .gitignore           | 25 ++++---------------------
 resource-agents.spec | 17 +++++++++++++----
 sources              |  2 +-
 3 files changed, 18 insertions(+), 26 deletions(-)

diff --git a/.gitignore b/.gitignore
index e3f6bf7..83eebe8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,21 +1,4 @@
-resource-agents-3.0.13.tar.bz2
-resource-agents-3.0.14.tar.bz2
-/resource-agents-3.0.16.tar.bz2
-/71b1377f907c.tar.bz2
-/resource-agents-3.0.17.tar.bz2
-/resource-agents-3.1.0.tar.xz
-/resource-agents-3.1.1.tar.xz
-/agents-1.0.4.tar.bz2
-/1.0.4.tar.bz2
-/resource-agents-3.9.1.tar.bz2
-/resource-agents-3.9.2.tar.bz2
-/resource-agents-3.9.5.tar.gz
-/ClusterLabs-resource-agents-5434e96.tar.gz
-/ClusterLabs-resource-agents-614b55f.tar.gz
-/ClusterLabs-resource-agents-39c1f6e.tar.gz
-/ClusterLabs-resource-agents-1e3e9db.tar.gz
-/ClusterLabs-resource-agents-f79322c.tar.gz
-/ClusterLabs-resource-agents-e697f43.tar.gz
-/ClusterLabs-resource-agents-f6c9350.tar.gz
-/ClusterLabs-resource-agents-56782d5.tar.gz
-/ClusterLabs-resource-agents-150fb85.tar.gz
+/ClusterLabs-resource-agents-*.tar.gz
+/resource-agents-*.src.rpm
+/.build-*.log
+/*/
diff --git a/resource-agents.spec b/resource-agents.spec
index a9863e4..3f5553a 100644
--- a/resource-agents.spec
+++ b/resource-agents.spec
@@ -20,7 +20,7 @@
 #
 
 %global upstream_prefix ClusterLabs-resource-agents
-%global upstream_version 150fb85
+%global upstream_version 539ed604
 
 # SSLeay (required by ldirectord)
 %if 0%{?suse_version}
@@ -35,8 +35,8 @@
 
 Name:		resource-agents
 Summary:	Open Source HA Reusable Cluster Resource Scripts
-Version:	4.0.1
-Release:	1%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}.3
+Version:	4.1.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}
@@ -45,7 +45,6 @@ Group:		System Environment/Base
 Group:		Productivity/Clustering/HA
 %endif
 Source0:	%{upstream_prefix}-%{upstream_version}.tar.gz
-Patch1:		fix-non-executable-script-errors.patch
 Obsoletes:	heartbeat-resources <= %{version}
 Provides:	heartbeat-resources = %{version}
 
@@ -248,6 +247,13 @@ rm -rf %{buildroot}
 %{_usr}/lib/ocf/resource.d/redhat
 %endif
 
+%if %{defined _unitdir}
+%{_unitdir}/resource-agents-deps.target
+%endif
+%if %{defined _tmpfilesdir}
+%{_tmpfilesdir}/%{name}.conf
+%endif
+
 %dir %{_datadir}/%{name}
 %dir %{_datadir}/%{name}/ocft
 %{_datadir}/%{name}/ocft/configs
@@ -333,6 +339,9 @@ ccs_update_schema > /dev/null 2>&1 ||:
 %endif
 
 %changelog
+* Wed Jan 10 2018 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.1.0-1
+- Rebase to resource-agents 4.1.0 upstream release.
+
 * Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 4.0.1-1.3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
 
diff --git a/sources b/sources
index 5bba490..ba480e3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (ClusterLabs-resource-agents-150fb85.tar.gz) = 13c81428a0a33859adb43d8736b1fdd679e1f9e99458a0a9bd2340c5ba4258630114531245910ae383af5a28652ed41b3ef01dcbca2751bfe254224f65967918
+SHA512 (ClusterLabs-resource-agents-539ed604.tar.gz) = c30aa93092127e3dcb2664ca9a3035016141b92a65de715425a4b8c27dd0cac219e639549b4e1c61a81d8f21f4683acb45c59cd8fae10bf686d4b0da9e6f0a71