From ac2ae09e9b8614a424ebebd9f5177d81fd42cb73 Mon Sep 17 00:00:00 2001 From: Klaus Wenninger Date: Nov 24 2022 21:34:20 +0000 Subject: * Thu Nov 24 2022 Klaus Wenninger - 2.1.5-0.3.rc3 - Update for new upstream tarball for release candidate: Pacemaker-2.1.5-rc3, for full details, see included ChangeLog file or https://github.com/ClusterLabs/pacemaker/releases/tag/Pacemaker-2.1.5-rc3 - remove unused parts of upstream release-magic --- diff --git a/pacemaker.spec b/pacemaker.spec index c8bffe8..be8d38e 100644 --- a/pacemaker.spec +++ b/pacemaker.spec @@ -32,10 +32,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 0.2.rc2 +%global specversion 3.rc3 ## 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. @@ -100,24 +100,14 @@ # Define globals for convenient use later -## Workaround to use parentheses in other globals -%global lparen ( -%global rparen ) - -## Whether this is a tagged release (final or release candidate) -%define tag_release %(c=%{commit}; case ${c} in Pacemaker-*%{rparen} echo 1 ;; - *%{rparen} echo 0 ;; esac) - ## Portion of export/dist tarball name after "pacemaker-", and release version -%if 0%{tag_release} -%define archive_version %(c=%{commit}; echo ${c:10}) -%define archive_github_url %{commit}#/%{name}-%{archive_version}.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 -### Always use a simple release number +%if %{with pre_release} +%define pcmk_release 0.%{specversion} +%else %define pcmk_release %{specversion} +%endif ## Base GnuTLS cipher priorities (presumably only the initial, required keyword) ## overridable with "rpmbuild --define 'pcmk_gnutls_priorities PRIORITY-SPEC'" @@ -808,6 +798,12 @@ exit 0 %license %{nagios_name}-%{nagios_hash}/COPYING %changelog +* Thu Nov 24 2022 Klaus Wenninger - 2.1.5-0.3.rc3 +- Update for new upstream tarball for release candidate: Pacemaker-2.1.5-rc3, + for full details, see included ChangeLog file or + https://github.com/ClusterLabs/pacemaker/releases/tag/Pacemaker-2.1.5-rc3 +- remove unused parts of upstream release-magic + * Wed Nov 16 2022 Klaus Wenninger - 2.1.5-0.2.rc2 - Update for new upstream tarball for release candidate: Pacemaker-2.1.5-rc2, for full details, see included ChangeLog file or 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