From c8cc15254d66b4d69d4d3eb547808fcfd172662a Mon Sep 17 00:00:00 2001 From: Klaus Wenninger Date: Tue, 4 May 2021 22:24:44 +0200 Subject: [PATCH] * Tue May 4 2021 Klaus Wenninger - 2.1.0-0.1.rc1 - Update for new upstream tarball for release candidate: Pacemaker-2.1.0-rc1, for full details, see included ChangeLog file or https://github.com/ClusterLabs/pacemaker/releases/tag/Pacemaker-2.1.0-rc1 - merge changes in upstream spec-file since Pacemaker-2.0.5 - disable legacy-links --- pacemaker.spec | 70 +++++++++++++++++++++++++++----------------------- sources | 2 +- 2 files changed, 39 insertions(+), 33 deletions(-) diff --git a/pacemaker.spec b/pacemaker.spec index b786f9c..676075c 100644 --- a/pacemaker.spec +++ b/pacemaker.spec @@ -18,12 +18,12 @@ ## Upstream pacemaker version, and its package version (specversion ## can be incremented to build packages reliably considered "newer" ## than previously built packages with the same pcmkversion) -%global pcmkversion 2.0.5 -%global specversion 10 +%global pcmkversion 2.1.0 +%global specversion 1 ## Upstream commit (or git tag, such as "Pacemaker-" plus the ## {pcmkversion} macro for an official release) to use for this package -%global commit Pacemaker-2.0.5 +%global commit Pacemaker-2.1.0-rc1 ## 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. %global commit_abbrev 9 @@ -43,24 +43,19 @@ %bcond_with coverage ## Add option to skip/enable generating documentation -## (the build tools aren't available everywhere) -%if 0%{?rhel} - %bcond_with doc -%else - %bcond_without doc -%endif +%bcond_without doc ## Add option to prefix package version with "0." ## (so later "official" packages will be considered updates) -%bcond_with pre_release +%bcond_without pre_release ## NOTE: skip --with upstart_job ## Add option to turn off hardening of libraries and daemon executables %bcond_without hardening -## Add option to disable links for legacy daemon names -%bcond_without legacy_links +## Add option to enable links for legacy daemon names +%bcond_with legacy_links ## Nagios source control identifiers @@ -95,14 +90,27 @@ %endif %endif -## Heuristic used to infer bleeding-edge deployments that are -## less likely to have working versions of the documentation tools -%define bleeding %(test ! -e /etc/yum.repos.d/fedora-rawhide.repo; echo $?) - ## 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} +## Distro-specific configuration choices + +### Use 2.0-style output when other distro packages don't support current output +%if 0%{?fedora} && 0%{?fedora} <= 34 +%global compat20 --enable-compat-2.0 +%endif + +### Default concurrent-fencing to true when distro prefers that +%if 0%{?rhel} +%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 +%endif + # Python-related definitions ## Turn off auto-compilation of Python files outside Python specific paths, @@ -138,7 +146,7 @@ Name: pacemaker Summary: Scalable High-Availability cluster resource manager Version: %{pcmkversion} -Release: %{pcmk_release}%{?dist}.2 +Release: %{pcmk_release}%{?dist} License: GPLv2+ and LGPLv2+ Url: https://www.clusterlabs.org @@ -167,7 +175,7 @@ BuildRequires: coreutils findutils grep sed # Required for core functionality BuildRequires: automake autoconf gcc libtool pkgconfig libtool-ltdl-devel -BuildRequires: pkgconfig(glib-2.0) >= 2.16 +BuildRequires: pkgconfig(glib-2.0) >= 2.42 BuildRequires: libxml2-devel libxslt-devel libuuid-devel BuildRequires: bzip2-devel @@ -183,11 +191,8 @@ BuildRequires: corosync-devel >= 2.0.0 #BuildRequires: pkgconfig(libcpg) #BuildRequires: pkgconfig(libcfg) -## (note no avoiding effect when building through non-customized mock) -%if !%{bleeding} %if %{with doc} -BuildRequires: asciidoc inkscape publican -%endif +BuildRequires: asciidoc inkscape %{python_name}-sphinx %endif # git-style patch application @@ -380,12 +385,14 @@ export CPPFLAGS="-UPCMK_TIME_EMERGENCY_CGT $CPPFLAGS" %{configure} \ PYTHON=%{python_path} \ %{!?with_hardening: --disable-hardening} \ - %{!?with_legacy_links: --disable-legacy-links} \ + %{?with_legacy_links: --enable-legacy-links} \ %{?with_profiling: --with-profiling} \ %{?with_coverage: --with-coverage} \ %{?with_cibsecrets: --with-cibsecrets} \ - %{!?with_doc: --with-brand=} \ %{?gnutls_priorities: --with-gnutls-priorities="%{gnutls_priorities}"} \ + %{?concurrent_fencing} \ + %{?resource_stickiness} \ + %{?compat20} \ --disable-static \ --with-initdir=%{_initrddir} \ --with-runstatedir=%{_rundir} \ @@ -415,10 +422,6 @@ make install \ DESTDIR=%{buildroot} V=1 docdir=%{pcmk_docdir} \ %{?_python_bytecompile_extra:%{?py_byte_compile:am__py_compile=true}} -mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig -install -m 644 daemons/pacemakerd/pacemaker.sysconfig ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig/pacemaker -install -m 644 tools/crm_mon.sysconfig ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig/crm_mon - mkdir -p %{buildroot}%{_datadir}/pacemaker/nagios/plugins-metadata for file in $(find %{nagios_name}-%{nagios_hash}/metadata -type f); do install -m 644 $file %{buildroot}%{_datadir}/pacemaker/nagios/plugins-metadata @@ -549,9 +552,7 @@ exit 0 %exclude %{_libexecdir}/pacemaker/cts-log-watcher %exclude %{_libexecdir}/pacemaker/cts-support %exclude %{_sbindir}/pacemaker-remoted -%if %{with legacy_links} %exclude %{_sbindir}/pacemaker_remoted -%endif %{_libexecdir}/pacemaker/* %{_sbindir}/crm_attribute @@ -671,9 +672,7 @@ exit 0 %{_unitdir}/pacemaker_remote.service %{_sbindir}/pacemaker-remoted -%if %{with legacy_links} %{_sbindir}/pacemaker_remoted -%endif %{_mandir}/man8/pacemaker-remoted.* %license licenses/GPLv2 %doc COPYING @@ -720,6 +719,13 @@ exit 0 %license %{nagios_name}-%{nagios_hash}/COPYING %changelog +* Tue May 4 2021 Klaus Wenninger - 2.1.0-0.1.rc1 +- Update for new upstream tarball for release candidate: Pacemaker-2.1.0-rc1, + for full details, see included ChangeLog file or + https://github.com/ClusterLabs/pacemaker/releases/tag/Pacemaker-2.1.0-rc1 +- merge changes in upstream spec-file since Pacemaker-2.0.5 +- disable legacy-links + * Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek - 2.0.5-10.2 - Rebuilt for updated systemd-rpm-macros See https://pagure.io/fesco/issue/2583. diff --git a/sources b/sources index b19a593..a976443 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (nagios-agents-metadata-105ab8a7b2c16b9a29cf1c1596b80136eeef332b.tar.gz) = 11ddeb48a4929e7642b6dfa9c7962aa1d7a1af1c569830f55ed6cd6773abac13377317327bc1db8411c8077884f83f81cc54d746c834b63a99fa6dc219b5caad -SHA512 (pacemaker-Pacemaker-2.0.5.tar.gz) = 5fd3614f0284297babb66ea2dc567583315052fcf77f49107c52161e8e8c164ae3169d98528fdc1316d8eabaacc98ed24e9c6e6c90b3286f2f012a4ee874bbba +SHA512 (pacemaker-Pacemaker-2.1.0-rc1.tar.gz) = 64fef270ac0f0df63a2ac974c4467dfb6a646cbe2089c6b523f14311bf236653caa75cd9e2851af7882057d63651ecd3c9d40647349a76619c4522c938063acf