From 33f9f9581f3e4114f05dabea57e58e0a4f5cec2a Mon Sep 17 00:00:00 2001
From: Chris Lumens <clumens@redhat.com>
Date: Wed, 23 Nov 2022 13:27:20 -0500
Subject: [PATCH] Rebase on upstream 2.1.5-rc3 release

- Related: rhbz2122353
---
 pacemaker.spec | 13 +++++++++++--
 sources        |  2 +-
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/pacemaker.spec b/pacemaker.spec
index 942d6b9..e73b992 100644
--- a/pacemaker.spec
+++ b/pacemaker.spec
@@ -36,10 +36,10 @@
 ## can be incremented to build packages reliably considered "newer"
 ## than previously built packages with the same pcmkversion)
 %global pcmkversion 2.1.5
-%global specversion 1
+%global specversion 2
 
 ## Upstream commit (full commit ID, abbreviated commit ID, or tag) to build
-%global commit d3699a6216bdf59de6f416ed73bc1bc9ca727dc2
+%global commit 631339ca5aa334d69906a932abb2b6886ede7cd0
 
 ## 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.
@@ -121,9 +121,14 @@
 %define archive_version %(c=%{commit}; echo ${c:10})
 %define archive_github_url %{commit}#/%{name}-%{archive_version}.tar.gz
 %else
+%if "%{commit}" == "DIST"
+%define archive_version %{pcmkversion}
+%define archive_github_url %{archive_version}#/%{name}-%{pcmkversion}.tar.gz
+%else
 %define archive_version %(c=%{commit}; echo ${c:0:%{commit_abbrev}})
 %define archive_github_url %{archive_version}#/%{name}-%{archive_version}.tar.gz
 %endif
+%endif
 ### Always use a simple release number
 %define pcmk_release %{specversion}
 
@@ -846,6 +851,10 @@ exit 0
 %license %{nagios_name}-%{nagios_hash}/COPYING
 
 %changelog
+* Wed Nov 23 2022 Chris Lumens <clumens@redhat.com> - 2.1.5-2
+- Rebase on upstream 2.1.5-rc3 release
+- Related: rhbz2122353
+
 * Tue Nov 15 2022 Chris Lumens <clumens@redhat.com> - 2.1.5-1
 - Rebase on upstream 2.1.5-rc2 release
 - Resolves: rhbz2123727
diff --git a/sources b/sources
index a5340d1..3675ffc 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 SHA512 (nagios-agents-metadata-105ab8a7b2c16b9a29cf1c1596b80136eeef332b.tar.gz) = 11ddeb48a4929e7642b6dfa9c7962aa1d7a1af1c569830f55ed6cd6773abac13377317327bc1db8411c8077884f83f81cc54d746c834b63a99fa6dc219b5caad
-SHA512 (pacemaker-d3699a621.tar.gz) = 8f5790ed9a5d6a8500ae2adf10b4441f98b3aad0e98360df5eaa485c696636c70d9848fb9067f62651db213be7ab8655603437be95c4833258ad5b8c3e67a2fa
+SHA512 (pacemaker-631339ca5.tar.gz) = 19994c3a6b232f1439efad966efe2885f548311437dc59de544bfc6519876b32bb31838a00e1a11c842eb9098784058d4bc2b298ba7a1a5b0e3270098a28853b