From 4fe320284e1a2789ef6db9fbf22ed854b573f238 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Nov 19 2020 00:11:42 +0000
Subject: import pcs-0.10.7-2.el8


---

diff --git a/.gitignore b/.gitignore
index ef590b3..41f8cdf 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-cdf5be5820446b5a96918f7e67800fa7e5396be3.tar.gz
+SOURCES/pcs-0b18207c3ba28d10d07ac64fe252ece46e3ef637.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
@@ -21,4 +21,4 @@ SOURCES/ruby2_keywords-0.0.2.gem
 SOURCES/sinatra-2.0.8.1.gem
 SOURCES/thin-1.7.2.gem
 SOURCES/tilt-2.0.10.gem
-SOURCES/tornado-6.0.4.tar.gz
+SOURCES/tornado-6.1.0.tar.gz
diff --git a/.pcs.metadata b/.pcs.metadata
index a4601e2..eebae2d 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
-4424ff6dfb4fd4e21faa78b9b73ae8fd89c1e1fc SOURCES/pcs-cdf5be5820446b5a96918f7e67800fa7e5396be3.tar.gz
+58a0f247d1d04684ba131faefa7b2abac70b280b SOURCES/pcs-0b18207c3ba28d10d07ac64fe252ece46e3ef637.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
@@ -21,4 +21,4 @@ b80bc5ca38a885e747271675ba91dd3d02136bf1 SOURCES/rack-test-1.1.0.gem
 04cca7a5d9d641fe076e4e24dc5b6ff31922f4c3 SOURCES/sinatra-2.0.8.1.gem
 41395e86322ffd31f3a7aef1f697bda3e1e2d6b9 SOURCES/thin-1.7.2.gem
 d265c822a6b228392d899e9eb5114613d65e6967 SOURCES/tilt-2.0.10.gem
-e177f2a092dc5f23b0b3078e40adf52e17a9f8a6 SOURCES/tornado-6.0.4.tar.gz
+c23c617c7a0205e465bebad5b8cdf289ae8402a2 SOURCES/tornado-6.1.0.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 b1849f6..31bf253 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 e95f41320cfbfbf3df3a6c96fe8738c4a1c689f9 Mon Sep 17 00:00:00 2001
+From a8e1397d446c49563180566ec3cdde2f7eb897aa Mon Sep 17 00:00:00 2001
 From: Ivan Devat <idevat@redhat.com>
 Date: Tue, 20 Nov 2018 15:03:56 +0100
 Subject: [PATCH] do not support cluster setup with udp(u) transport
diff --git a/SPECS/pcs.spec b/SPECS/pcs.spec
index 53cb55c..1deafde 100644
--- a/SPECS/pcs.spec
+++ b/SPECS/pcs.spec
@@ -1,6 +1,6 @@
 Name: pcs
 Version: 0.10.7
-Release: 1%{?dist}
+Release: 2%{?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 cdf5be5820446b5a96918f7e67800fa7e5396be3
+%global version_or_commit 0b18207c3ba28d10d07ac64fe252ece46e3ef637
 
 %global pcs_source_name %{name}-%{version_or_commit}
 
@@ -32,7 +32,7 @@ ExclusiveArch: i686 x86_64 s390x ppc64le aarch64
 %global pcs_snmp_pkg_name  pcs-snmp
 
 %global pyagentx_version   0.4.pcs.2
-%global tornado_version    6.0.4
+%global tornado_version    6.1.0
 %global dataclasses_version 0.6
 %global dacite_version  1.5.0
 %global dateutil_version  2.8.1
@@ -128,7 +128,7 @@ Source101: https://github.com/idevat/pcs-web-ui/releases/download/%{ui_modules_v
 Patch101: do-not-support-cluster-setup-with-udp-u-transport.patch
 
 # git for patches
-BuildRequires: git
+BuildRequires: git-core
 #printf from coreutils is used in makefile
 BuildRequires: coreutils
 # python for pcs
@@ -643,6 +643,11 @@ remove_all_tests
 %license pyagentx_LICENSE.txt
 
 %changelog
+* Fri Nov 13 2020 Miroslav Lisik <mlisik@redhat.com> - 0.10.7-2
+- Rebased to latest upstream sources (see CHANGELOG.md)
+- Changed BuildRequires from git to git-core
+- Resolves: rhbz#1869399 rhbz#1885658 rhbz#1896379
+
 * Wed Oct 14 2020 Miroslav Lisik <mlisik@redhat.com> - 0.10.7-1
 - Rebased to latest upstream sources (see CHANGELOG.md)
 - Added python bundled dependency dateutil