- Rebase to resource-agents 4.9.0 upstream release.

- Add "which" dependency
- All agents: set correct agent and OCF version in metadata

  Resolves: rhbz#1995918
  Resolves: rhbz#2011142
  Resolves: rhbz#2003118

bz1995918-storage-mon-fix-typo.patch

@@ -0,0 +1,23 @@
+From 09cde6531a87fd6a04568eaae94d5c489f36a8b6 Mon Sep 17 00:00:00 2001
+From: Oyvind Albrigtsen <oalbrigt@redhat.com>
+Date: Mon, 6 Sep 2021 15:07:41 +0200
+Subject: [PATCH] storage-mon: update metadata to suggest usage in combination
+ with HealthSMART agent
+
+---
+ heartbeat/storage-mon.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/heartbeat/storage-mon.in b/heartbeat/storage-mon.in
+index 5b289fe55..875095670 100644
+--- a/heartbeat/storage-mon.in
++++ b/heartbeat/storage-mon.in
+@@ -75,7 +75,7 @@ meta_data() {
+ <longdesc lang="en">
+ System health agent that checks the storage I/O status of the given drives and
+ updates the #health-storage attribute. Usage is highly recommended in combination
+-with storage-mon monitoring agent. The agent currently support a maximum of 25
++with the HealthSMART monitoring agent. The agent currently support a maximum of 25
+ devices per instance.
+ </longdesc>
+ <shortdesc lang="en">storage I/O health status</shortdesc>

resource-agents.spec

@@ -45,7 +45,7 @@
 Name:		resource-agents
 Summary:	Open Source HA Reusable Cluster Resource Scripts
 Version:	4.9.0
-Release:	1%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}
+Release:	2%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}
 License:	GPLv2+ and LGPLv2+
 URL:		https://github.com/ClusterLabs/resource-agents
 Source0:	%{upstream_prefix}-%{upstream_version}.tar.gz
@@ -53,6 +53,8 @@ Patch0:		nova-compute-wait-NovaEvacuate.patch
 Patch1:		bz1952005-pgsqlms-new-ra.patch
 Patch2:		bz1991855-nfsserver-add-nfsconvert.patch
 Patch3:		bz1998039-nfsnotify-fix-notify_args-default.patch
+Patch4:		bz1995918-storage-mon-fix-typo.patch
+Patch5:		bz2003118-all-agents-set-correct-agent-ocf-version.patch
 
 # bundled ha-cloud-support libs
 Patch500:	ha-cloud-support-aws.patch
@@ -100,6 +102,7 @@ BuildRequires:  libxslt docbook_4 docbook-xsl-stylesheets
 Requires: /bin/bash /usr/bin/grep /bin/sed /bin/gawk
 Requires: /bin/ps /usr/bin/pkill /usr/bin/hostname /usr/bin/netstat
 Requires: /usr/sbin/fuser /bin/mount
+Requires: which
 
 # Filesystem / fs.sh / netfs.sh
 Requires: /sbin/fsck
@@ -175,6 +178,8 @@ exit 1
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
+%patch5 -p1
 
 # bundled ha-cloud-support libs
 %patch500 -p1
@@ -504,10 +509,14 @@ rm -rf %{buildroot}/usr/share/doc/resource-agents
 %{_usr}/lib/ocf/lib/heartbeat/OCF_*.pm
 
 %changelog
-* Mon Sep  6 2021 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.9.0-1
+* Thu Oct  7 2021 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.9.0-2
 - Rebase to resource-agents 4.9.0 upstream release.
+- Add "which" dependency
+- All agents: set correct agent and OCF version in metadata
 
   Resolves: rhbz#1995918
+  Resolves: rhbz#2011142
+  Resolves: rhbz#2003118
 
 * Thu Aug 26 2021 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.8.0-13
 - nfsnotify: fix default value for "notify_args"