rpms/pacemaker
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Rebase on upstream 3.0.0-rc1

Browse Source 
- Bring spec file in line with additional upstream changes.
- Related: RHEL-61383
This commit is contained in:
Chris Lumens 2024-11-18 13:05:25 -05:00
parent 848244ede1
commit e65cedc8be
3 changed files with 30 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
001-feature-set.patch
View File

@ -1,34 +0,0 @@
From adcb9733e8a2cf637b42949d3c62d46e7a8b9dc4 Mon Sep 17 00:00:00 2001
From: Chris Lumens <clumens@redhat.com>
Date: Wed, 16 Oct 2024 15:54:54 -0400
Subject: [PATCH] Build: Bump CRM_FEATURE_SET and version for scratch build.
---
include/crm/crm.h | 2 +-
m4/version.m4 | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/include/crm/crm.h b/include/crm/crm.h
index f9f7d8d..7839ae4 100644
--- a/include/crm/crm.h
+++ b/include/crm/crm.h
@@ -63,7 +63,7 @@ extern "C" {
* >=3.2.0: DC supports PCMK_EXEC_INVALID and PCMK_EXEC_NOT_CONNECTED
* >=3.19.0: DC supports PCMK__CIB_REQUEST_COMMIT_TRANSACT
*/
-# define CRM_FEATURE_SET "3.19.7"
+# define CRM_FEATURE_SET "3.20.0"
/* Pacemaker's CPG protocols use fixed-width binary fields for the sender and
* recipient of a CPG message. This imposes an arbitrary limit on cluster node
diff --git a/m4/version.m4 b/m4/version.m4
index 96277df..0270051 100644
--- a/m4/version.m4
+++ b/m4/version.m4
@@ -1,2 +1,2 @@
-m4_define([VERSION_NUMBER], [2.1.9])
+m4_define([VERSION_NUMBER], [3.0.0])
m4_define([PCMK_URL], [https://ClusterLabs.org/projects/pacemaker/])
--
2.43.0

80
pacemaker.spec
View File

@ -41,15 +41,17 @@
## can be incremented to build packages reliably considered "newer"
## than previously built packages with the same pcmkversion)
%global pcmkversion 3.0.0
%global specversion 1
%global specversion 2
## Upstream commit (full commit ID, abbreviated commit ID, or tag) to build
%global commit 0f6499026605bbc3518fff323b3b9edd2e79ddb3
%global commit 394d77ec985ff289f0661f996a45052b7fbf0f2c
## 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.
%if (0%{?fedora} >= 26) || (0%{?rhel} >= 9)
%if 0%{?fedora} || (0%{?rhel} >= 9)
%global commit_abbrev 9
%else
%global commit_abbrev 7
%endif
@ -99,13 +101,6 @@
## Add option to turn off hardening of libraries and daemon executables
%bcond_without hardening
## Add option to enable (or disable, on RHEL 8) links for legacy daemon names
%if 0%{?rhel} && 0%{?rhel} <= 8
%bcond_without legacy_links
%else
%bcond_with legacy_links
%endif
# Define globals for convenient use later
## Portion of export/dist tarball name after "pacemaker-", and release version
@ -117,16 +112,12 @@
%define pcmk_release %{specversion}
%endif
%if 0%{?fedora} > 20 || 0%{?rhel} > 7
%if 0%{?fedora} || 0%{?rhel}
## Base GnuTLS cipher priorities (presumably only the initial, required keyword)
## overridable with "rpmbuild --define 'pcmk_gnutls_priorities PRIORITY-SPEC'"
%define gnutls_priorities %{?pcmk_gnutls_priorities}%{!?pcmk_gnutls_priorities:@SYSTEM}
%endif
%if 0%{?fedora} > 22 || 0%{?rhel} > 7
%global supports_recommends 1
%endif
## Different distros name certain packages differently
## (note: corosync libraries also differ, but all provide corosync-devel)
%global pkgname_libtool_devel libtool-ltdl-devel
@ -141,16 +132,6 @@
## Distro-specific configuration choices
### Use 2.0-style output when other distro packages don't support current output
%if ( 0%{?fedora} && 0%{?fedora} <=35 ) || ( 0%{?rhel} && 0%{?rhel} <= 8 )
%global compat20 --enable-compat-2.0
%endif
### Default concurrent-fencing to true when distro prefers that
%if 0%{?rhel} >= 7
%global concurrent_fencing --with-concurrent-fencing-default=true
%endif
### Default resource-stickiness to 1 when distro prefers that
%if 0%{?fedora} >= 35 || 0%{?rhel} >= 9
%global resource_stickiness --with-resource-stickiness-default=1
@ -203,8 +184,7 @@
Name: pacemaker
Summary: Scalable High-Availability cluster resource manager
Version: %{pcmkversion}
Release: %{pcmk_release}%{?dist}.1
Release: %{pcmk_release}%{?dist}
License: GPL-2.0-or-later AND LGPL-2.1-or-later
Url: https://www.clusterlabs.org/
@ -219,7 +199,7 @@ Url: https://www.clusterlabs.org/
Source0: https://codeload.github.com/%{github_owner}/%{name}/tar.gz/%{archive_github_url}
Source1: pacemaker.sysusers
# upstream commits
Patch001: 001-feature-set.patch
#Patch001: 001-xxxx.patch
Requires: resource-agents
Requires: %{pkgname_pcmk_libs}%{?_isa} = %{version}-%{release}
@ -265,6 +245,7 @@ BuildRequires: sed
BuildRequires: pkgconfig(glib-2.0) >= 2.42
BuildRequires: pkgconfig(gnutls) >= 3.1.7
BuildRequires: pkgconfig(libxml-2.0) >= 2.9.2
BuildRequires: pkgconfig(systemd)
BuildRequires: libxslt-devel
BuildRequires: pkgconfig(uuid)
BuildRequires: %{pkgname_bzip2_devel}
@ -281,8 +262,6 @@ BuildRequires: %{pkgname_gettext} >= 0.18
BuildRequires: libcmocka-devel >= 1.1.0
BuildRequires: %{python_name}-psutil
BuildRequires: pkgconfig(systemd)
# RH patches are created by git, so we need git to apply them
BuildRequires: git
@ -327,12 +306,10 @@ Available rpmbuild rebuild options:
License: GPL-2.0-or-later AND LGPL-2.1-or-later
Summary: Command line tools for controlling Pacemaker clusters
Requires: %{pkgname_pcmk_libs}%{?_isa} = %{version}-%{release}
%if 0%{?supports_recommends}
Recommends: pcmk-cluster-manager = %{version}-%{release}
# For crm_report
Recommends: tar
Recommends: bzip2
%endif
Requires: perl-TimeDate
Requires: %{pkgname_procps}
Requires: psmisc
@ -397,8 +374,8 @@ Summary: Pacemaker remote executor daemon for non-cluster nodes
Requires: %{pkgname_pcmk_libs}%{?_isa} = %{version}-%{release}
Requires: %{name}-cli = %{version}-%{release}
Requires: resource-agents
# -remote can be fully independent of systemd
%{?systemd_ordering}%{!?systemd_ordering:%{?systemd_requires}}
Requires: %{pkgname_procps}
%{?systemd_requires}
Provides: pcmk-cluster-manager = %{version}-%{release}
Provides: pcmk-cluster-manager%{?_isa} = %{version}-%{release}
@ -445,12 +422,9 @@ Requires: psmisc
Requires: %{python_name}-psutil
BuildArch: noarch
# systemd Python bindings are a separate package in some distros
%if %{defined systemd_requires}
%if 0%{?fedora} > 22 || 0%{?rhel} > 7
%if 0%{?fedora} || 0%{?rhel}
Requires: %{python_name}-systemd
%endif
%endif
%description cts
Test framework for cluster-related technologies like Pacemaker
@ -484,7 +458,7 @@ manager.
%build
export systemdsystemunitdir=%{?_unitdir}%{!?_unitdir:no}
export systemdsystemunitdir=%{_unitdir}
%if %{with hardening}
# prefer distro-provided hardening flags in case they are defined
@ -503,7 +477,6 @@ export LDFLAGS_HARDENED_LIB="%{?_hardening_ldflags}"
%{configure} \
PYTHON=%{python_path} \
%{!?with_hardening: --disable-hardening} \
%{?with_legacy_links: --enable-legacy-links} \
%{?with_profiling: --with-profiling} \
%{?with_cibsecrets: --with-cibsecrets} \
%{?with_nls: --enable-nls} \
@ -511,9 +484,7 @@ export LDFLAGS_HARDENED_LIB="%{?_hardening_ldflags}"
%{?gnutls_priorities: --with-gnutls-priorities="%{gnutls_priorities}"} \
%{?bug_url: --with-bug-url=%{bug_url}} \
%{?ocf_root: --with-ocfdir=%{ocf_root}} \
%{?concurrent_fencing} \
%{?resource_stickiness} \
%{?compat20} \
--disable-static \
--with-initdir=%{_initrddir} \
--with-runstatedir=%{_rundir} \
@ -634,7 +605,6 @@ exit 0
%config(noreplace) %{_sysconfdir}/sysconfig/pacemaker
%config(noreplace) %{_sysconfdir}/logrotate.d/pacemaker
%{_sbindir}/pacemakerd
%{_unitdir}/pacemaker.service
%exclude %{_libexecdir}/pacemaker/cts-support
@ -662,7 +632,7 @@ exit 0
%license licenses/GPLv2
%doc COPYING
%doc ChangeLog
%doc ChangeLog.md
%dir %attr (750, %{uname}, %{gname}) %{_var}/lib/pacemaker/cib
%dir %attr (750, %{uname}, %{gname}) %{_var}/lib/pacemaker/pengine
@ -731,7 +701,7 @@ exit 0
%license licenses/GPLv2
%doc COPYING
%doc ChangeLog
%doc ChangeLog.md
%dir %attr (750, %{uname}, %{gname}) %{_var}/lib/pacemaker
%dir %attr (750, %{uname}, %{gname}) %{_var}/lib/pacemaker/blackbox
@ -751,13 +721,13 @@ exit 0
%{_libdir}/libstonithd.so.*
%license licenses/LGPLv2.1
%doc COPYING
%doc ChangeLog
%doc ChangeLog.md
%files cluster-libs
%{_libdir}/libcrmcluster.so.*
%license licenses/LGPLv2.1
%doc COPYING
%doc ChangeLog
%doc ChangeLog.md
%files -n %{python_name}-%{name}
%{python3_sitelib}/pacemaker/
@ -765,7 +735,7 @@ exit 0
%exclude %{python3_sitelib}/pacemaker/_cts/
%license licenses/LGPLv2.1
%doc COPYING
%doc ChangeLog
%doc ChangeLog.md
%files remote
%config(noreplace) %{_sysconfdir}/sysconfig/pacemaker
@ -779,7 +749,7 @@ exit 0
%{_mandir}/man8/pacemaker-remoted.*
%license licenses/GPLv2
%doc COPYING
%doc ChangeLog
%doc ChangeLog.md
%files doc
%doc %{pcmk_docdir}
@ -793,7 +763,7 @@ exit 0
%license licenses/GPLv2
%doc COPYING
%doc ChangeLog
%doc ChangeLog.md
%files -n %{pkgname_pcmk_libs}-devel
%{_includedir}/pacemaker
@ -809,7 +779,7 @@ exit 0
%{_libdir}/pkgconfig/*pacemaker*.pc
%license licenses/LGPLv2.1
%doc COPYING
%doc ChangeLog
%doc ChangeLog.md
%files schemas
%license licenses/GPLv2
@ -821,6 +791,14 @@ exit 0
%{_datadir}/pkgconfig/pacemaker-schemas.pc
%changelog
* Mon Nov 18 2024 Chris Lumens <clumens@redhat.com> - 3.0.0-2
- Rebase on upstream 3.0.0-rc1
- Default globally-unique to true when clone-node-max > 1
- Fix regression in crm_resource master resource handling
- Related: RHEL-61383
- Resolves: RHEL-56675
- Resolves: RHEL-60534
* Wed Oct 30 2024 Chris Lumens <clumens@redhat.com> - 3.0.0-1
- Rebase on upstream 3.0.0 prerelease
- Related: RHEL-61383

2
sources
View File

@ -1 +1 @@
SHA512 (pacemaker-0f6499026.tar.gz) = df868e8fd23da8e5c7278bcd761d8f57f694f15a6544dc4a2fbcd212ef7f70447587b33f803f46d8c88690953d03e52c2ff45d1bc0c0f519272ec29e2e344c9d
SHA512 (pacemaker-394d77ec9.tar.gz) = 4f227cee13046d5eca708008efe86ed745614f9e0e958412094d519e4fc09e5ca2c1d130fd3c055b9ed37c1b6469979fca3c5358f5a839fecccd9ef032f73b08