From d3f7758798bf4d7fd509305bb32af21dfa5dfc11 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Jan 06 2021 20:12:03 +0000 Subject: import pcs-0.10.7-3.el8 --- diff --git a/.gitignore b/.gitignore index 41f8cdf..e25b1f3 100644 --- a/.gitignore +++ b/.gitignore @@ -9,7 +9,7 @@ SOURCES/ffi-1.13.1.gem SOURCES/json-2.3.0.gem SOURCES/mustermann-1.1.1.gem SOURCES/open4-1.3.4-1.gem -SOURCES/pcs-0b18207c3ba28d10d07ac64fe252ece46e3ef637.tar.gz +SOURCES/pcs-244ef24984089bed0406b1d69e48298183092402.tar.gz SOURCES/pcs-web-ui-0.1.4.tar.gz SOURCES/pcs-web-ui-node-modules-0.1.3.tar.xz SOURCES/pyagentx-0.4.pcs.2.tar.gz diff --git a/.pcs.metadata b/.pcs.metadata index eebae2d..6854681 100644 --- a/.pcs.metadata +++ b/.pcs.metadata @@ -9,7 +9,7 @@ cfa25e7a3760c3ec16723cb8263d9b7a52d0eadf SOURCES/ffi-1.13.1.gem 0230e8c5a37f1543982e5b04be503dd5f9004b47 SOURCES/json-2.3.0.gem 50a4e37904485810cb05e27d75c9783e5a8f3402 SOURCES/mustermann-1.1.1.gem 41a7fe9f8e3e02da5ae76c821b89c5b376a97746 SOURCES/open4-1.3.4-1.gem -58a0f247d1d04684ba131faefa7b2abac70b280b SOURCES/pcs-0b18207c3ba28d10d07ac64fe252ece46e3ef637.tar.gz +927c1c300e155f514b1da9c878a69764287ac9ef SOURCES/pcs-244ef24984089bed0406b1d69e48298183092402.tar.gz d67de4d5cefd9ba3cde45c7ec4a5d1e9b1e6032a SOURCES/pcs-web-ui-0.1.4.tar.gz 3e09042e3dc32c992451ba4c0454f2879f0d3f40 SOURCES/pcs-web-ui-node-modules-0.1.3.tar.xz 3176b2f2b332c2b6bf79fe882e83feecf3d3f011 SOURCES/pyagentx-0.4.pcs.2.tar.gz diff --git a/SOURCES/do-not-support-cluster-setup-with-udp-u-transport.patch b/SOURCES/do-not-support-cluster-setup-with-udp-u-transport.patch index 31bf253..7b3e856 100644 --- a/SOURCES/do-not-support-cluster-setup-with-udp-u-transport.patch +++ b/SOURCES/do-not-support-cluster-setup-with-udp-u-transport.patch @@ -1,4 +1,4 @@ -From a8e1397d446c49563180566ec3cdde2f7eb897aa Mon Sep 17 00:00:00 2001 +From 478ddfd37c04f7d77b6116998e469c7c2610058f Mon Sep 17 00:00:00 2001 From: Ivan Devat Date: Tue, 20 Nov 2018 15:03:56 +0100 Subject: [PATCH] do not support cluster setup with udp(u) transport @@ -10,7 +10,7 @@ Subject: [PATCH] do not support cluster setup with udp(u) transport 3 files changed, 6 insertions(+) diff --git a/pcs/pcs.8 b/pcs/pcs.8 -index a00d14c9..e46b51c8 100644 +index e8055eb8..7a6c1a04 100644 --- a/pcs/pcs.8 +++ b/pcs/pcs.8 @@ -424,6 +424,8 @@ By default, encryption is enabled with cipher=aes256 and hash=sha256. To disable @@ -23,7 +23,7 @@ index a00d14c9..e46b51c8 100644 .br Transport options are: ip_version, netmtu diff --git a/pcs/usage.py b/pcs/usage.py -index e43c0f04..d5dff788 100644 +index 7b63e4b6..0819136c 100644 --- a/pcs/usage.py +++ b/pcs/usage.py @@ -852,6 +852,7 @@ Commands: @@ -49,5 +49,5 @@ index b857cbae..b8d48d92 100644 #csetup-transport-options.knet .without-knet { -- -2.25.4 +2.26.2 diff --git a/SPECS/pcs.spec b/SPECS/pcs.spec index 1deafde..24352c8 100644 --- a/SPECS/pcs.spec +++ b/SPECS/pcs.spec @@ -1,6 +1,6 @@ Name: pcs Version: 0.10.7 -Release: 2%{?dist} +Release: 3%{?dist} # https://docs.fedoraproject.org/en-US/packaging-guidelines/LicensingGuidelines/ # https://fedoraproject.org/wiki/Licensing:Main?rd=Licensing#Good_Licenses # GPLv2: pcs @@ -20,7 +20,7 @@ Summary: Pacemaker Configuration System ExclusiveArch: i686 x86_64 s390x ppc64le aarch64 # %%global version_or_commit %%{version} -%global version_or_commit 0b18207c3ba28d10d07ac64fe252ece46e3ef637 +%global version_or_commit 244ef24984089bed0406b1d69e48298183092402 %global pcs_source_name %{name}-%{version_or_commit} @@ -158,6 +158,7 @@ BuildRequires: python3-pyOpenSSL # pcsd fonts and font management tools for creating symlinks to fonts BuildRequires: fontconfig BuildRequires: liberation-sans-fonts +BuildRequires: make BuildRequires: overpass-fonts # Red Hat logo for creating symlink of favicon BuildRequires: redhat-logos @@ -643,6 +644,11 @@ remove_all_tests %license pyagentx_LICENSE.txt %changelog +* Thu Dec 17 2020 Miroslav Lisik - 0.10.7-3 +- Rebased to latest upstream sources (see CHANGELOG.md) +- Add BuildRequires: make +- Resolves: rhbz#1667061 rhbz#1667066 rhbz#1774143 rhbz#1885658 + * Fri Nov 13 2020 Miroslav Lisik - 0.10.7-2 - Rebased to latest upstream sources (see CHANGELOG.md) - Changed BuildRequires from git to git-core