From 65f555c781d721c554b4f08b2d0a4e5b79c032c0 Mon Sep 17 00:00:00 2001 From: Chris Lumens Date: Mon, 12 Aug 2024 10:33:50 -0400 Subject: [PATCH] Rebase on upstream 2.1.8 final release - Resolves: RHEL-38543 --- pacemaker.spec | 10 +++++++--- sources | 2 +- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/pacemaker.spec b/pacemaker.spec index 110f61c..be9e41e 100644 --- a/pacemaker.spec +++ b/pacemaker.spec @@ -27,7 +27,7 @@ ## Where bug reports should be submitted ## Leave bug_url undefined to use ClusterLabs default, others define it here %if 0%{?rhel} -%global bug_url https://bugzilla.redhat.com/ +%global bug_url https://issues.redhat.com/ %else %if 0%{?fedora} %global bug_url https://bugz.fedoraproject.org/%{name} @@ -41,10 +41,10 @@ ## can be incremented to build packages reliably considered "newer" ## than previously built packages with the same pcmkversion) %global pcmkversion 2.1.8 -%global specversion 2 +%global specversion 3 ## Upstream commit (full commit ID, abbreviated commit ID, or tag) to build -%global commit bf1a172d5f199332c461ac14a9c9ca518689c995 +%global commit 3980678f0372f2c7c294c01f61d63f0b2cafaad1 ## 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. @@ -850,6 +850,10 @@ exit 0 %license %{nagios_name}-%{nagios_hash}/COPYING %changelog +* Mon Aug 12 2024 Chris Lumens - 2.1.8-3 +- Rebase on upstream 2.1.8 final release +- Resolves: RHEL-38543 + * Thu Jul 18 2024 Chris Lumens - 2.1.8-2 - Rebase on upstream 2.1.8-rc4 release - Related: RHEL-38543 diff --git a/sources b/sources index 9868f00..631b09b 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (nagios-agents-metadata-105ab8a7b2c16b9a29cf1c1596b80136eeef332b.tar.gz) = 11ddeb48a4929e7642b6dfa9c7962aa1d7a1af1c569830f55ed6cd6773abac13377317327bc1db8411c8077884f83f81cc54d746c834b63a99fa6dc219b5caad -SHA512 (pacemaker-bf1a172d5.tar.gz) = 07bb331e0b8ee03411e4c19e4fa06d3daed198a9d7a14f4476c1d73787b8717149f97d872c1289194d57226b53b6ab2864a7e3fd183c551076022057b09efc2f +SHA512 (pacemaker-3980678f0.tar.gz) = 0b96de3f2e67383c280dd1ba69cec8882982ef65c5eac7ab7f8d11a59b831aac22165f1f13b8ad94fe4d57a4636704892d0f0ee50cc1cc6ee00f0297149b654b