From e790cbfb33342b68ec492cd6b78b1feffa2bcf31 Mon Sep 17 00:00:00 2001
From: Chris Lumens <clumens@redhat.com>
Date: Tue, 28 May 2024 10:17:42 -0400
Subject: [PATCH] Rebase on upstream 2.1.8-rc1 release

- Related: RHEL-38543
---
 pacemaker.spec | 14 ++++++++++----
 sources        |  2 +-
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/pacemaker.spec b/pacemaker.spec
index ddf87d1..e3b3ef9 100644
--- a/pacemaker.spec
+++ b/pacemaker.spec
@@ -1,5 +1,5 @@
 #
-# Copyright 2008-2023 the Pacemaker project contributors
+# Copyright 2008-2024 the Pacemaker project contributors
 #
 # The version control history for this file may have further details.
 #
@@ -40,11 +40,11 @@
 ## Upstream pacemaker version, and its package version (specversion
 ## can be incremented to build packages reliably considered "newer"
 ## than previously built packages with the same pcmkversion)
-%global pcmkversion 2.1.7
-%global specversion 4
+%global pcmkversion 2.1.8
+%global specversion 1
 
 ## Upstream commit (full commit ID, abbreviated commit ID, or tag) to build
-%global commit 0f7f88312f7a1ccedee60bf768aba79ee13d41e0
+%global commit 39ef082405a19b22554ffd6efaa75c39a586640f
 
 ## Since git v2.11, the extent of abbreviation is autoscaled by default
 ## (used to be constant of 7), so we need to convey it for non-tags, too.
@@ -666,6 +666,7 @@ exit 0
 
 %{_sbindir}/fence_watchdog
 
+%doc %{_mandir}/man7/pacemaker-based.*
 %doc %{_mandir}/man7/pacemaker-controld.*
 %doc %{_mandir}/man7/pacemaker-schedulerd.*
 %doc %{_mandir}/man7/pacemaker-fenced.*
@@ -730,6 +731,7 @@ exit 0
 %{ocf_root}/resource.d/pacemaker
 
 %doc %{_mandir}/man7/*pacemaker*
+%exclude %{_mandir}/man7/pacemaker-based.*
 %exclude %{_mandir}/man7/pacemaker-controld.*
 %exclude %{_mandir}/man7/pacemaker-schedulerd.*
 %exclude %{_mandir}/man7/pacemaker-fenced.*
@@ -848,6 +850,10 @@ exit 0
 %license %{nagios_name}-%{nagios_hash}/COPYING
 
 %changelog
+* Tue May 28 2024 Chris Lumens <clumens@redhat.com> - 2.1.8-1
+- Rebase on upstream 2.1.8-rc1 release
+- Related: RHEL-38543
+
 * Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.7-4.2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
 
diff --git a/sources b/sources
index a54e640..8fa07b4 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 SHA512 (nagios-agents-metadata-105ab8a7b2c16b9a29cf1c1596b80136eeef332b.tar.gz) = 11ddeb48a4929e7642b6dfa9c7962aa1d7a1af1c569830f55ed6cd6773abac13377317327bc1db8411c8077884f83f81cc54d746c834b63a99fa6dc219b5caad
-SHA512 (pacemaker-0f7f88312.tar.gz) = 9bea37a11594aa4dc1470d212faff91e577856955278b37ec23c6fcdf5baf7bd8948d304e2fb8dcd9d078a344663ae3656b40ba94feda03aca2ec425b7d0d16b
+SHA512 (pacemaker-39ef08240.tar.gz) = 328c821a42123c7add35022668d01ebe634fbf26c3b854cae43bdbe82e2210d6e33735069fac997c8622c7968166922dc48afe46570bbdc8ed566e2b88be3758