From fafe6adaec662954007b9dbcf234beccc584ba41 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Nov 25 2022 06:09:07 +0000 Subject: import pacemaker-2.1.5-2.el8 --- diff --git a/.gitignore b/.gitignore index db42499..299d5d7 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ SOURCES/nagios-agents-metadata-105ab8a.tar.gz -SOURCES/pacemaker-d3699a6.tar.gz +SOURCES/pacemaker-631339c.tar.gz diff --git a/.pacemaker.metadata b/.pacemaker.metadata index 5aa86bc..3f38deb 100644 --- a/.pacemaker.metadata +++ b/.pacemaker.metadata @@ -1,2 +1,2 @@ ea6c0a27fd0ae8ce02f84a11f08a0d79377041c3 SOURCES/nagios-agents-metadata-105ab8a.tar.gz -ea48024f32e6ceb7295edab66435e463fbf43e3c SOURCES/pacemaker-d3699a6.tar.gz +e709600b1cce349e4ac4fd6a9c2960d6e90d1a49 SOURCES/pacemaker-631339c.tar.gz diff --git a/SPECS/pacemaker.spec b/SPECS/pacemaker.spec index 75a4ef8..5ccf852 100644 --- a/SPECS/pacemaker.spec +++ b/SPECS/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. @@ -117,9 +117,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} @@ -958,6 +963,11 @@ exit 0 %license %{nagios_name}-%{nagios_hash}/COPYING %changelog +* Wed Nov 23 2022 Chris Lumens - 2.1.5-2 +- Rebase on upstream 2.1.5-rc3 release +- Resolves: rhbz1626546 +- Related: rhbz2122352 + * Tue Nov 22 2022 Chris Lumens - 2.1.5-1 - Rebase on upstream 2.1.5-rc2 release - Resolves: rhbz1822125