import pcs-0.10.10-2.el8

SOURCES/bz1998454-01-fix-creating-resources-with-depth-operation-attribut.patch

@@ -0,0 +1,45 @@
+From 189c73e31f5033413fc4483e40d0bfc78d77f962 Mon Sep 17 00:00:00 2001
+From: Tomas Jelinek <tojeline@redhat.com>
+Date: Fri, 27 Aug 2021 12:05:18 +0200
+Subject: [PATCH 1/2] fix creating resources with depth operation attribute
+
+---
+ CHANGELOG.md                       | 9 +++++++++
+ pcs/lib/cib/resource/operations.py | 2 +-
+ 2 files changed, 10 insertions(+), 1 deletion(-)
+
+diff --git a/CHANGELOG.md b/CHANGELOG.md
+index f768cc36..c15546ba 100644
+--- a/CHANGELOG.md
++++ b/CHANGELOG.md
+@@ -1,5 +1,14 @@
+ # Change Log
+ 
++## [Unreleased]
++
++### Fixed
++- Fixed an error when creating a resource which defines 'depth' attribute for
++  its operations ([rhbz#1998454])
++
++[rhbz#1998454]: https://bugzilla.redhat.com/show_bug.cgi?id=1998454
++
++
+ ## [0.10.10] - 2021-08-19
+ 
+ ### Added
+diff --git a/pcs/lib/cib/resource/operations.py b/pcs/lib/cib/resource/operations.py
+index 390db71a..44b2e7dd 100644
+--- a/pcs/lib/cib/resource/operations.py
++++ b/pcs/lib/cib/resource/operations.py
+@@ -197,7 +197,7 @@ def _action_dto_to_dict(
+ ) -> Dict[str, str]:
+     result = dict(
+         filter(
+-            lambda item: item[0] != "deph" and item[1] not in (None, ""),
++            lambda item: item[0] != "depth" and item[1] not in (None, ""),
+             to_dict(dto).items(),
+         )
+     )
+-- 
+2.31.1
+

SOURCES/do-not-support-cluster-setup-with-udp-u-transport.patch

@@ -1,7 +1,7 @@
-From 891dc3d015d42b4f4b34f578f2ca8fd359b50017 Mon Sep 17 00:00:00 2001
+From 12fdac318d07e53da1f738b2b4deacaa0f606d4c 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
+Subject: [PATCH 2/2] do not support cluster setup with udp(u) transport
 
 ---
  pcs/pcs.8.in              | 2 ++
@@ -49,5 +49,5 @@ index 2f26e831..a7702ac4 100644
  #csetup-transport-options.knet .without-knet
  {
 -- 
-2.27.0
+2.31.1
 

SPECS/pcs.spec

@@ -1,6 +1,6 @@
 Name: pcs
 Version: 0.10.10
-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
@@ -108,14 +108,15 @@ Source94: https://rubygems.org/downloads/daemons-%{version_rubygem_daemons}.gem
 Source95: https://rubygems.org/downloads/thin-%{version_rubygem_thin}.gem
 Source96: https://rubygems.org/downloads/ruby2_keywords-%{version_rubygem_ruby2_keywords}.gem
 
-Source100: https://github.com/idevat/pcs-web-ui/archive/%{ui_commit}/%{ui_src_name}.tar.gz
+Source100: https://github.com/ClusterLabs/pcs-web-ui/archive/%{ui_commit}/%{ui_src_name}.tar.gz
-Source101: https://github.com/idevat/pcs-web-ui/releases/download/%{ui_modules_version}/pcs-web-ui-node-modules-%{ui_modules_version}.tar.xz
+Source101: https://github.com/ClusterLabs/pcs-web-ui/releases/download/%{ui_modules_version}/pcs-web-ui-node-modules-%{ui_modules_version}.tar.xz
 
 # Patches from upstream.
 # They should come before downstream patches to avoid unnecessary conflicts.
 # Z-streams are exception here: they can come from upstream but should be
 # applied at the end to keep z-stream changes as straightforward as possible.
 # Patch1: bzNUMBER-01-name.patch
+Patch1: bz1998454-01-fix-creating-resources-with-depth-operation-attribut.patch
 
 # Downstream patches do not come from upstream. They adapt pcs for specific
 # RHEL needs.
@@ -302,6 +303,7 @@ update_times_patch(){
   update_times ${patch_file_name} `diffstat -p1 -l ${patch_file_name}`
 }
 
+update_times_patch %{PATCH1}
 update_times_patch %{PATCH101}
 
 cp -f %SOURCE1 %{pcsd_public_dir}/images
@@ -565,6 +567,10 @@ remove_all_tests
 %license pyagentx_LICENSE.txt
 
 %changelog
+* Fri Aug 27 2021 Miroslav Lisik <mlisik@redhat.com> - 0.10.10-2
+- Fixed create resources with depth operation attribute
+- Resolves: rhbz#1998454
+
 * Thu Aug 19 2021 Ondrej Mular <omular@redhat.com> - 0.10.10-1
 - Rebased to latest upstream sources (see CHANGELOG.md)
 - Updated pcs-web-ui