* Wed May 3 2023 Klaus Wenninger <kwenning@redhat.com> - 2.1.6-0.2.rc2
- Update for new upstream tarball for release candidate: Pacemaker-2.1.6-rc2, for full details, see included ChangeLog file or https://github.com/ClusterLabs/pacemaker/releases/tag/Pacemaker-2.1.6-rc2
This commit is contained in:
Klaus Wenninger
parent
2c503197d9
commit
5370d05849
@ -1,105 +0,0 @@
|
||||
From f7d335922cd4abe847784d9e1825b1d1b8adc2d6 Mon Sep 17 00:00:00 2001
|
||||
From: Klaus Wenninger <klaus.wenninger@aon.at>
|
||||
Date: Fri, 17 Mar 2023 16:41:35 +0100
|
||||
Subject: [PATCH] Build: rpm: convert licenses to SPDX
|
||||
|
||||
---
|
||||
rpm/pacemaker.spec.in | 22 +++++++++++-----------
|
||||
1 file changed, 11 insertions(+), 11 deletions(-)
|
||||
|
||||
diff --git a/rpm/pacemaker.spec.in b/rpm/pacemaker.spec.in
|
||||
index ff3bd0871..8741b1bb1 100644
|
||||
--- a/rpm/pacemaker.spec.in
|
||||
+++ b/rpm/pacemaker.spec.in
|
||||
@@ -267,10 +267,10 @@ Summary: Scalable High-Availability cluster resource manager
|
||||
Version: %{pcmkversion}
|
||||
Release: %{pcmk_release}%{?dist}
|
||||
%if %{defined _unitdir}
|
||||
-License: GPLv2+ and LGPLv2+
|
||||
+License: GPL-2.0-or-later AND LGPL-2.1-or-later
|
||||
%else
|
||||
# initscript is Revised BSD
|
||||
-License: GPLv2+ and LGPLv2+ and BSD
|
||||
+License: GPL-2.0-or-later AND LGPL-2.1-or-later AND BSD-3-Clause
|
||||
%endif
|
||||
Url: https://www.clusterlabs.org/
|
||||
|
||||
@@ -383,7 +383,7 @@ Available rpmbuild rebuild options:
|
||||
stonithd upstart_job
|
||||
|
||||
%package cli
|
||||
-License: GPLv2+ and LGPLv2+
|
||||
+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}
|
||||
@@ -406,7 +406,7 @@ to query and control the cluster from machines that may, or may not,
|
||||
be part of the cluster.
|
||||
|
||||
%package -n %{pkgname_pcmk_libs}
|
||||
-License: GPLv2+ and LGPLv2+
|
||||
+License: GPL-2.0-or-later AND LGPL-2.1-or-later
|
||||
Summary: Core Pacemaker libraries
|
||||
Requires(pre): %{pkgname_shadow_utils}
|
||||
Requires: %{name}-schemas = %{version}-%{release}
|
||||
@@ -421,7 +421,7 @@ The %{pkgname_pcmk_libs} package contains shared libraries needed for cluster
|
||||
nodes and those just running the CLI tools.
|
||||
|
||||
%package cluster-libs
|
||||
-License: GPLv2+ and LGPLv2+
|
||||
+License: GPL-2.0-or-later AND LGPL-2.1-or-later
|
||||
Summary: Cluster Libraries used by Pacemaker
|
||||
Requires: %{pkgname_pcmk_libs}%{?_isa} = %{version}-%{release}
|
||||
|
||||
@@ -433,7 +433,7 @@ The %{name}-cluster-libs package contains cluster-aware shared
|
||||
libraries needed for nodes that will form part of the cluster nodes.
|
||||
|
||||
%package -n %{python_name}-%{name}
|
||||
-License: LGPLv2+
|
||||
+License: LGPL-2.1-or-later
|
||||
Summary: Python libraries for Pacemaker
|
||||
Requires: %{python_path}
|
||||
Requires: %{pkgname_pcmk_libs} = %{version}-%{release}
|
||||
@@ -448,10 +448,10 @@ to interface with Pacemaker.
|
||||
|
||||
%package remote
|
||||
%if %{defined _unitdir}
|
||||
-License: GPLv2+ and LGPLv2+
|
||||
+License: GPL-2.0-or-later AND LGPL-2.1-or-later
|
||||
%else
|
||||
# initscript is Revised BSD
|
||||
-License: GPLv2+ and LGPLv2+ and BSD
|
||||
+License: GPL-2.0-or-later AND LGPL-2.1-or-later AND BSD-3-Clause
|
||||
%endif
|
||||
Summary: Pacemaker remote executor daemon for non-cluster nodes
|
||||
Requires: %{pkgname_pcmk_libs}%{?_isa} = %{version}-%{release}
|
||||
@@ -474,7 +474,7 @@ which is capable of extending pacemaker functionality to remote
|
||||
nodes not running the full corosync/cluster stack.
|
||||
|
||||
%package -n %{pkgname_pcmk_libs}-devel
|
||||
-License: GPLv2+ and LGPLv2+
|
||||
+License: GPL-2.0-or-later AND LGPL-2.1-or-later
|
||||
Summary: Pacemaker development package
|
||||
Requires: %{pkgname_pcmk_libs}%{?_isa} = %{version}-%{release}
|
||||
Requires: %{name}-cluster-libs%{?_isa} = %{version}-%{release}
|
||||
@@ -497,7 +497,7 @@ The %{pkgname_pcmk_libs}-devel package contains headers and shared libraries
|
||||
for developing tools for Pacemaker.
|
||||
|
||||
%package cts
|
||||
-License: GPLv2+ and LGPLv2+
|
||||
+License: GPL-2.0-or-later AND LGPL-2.1-or-later
|
||||
Summary: Test framework for cluster-related technologies like Pacemaker
|
||||
Requires: %{python_path}
|
||||
Requires: %{pkgname_pcmk_libs} = %{version}-%{release}
|
||||
@@ -530,7 +530,7 @@ Pacemaker is an advanced, scalable High-Availability cluster resource
|
||||
manager.
|
||||
|
||||
%package schemas
|
||||
-License: GPLv2+
|
||||
+License: GPL-2.0-or-later
|
||||
Summary: Schemas and upgrade stylesheets for Pacemaker
|
||||
BuildArch: noarch
|
||||
|
||||
--
|
||||
2.39.0
|
||||
|
||||
@ -1,66 +0,0 @@
|
||||
From 9deb711c572ee2443e061f45da3780b6296d4f3d Mon Sep 17 00:00:00 2001
|
||||
From: Klaus Wenninger <klaus.wenninger@aon.at>
|
||||
Date: Mon, 20 Mar 2023 17:55:14 +0100
|
||||
Subject: [PATCH] Build: rpm: avoid bare wildcards under shared directories in
|
||||
spec
|
||||
|
||||
---
|
||||
rpm/pacemaker.spec.in | 27 ++++++++++++++++++---------
|
||||
1 file changed, 18 insertions(+), 9 deletions(-)
|
||||
|
||||
diff --git a/rpm/pacemaker.spec.in b/rpm/pacemaker.spec.in
|
||||
index 8741b1bb1..7fb27e490 100644
|
||||
--- a/rpm/pacemaker.spec.in
|
||||
+++ b/rpm/pacemaker.spec.in
|
||||
@@ -857,21 +857,22 @@ exit 0
|
||||
%dir %{ocf_root}/resource.d
|
||||
%{ocf_root}/resource.d/pacemaker
|
||||
|
||||
-%doc %{_mandir}/man7/*
|
||||
+%doc %{_mandir}/man7/*pacemaker*
|
||||
%exclude %{_mandir}/man7/pacemaker-controld.*
|
||||
%exclude %{_mandir}/man7/pacemaker-schedulerd.*
|
||||
%exclude %{_mandir}/man7/pacemaker-fenced.*
|
||||
%exclude %{_mandir}/man7/ocf_pacemaker_controld.*
|
||||
%exclude %{_mandir}/man7/ocf_pacemaker_o2cb.*
|
||||
%exclude %{_mandir}/man7/ocf_pacemaker_remote.*
|
||||
-%doc %{_mandir}/man8/*
|
||||
+%doc %{_mandir}/man8/crm*.8.gz
|
||||
%exclude %{_mandir}/man8/crm_master.*
|
||||
-%if %{with stonithd}
|
||||
-%exclude %{_mandir}/man8/fence_legacy.*
|
||||
+%doc %{_mandir}/man8/attrd_updater.*
|
||||
+%doc %{_mandir}/man8/cibadmin.*
|
||||
+%if %{with cibsecrets}
|
||||
+ %doc %{_mandir}/man8/cibsecret.*
|
||||
%endif
|
||||
-%exclude %{_mandir}/man8/fence_watchdog.*
|
||||
-%exclude %{_mandir}/man8/pacemakerd.*
|
||||
-%exclude %{_mandir}/man8/pacemaker-remoted.*
|
||||
+%doc %{_mandir}/man8/iso8601.*
|
||||
+%doc %{_mandir}/man8/stonith_admin.*
|
||||
|
||||
%license licenses/GPLv2
|
||||
%doc COPYING
|
||||
@@ -947,8 +948,16 @@ exit 0
|
||||
|
||||
%files -n %{pkgname_pcmk_libs}-devel
|
||||
%{_includedir}/pacemaker
|
||||
-%{_libdir}/*.so
|
||||
-%{_libdir}/pkgconfig/*.pc
|
||||
+%{_libdir}/libcib.so
|
||||
+%{_libdir}/liblrmd.so
|
||||
+%{_libdir}/libcrmservice.so
|
||||
+%{_libdir}/libcrmcommon.so
|
||||
+%{_libdir}/libpe_status.so
|
||||
+%{_libdir}/libpe_rules.so
|
||||
+%{_libdir}/libpacemaker.so
|
||||
+%{_libdir}/libstonithd.so
|
||||
+%{_libdir}/libcrmcluster.so
|
||||
+%{_libdir}/pkgconfig/*pacemaker*.pc
|
||||
%license licenses/LGPLv2.1
|
||||
%doc COPYING
|
||||
%doc ChangeLog
|
||||
--
|
||||
2.39.0
|
||||
|
||||
@ -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.6
|
||||
%global specversion 1.rc1
|
||||
%global specversion 2.rc2
|
||||
|
||||
## Upstream commit (full commit ID, abbreviated commit ID, or tag) to build
|
||||
%global commit 095c09eee68f65ae3a3e0348fe868da43f47bab2
|
||||
%global commit 802a72226be8f90747e9c897c626b060512d6fe6
|
||||
|
||||
## 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.
|
||||
@ -216,8 +216,6 @@ Source0: https://codeload.github.com/%{github_owner}/%{name}/tar.gz/%{arch
|
||||
Source1: https://codeload.github.com/%{github_owner}/%{nagios_name}/tar.gz/%{nagios_archive_github_url}
|
||||
|
||||
# upstream commits
|
||||
Patch0: 0001-Build-rpm-convert-licenses-to-SPDX.patch
|
||||
Patch1: 0002-Build-rpm-avoid-bare-wildcards-under-shared-director.patch
|
||||
|
||||
Requires: resource-agents
|
||||
Requires: %{pkgname_pcmk_libs}%{?_isa} = %{version}-%{release}
|
||||
@ -857,6 +855,11 @@ exit 0
|
||||
%license %{nagios_name}-%{nagios_hash}/COPYING
|
||||
|
||||
%changelog
|
||||
* Wed May 3 2023 Klaus Wenninger <kwenning@redhat.com> - 2.1.6-0.2.rc2
|
||||
- Update for new upstream tarball for release candidate: Pacemaker-2.1.6-rc2,
|
||||
for full details, see included ChangeLog file or
|
||||
https://github.com/ClusterLabs/pacemaker/releases/tag/Pacemaker-2.1.6-rc2
|
||||
|
||||
* Wed Apr 19 2023 Klaus Wenninger <kwenning@redhat.com> - 2.1.6-0.1.rc1
|
||||
- Update for new upstream tarball for release candidate: Pacemaker-2.1.6-rc1,
|
||||
for full details, see included ChangeLog file or
|
||||
|
||||
2
sources
2
sources
@ -1,2 +1,2 @@
|
||||
SHA512 (nagios-agents-metadata-105ab8a7b2c16b9a29cf1c1596b80136eeef332b.tar.gz) = 11ddeb48a4929e7642b6dfa9c7962aa1d7a1af1c569830f55ed6cd6773abac13377317327bc1db8411c8077884f83f81cc54d746c834b63a99fa6dc219b5caad
|
||||
SHA512 (pacemaker-095c09eee.tar.gz) = 177aba975d7424a187fc7cdc2ad9ad83e5c4c2a75775fc2f419f66ed2cad0f27fa8056c3a401f640cdb6dd53a1fcc2a0380ffa104dc8033ad42155b1c8544f93
|
||||
SHA512 (pacemaker-802a72226.tar.gz) = fa4259c1f44de38ced1488fa827441ad101f4760e7cb1962c94610a9a3ed5a5a8227cd307636525a14396311ce3c5ae13919a8111f734a1a59905f99f79081e4
|
||||
|
||||
Loading…
Reference in New Issue
Block a user