import pcs-0.10.8-1.el8

.gitignore

@@ -1,18 +1,19 @@
 SOURCES/HAM-logo.png
 SOURCES/backports-3.17.2.gem
-SOURCES/dacite-1.5.0.tar.gz
+SOURCES/dacite-1.6.0.tar.gz
 SOURCES/daemons-1.3.1.gem
-SOURCES/dataclasses-0.6.tar.gz
+SOURCES/dataclasses-0.8.tar.gz
 SOURCES/ethon-0.12.0.gem
 SOURCES/eventmachine-1.2.7.gem
 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-0.10.6.tar.gz
+SOURCES/pcs-0.10.8.tar.gz
-SOURCES/pcs-web-ui-0.1.3.tar.gz
+SOURCES/pcs-web-ui-0.1.5.tar.gz
-SOURCES/pcs-web-ui-node-modules-0.1.3.tar.xz
+SOURCES/pcs-web-ui-node-modules-0.1.5.tar.xz
 SOURCES/pyagentx-0.4.pcs.2.tar.gz
+SOURCES/python-dateutil-2.8.1.tar.gz
 SOURCES/rack-2.2.3.gem
 SOURCES/rack-protection-2.0.8.1.gem
 SOURCES/rack-test-1.1.0.gem
@@ -20,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

.pcs.metadata

@@ -1,18 +1,19 @@
 679a4ce22a33ffd4d704261a17c00cff98d9499a SOURCES/HAM-logo.png
 28b63a742124da6c9575a1c5e7d7331ef93600b2 SOURCES/backports-3.17.2.gem
-c14ee49221d8e1b09364b5f248bc3da12484f675 SOURCES/dacite-1.5.0.tar.gz
+31546c37fbdc6270d5097687619e9c0db6f1c05c SOURCES/dacite-1.6.0.tar.gz
 e28c1e78d1a6e34e80f4933b494f1e0501939dd3 SOURCES/daemons-1.3.1.gem
-81079b734108084eea0ae1c05a1cab0e806a3a1d SOURCES/dataclasses-0.6.tar.gz
+8b7598273d2ae6dad2b88466aefac55071a41926 SOURCES/dataclasses-0.8.tar.gz
 921ef1be44583a7644ee7f20fe5f26f21d018a04 SOURCES/ethon-0.12.0.gem
 7a5b2896e210fac9759c786ee4510f265f75b481 SOURCES/eventmachine-1.2.7.gem
 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
-73fafb4228326c14a799f0cccbcb734ab7ba2bfa SOURCES/pcs-0.10.6.tar.gz
+0e6b705715023ec5224ca05e977b8888f2a1b1e6 SOURCES/pcs-0.10.8.tar.gz
-df118954a980ceecc9cdd0e85a83d43253836f7f SOURCES/pcs-web-ui-0.1.3.tar.gz
+f23b14786b1911d498612bf0e90f344bcc4915c3 SOURCES/pcs-web-ui-0.1.5.tar.gz
-3e09042e3dc32c992451ba4c0454f2879f0d3f40 SOURCES/pcs-web-ui-node-modules-0.1.3.tar.xz
+57beab1c4bed96d7f9fc35261e96f78babb06980 SOURCES/pcs-web-ui-node-modules-0.1.5.tar.xz
 3176b2f2b332c2b6bf79fe882e83feecf3d3f011 SOURCES/pyagentx-0.4.pcs.2.tar.gz
+bd26127e57f83a10f656b62c46524c15aeb844dd SOURCES/python-dateutil-2.8.1.tar.gz
 345b7169d4d2d62176a225510399963bad62b68f SOURCES/rack-2.2.3.gem
 1f046e23baca8beece3b38c60382f44aa2b2cb41 SOURCES/rack-protection-2.0.8.1.gem
 b80bc5ca38a885e747271675ba91dd3d02136bf1 SOURCES/rack-test-1.1.0.gem
@@ -20,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

SOURCES/bz1805082-01-fix-resource-stonith-refresh-documentation.patch

@@ -1,57 +0,0 @@
-From be40fe494ddeb4f7132389ca0f3c1193de0e425d Mon Sep 17 00:00:00 2001
-From: Tomas Jelinek <tojeline@redhat.com>
-Date: Tue, 23 Jun 2020 12:57:05 +0200
-Subject: [PATCH 2/3] fix 'resource | stonith refresh' documentation
-
----
- pcs/pcs.8    | 4 ++--
- pcs/usage.py | 4 ++--
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/pcs/pcs.8 b/pcs/pcs.8
-index c887d332..3efc5bb2 100644
---- a/pcs/pcs.8
-+++ b/pcs/pcs.8
-@@ -325,7 +325,7 @@ If a node is not specified then resources / stonith devices on all nodes will be
- refresh [<resource id>] [node=<node>] [\fB\-\-strict\fR]
- Make the cluster forget the complete operation history (including failures) of the resource and re\-detect its current state. If you are interested in forgetting failed operations only, use the 'pcs resource cleanup' command.
- .br
--If the named resource is part of a group, or one numbered instance of a clone or bundled resource, the clean\-up applies to the whole collective resource unless \fB\-\-strict\fR is given.
-+If the named resource is part of a group, or one numbered instance of a clone or bundled resource, the refresh applies to the whole collective resource unless \fB\-\-strict\fR is given.
- .br
- If a resource id is not specified then all resources / stonith devices will be refreshed.
- .br
-@@ -613,7 +613,7 @@ If a node is not specified then resources / stonith devices on all nodes will be
- refresh [<stonith id>] [\fB\-\-node\fR <node>] [\fB\-\-strict\fR]
- Make the cluster forget the complete operation history (including failures) of the stonith device and re\-detect its current state. If you are interested in forgetting failed operations only, use the 'pcs stonith cleanup' command.
- .br
--If the named stonith device is part of a group, or one numbered instance of a clone or bundled resource, the clean\-up applies to the whole collective resource unless \fB\-\-strict\fR is given.
-+If the named stonith device is part of a group, or one numbered instance of a clone or bundled resource, the refresh applies to the whole collective resource unless \fB\-\-strict\fR is given.
- .br
- If a stonith id is not specified then all resources / stonith devices will be refreshed.
- .br
-diff --git a/pcs/usage.py b/pcs/usage.py
-index 8722bd7b..0f3c95a3 100644
---- a/pcs/usage.py
-+++ b/pcs/usage.py
-@@ -663,7 +663,7 @@ Commands:
-         interested in forgetting failed operations only, use the 'pcs resource
-         cleanup' command.
-         If the named resource is part of a group, or one numbered instance of a
--        clone or bundled resource, the clean-up applies to the whole collective
-+        clone or bundled resource, the refresh applies to the whole collective
-         resource unless --strict is given.
-         If a resource id is not specified then all resources / stonith devices
-         will be refreshed.
-@@ -1214,7 +1214,7 @@ Commands:
-         are interested in forgetting failed operations only, use the 'pcs
-         stonith cleanup' command.
-         If the named stonith device is part of a group, or one numbered
--        instance of a clone or bundled resource, the clean-up applies to the
-+        instance of a clone or bundled resource, the refresh applies to the
-         whole collective resource unless --strict is given.
-         If a stonith id is not specified then all resources / stonith devices
-         will be refreshed.
--- 
-2.25.4
-

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

@@ -1,7 +1,7 @@
-From c0fff964cc07e3a9fbdea85da33abe3329c653a3 Mon Sep 17 00:00:00 2001
+From ab9fd9f223e805247319ac5a7318c15417197a0a Mon Sep 17 00:00:00 2001
 From: Ivan Devat <idevat@redhat.com>
 Date: Tue, 20 Nov 2018 15:03:56 +0100
-Subject: [PATCH 3/3] do not support cluster setup with udp(u) transport
+Subject: [PATCH] do not support cluster setup with udp(u) transport
 
 ---
  pcs/pcs.8                 | 2 ++
@@ -10,10 +10,10 @@ Subject: [PATCH 3/3] 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 3efc5bb2..20247774 100644
+index edfdd039..8caf087f 100644
 --- a/pcs/pcs.8
 +++ b/pcs/pcs.8
-@@ -376,6 +376,8 @@ By default, encryption is enabled with cipher=aes256 and hash=sha256. To disable
+@@ -424,6 +424,8 @@ By default, encryption is enabled with cipher=aes256 and hash=sha256. To disable
  
  Transports udp and udpu:
  .br
@@ -23,10 +23,10 @@ index 3efc5bb2..20247774 100644
  .br
  Transport options are: ip_version, netmtu
 diff --git a/pcs/usage.py b/pcs/usage.py
-index 0f3c95a3..51bc1196 100644
+index baedb347..f576eaf2 100644
 --- a/pcs/usage.py
 +++ b/pcs/usage.py
-@@ -796,6 +796,7 @@ Commands:
+@@ -852,6 +852,7 @@ Commands:
              hash=sha256. To disable encryption, set cipher=none and hash=none.
  
          Transports udp and udpu:
@@ -49,5 +49,5 @@ index b857cbae..b8d48d92 100644
  #csetup-transport-options.knet .without-knet
  {
 -- 
-2.25.4
+2.26.2
 

SPECS/pcs.spec

@@ -1,17 +1,18 @@
 Name: pcs
-Version: 0.10.6
+Version: 0.10.8
-Release: 2%{?dist}
+Release: 1%{?dist}
 # https://docs.fedoraproject.org/en-US/packaging-guidelines/LicensingGuidelines/
 # https://fedoraproject.org/wiki/Licensing:Main?rd=Licensing#Good_Licenses
 # GPLv2: pcs
 # ASL 2.0: dataclasses, tornado
-# MIT: handlebars, backports, dacite, daemons, ethon, mustermann, rack,
+# ASL 2.0 or BSD: dateutil
-#      rack-protection, rack-test, sinatra, tilt
+# MIT: backports, dacite, daemons, ember, ethon, handlebars, jquery, jquery-ui,
+#      mustermann, rack, rack-protection, rack-test, sinatra, tilt
 # GPLv2 or Ruby: eventmachne, json
 # (GPLv2 or Ruby) and BSD: thin
 # BSD or Ruby: open4, ruby2_keywords
 # BSD and MIT: ffi
-License: GPLv2 and ASL 2.0 and MIT and BSD and (GPLv2 or Ruby) and (BSD or Ruby)
+License: GPLv2 and ASL 2.0 and MIT and BSD and (GPLv2 or Ruby) and (BSD or Ruby) and (ASL 2.0 or BSD)
 URL: https://github.com/ClusterLabs/pcs
 Group: System Environment/Base
 Summary: Pacemaker Configuration System
@@ -19,20 +20,22 @@ Summary: Pacemaker Configuration System
 ExclusiveArch: i686 x86_64 s390x ppc64le aarch64
 
 %global version_or_commit %{version}
-# %%global version_or_commit 5c3f35d2819b0e8be0dcbe0ee8f81b9b24b20b54
+# %%global version_or_commit 508b3999eb02b4901e83b8e780af8422b522ad30
 
 %global pcs_source_name %{name}-%{version_or_commit}
 
-# ui_commit can be determined by hash, tag or branch 
+# ui_commit can be determined by hash, tag or branch
-%global ui_commit 0.1.3
+%global ui_commit 0.1.5
+%global ui_modules_version 0.1.5
 %global ui_src_name pcs-web-ui-%{ui_commit}
 
 %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 dataclasses_version 0.8
-%global dacite_version  1.5.0
+%global dacite_version  1.6.0
+%global dateutil_version  2.8.1
 %global version_rubygem_backports  3.17.2
 %global version_rubygem_daemons  1.3.1
 %global version_rubygem_ethon  0.12.0
@@ -49,6 +52,12 @@ ExclusiveArch: i686 x86_64 s390x ppc64le aarch64
 %global version_rubygem_thin  1.7.2
 %global version_rubygem_tilt  2.0.10
 
+# javascript bundled libraries for old web-ui
+%global ember_version 1.4.0
+%global handlebars_version 1.2.1
+%global jquery_ui_version 1.10.1
+%global jquery_version 1.9.1
+
 # We do not use _libdir macro because upstream is not prepared for it.
 # Pcs does not include binaries and thus it should live in /usr/lib. Tornado
 # and gems include binaries and thus it should live in /usr/lib64. But the
@@ -84,6 +93,7 @@ Source41: https://github.com/ondrejmular/pyagentx/archive/v%{pyagentx_version}/p
 Source42: https://github.com/tornadoweb/tornado/archive/v%{tornado_version}/tornado-%{tornado_version}.tar.gz
 Source43: https://github.com/ericvsmith/dataclasses/archive/%{dataclasses_version}/dataclasses-%{dataclasses_version}.tar.gz
 Source44: https://github.com/konradhalas/dacite/archive/v%{dacite_version}/dacite-%{dacite_version}.tar.gz
+Source45: https://github.com/dateutil/dateutil/archive/%{dateutil_version}/python-dateutil-%{dateutil_version}.tar.gz
 
 Source81: https://rubygems.org/downloads/backports-%{version_rubygem_backports}.gem
 Source82: https://rubygems.org/downloads/ethon-%{version_rubygem_ethon}.gem
@@ -105,22 +115,20 @@ 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
-Source101: https://github.com/idevat/pcs-web-ui/releases/download/%{ui_commit}/pcs-web-ui-node-modules-%{ui_commit}.tar.xz
+Source101: https://github.com/idevat/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: name.patch
+# Patch1: bzNUMBER-01-name.patch
-Patch1: bz1817547-01-resource-and-operation-defaults.patch
-Patch2: bz1805082-01-fix-resource-stonith-refresh-documentation.patch
 
 # Downstream patches do not come from upstream. They adapt pcs for specific
 # RHEL needs.
 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
@@ -129,6 +137,8 @@ BuildRequires: python3-devel
 BuildRequires: platform-python-setuptools
 BuildRequires: python3-pycurl
 BuildRequires: python3-pyparsing
+# for bundled python dateutil
+BuildRequires: python3-setuptools_scm
 # gcc for compiling custom rubygems
 BuildRequires: gcc
 BuildRequires: gcc-c++
@@ -148,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
@@ -195,6 +206,7 @@ Requires: logrotate
 Provides: bundled(tornado) = %{tornado_version}
 Provides: bundled(dataclasses) = %{dataclasses_version}
 Provides: bundled(dacite) = %{dacite_version}
+Provides: bundled(dateutil) = %{dateutil_version}
 Provides: bundled(backports) = %{version_rubygem_backports}
 Provides: bundled(daemons) = %{version_rubygem_daemons}
 Provides: bundled(ethon) = %{version_rubygem_ethon}
@@ -211,6 +223,12 @@ Provides: bundled(sinatra) = %{version_rubygem_sinatra}
 Provides: bundled(thin) = %{version_rubygem_thin}
 Provides: bundled(tilt) = %{version_rubygem_tilt}
 
+# javascript bundled libraries for old web-ui
+Provides: bundled(ember) = %{ember_version}
+Provides: bundled(handlebars) = %{handlebars_version}
+Provides: bundled(jquery) = %{jquery_version}
+Provides: bundled(jquery-ui) = %{jquery_ui_version}
+
 %description
 pcs is a corosync and pacemaker configuration tool.  It permits users to
 easily view, modify and create pacemaker based clusters.
@@ -280,8 +298,6 @@ update_times_patch(){
 }
 
 # update_times_patch %%{PATCH1}
-update_times_patch %{PATCH1}
-update_times_patch %{PATCH2}
 update_times_patch %{PATCH101}
 
 cp -f %SOURCE1 pcsd/public/images
@@ -349,6 +365,13 @@ update_times %SOURCE44 `find %{bundled_src_dir}/dacite -follow`
 cp %{bundled_src_dir}/dacite/LICENSE dacite_LICENSE
 cp %{bundled_src_dir}/dacite/README.md dacite_README.md
 
+# 8) sources for python dateutil
+tar -xzf %SOURCE45 -C %{bundled_src_dir}
+mv %{bundled_src_dir}/python-dateutil-%{dateutil_version} %{bundled_src_dir}/python-dateutil
+update_times %SOURCE45 `find %{bundled_src_dir}/python-dateutil -follow`
+cp %{bundled_src_dir}/python-dateutil/LICENSE dateutil_LICENSE
+cp %{bundled_src_dir}/python-dateutil/README.rst dateutil_README.rst
+
 %build
 %define debug_package %{nil}
 
@@ -358,6 +381,11 @@ pwd
 
 # build bundled rubygems (in main install it is disabled by BUILD_GEMS=false)
 mkdir -p %{rubygem_bundle_dir}
+# The '-g' cflags option is needed for generation of MiniDebugInfo for shared
+# libraries from rubygem extensions
+# Currently used rubygems with extensions: eventmachine, ffi, json, thin
+# There was rpmdiff issue with missing .gnu_debugdata section
+# see https://docs.engineering.redhat.com/display/HTD/rpmdiff-elf-stripping
 gem install \
   --force --verbose --no-rdoc --no-ri -l --no-user-install \
   -i %{rubygem_bundle_dir} \
@@ -377,7 +405,7 @@ gem install \
   %{rubygem_cache_dir}/thin-%{version_rubygem_thin}.gem \
   %{rubygem_cache_dir}/tilt-%{version_rubygem_tilt}.gem \
   -- '--with-ldflags="-Wl,-z,relro -Wl,-z,ibt -Wl,-z,now -Wl,--gc-sections"' \
-     '--with-cflags="-O2 -ffunction-sections"'
+     '--with-cflags="-g -O2 -ffunction-sections"'
 
 # prepare license files
 # some rubygems do not have a license file (ruby2_keywords, thin)
@@ -398,19 +426,6 @@ mv %{rubygem_bundle_dir}/gems/rack-test-%{version_rubygem_rack_test}/MIT-LICENSE
 mv %{rubygem_bundle_dir}/gems/sinatra-%{version_rubygem_sinatra}/LICENSE sinatra_LICENSE
 mv %{rubygem_bundle_dir}/gems/tilt-%{version_rubygem_tilt}/COPYING tilt_COPYING
 
-# We can remove files required for gem compilation
-rm -rf %{rubygem_bundle_dir}/gems/eventmachine-%{version_rubygem_eventmachine}/ext
-rm -rf %{rubygem_bundle_dir}/gems/ffi-%{version_rubygem_ffi}/ext
-rm -rf %{rubygem_bundle_dir}/gems/json-%{version_rubygem_json}/ext
-rm -rf %{rubygem_bundle_dir}/gems/thin-%{version_rubygem_thin}/ext
-
-
-# With this file there is "File is not stripped" problem during rpmdiff
-# See https://docs.engineering.redhat.com/display/HTD/rpmdiff-elf-stripping
-for fname in `find %{rubygem_bundle_dir}/extensions -type f -name "*.so"`; do
-  strip ${fname}
-done
-
 # build web ui and put it to pcsd
 make -C %{pcsd_public_dir}/%{ui_src_name} build
 mv %{pcsd_public_dir}/%{ui_src_name}/build  pcsd/public/ui
@@ -428,6 +443,7 @@ make install \
   BUNDLE_PYAGENTX_SRC_DIR=`readlink -f %{bundled_src_dir}/pyagentx` \
   BUNDLE_TORNADO_SRC_DIR=`readlink -f %{bundled_src_dir}/tornado` \
   BUNDLE_DACITE_SRC_DIR=`readlink -f %{bundled_src_dir}/dacite` \
+  BUNDLE_DATEUTIL_SRC_DIR=`readlink -f %{bundled_src_dir}/python-dateutil` \
   BUNDLE_DATACLASSES_SRC_DIR=`readlink -f %{bundled_src_dir}/dataclasses` \
   BUILD_GEMS=false \
   SYSTEMCTL_OVERRIDE=true \
@@ -435,18 +451,29 @@ make install \
   rubyhdrdir="%{_includedir}" \
   includedir="%{_includedir}"
 
-# With this file there is "File is not stripped" problem during rpmdiff
-# See https://docs.engineering.redhat.com/display/HTD/rpmdiff-elf-stripping
-for fname in `find ${RPM_BUILD_ROOT}%{pcs_libdir}/pcs/bundled/packages/tornado/ -type f -name "*.so"`; do
-  strip ${fname}
-done
-
 # symlink favicon into pcsd directories
 ln -fs /etc/favicon.png ${RPM_BUILD_ROOT}%{pcs_libdir}/%{pcsd_public_dir}/images/favicon.png
 
 #after the ruby gem compilation we do not need ruby gems in the cache
 rm -r -v $RPM_BUILD_ROOT%{pcs_libdir}/%{rubygem_cache_dir}
 
+# We are not building debug package for pcs but we need to add MiniDebuginfo
+# to the bundled shared libraries from rubygem extensions in order to satisfy
+# rpmdiff's binary stripping checker.
+# Therefore we call find-debuginfo.sh script manually in order to strip
+# binaries and add MiniDebugInfo with .gnu_debugdata section
+/usr/lib/rpm/find-debuginfo.sh -j2 -m -i -S debugsourcefiles.list
+# find-debuginfo.sh generated some files into /usr/lib/debug  and
+# /usr/src/debug/ that we don't want in the package
+rm -rf $RPM_BUILD_ROOT%{pcs_libdir}/debug
+rm -rf $RPM_BUILD_ROOT%{_prefix}/src/debug
+
+# We can remove files required for gem compilation
+rm -rf $RPM_BUILD_ROOT%{pcs_libdir}/%{rubygem_bundle_dir}/gems/eventmachine-%{version_rubygem_eventmachine}/ext
+rm -rf $RPM_BUILD_ROOT%{pcs_libdir}/%{rubygem_bundle_dir}/gems/ffi-%{version_rubygem_ffi}/ext
+rm -rf $RPM_BUILD_ROOT%{pcs_libdir}/%{rubygem_bundle_dir}/gems/json-%{version_rubygem_json}/ext
+rm -rf $RPM_BUILD_ROOT%{pcs_libdir}/%{rubygem_bundle_dir}/gems/thin-%{version_rubygem_thin}/ext
+
 %check
 # In the building environment LC_CTYPE is set to C which causes tests to fail
 # due to python prints a warning about it to stderr. The following environment
@@ -536,9 +563,11 @@ remove_all_tests
 %doc README.md
 %doc tornado_README.rst
 %doc dacite_README.md
+%doc dateutil_README.rst
 %doc dataclasses_README.rst
 %license tornado_LICENSE
 %license dacite_LICENSE
+%license dateutil_LICENSE
 %license dataclasses_LICENSE.txt
 %license COPYING
 # rugygem licenses
@@ -568,6 +597,8 @@ remove_all_tests
 %{pcs_libdir}/pcs/bundled/packages/tornado*
 %{pcs_libdir}/pcs/bundled/packages/dacite*
 %{pcs_libdir}/pcs/bundled/packages/dataclasses*
+%{pcs_libdir}/pcs/bundled/packages/dateutil*
+%{pcs_libdir}/pcs/bundled/packages/python_dateutil*
 %{pcs_libdir}/pcs/bundled/packages/__pycache__/dataclasses.cpython-36.pyc
 %{_unitdir}/pcsd.service
 %{_unitdir}/pcsd-ruby.service
@@ -613,6 +644,39 @@ remove_all_tests
 %license pyagentx_LICENSE.txt
 
 %changelog
+* Mon Feb 01 2021 Miroslav Lisik <mlisik@redhat.com> - 0.10.8-1
+- Rebased to latest upstream sources (see CHANGELOG.md)
+- Updated pcs-web-ui
+- Updated python bundled dependencies: dacite, dataclasses
+- Resolves: rhbz#1457314 rhbz#1619818 rhbz#1667066 rhbz#1762816 rhbz#1794062 rhbz#1845470 rhbz#1856397 rhbz#1877762 rhbz#1917286
+
+* Thu Dec 17 2020 Miroslav Lisik <mlisik@redhat.com> - 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 <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
+- Fixed virtual bundle provides for ember, handelbars, jquery and jquery-ui
+- Resolves: rhbz#1222691 rhbz#1741056 rhbz#1851335 rhbz#1862966 rhbz#1869399 rhbz#1873691 rhbz#1875301 rhbz#1883445 rhbz#1885658 rhbz#1885841
+
+* Tue Aug 11 2020 Miroslav Lisik <mlisik@redhat.com> - 0.10.6-4
+- Fixed invalid CIB error caused by resource and operation defaults with mixed and-or rules
+- Updated pcs-web-ui
+- Resolves: rhbz#1867516
+
+* Thu Jul 16 2020 Miroslav Lisik <mlisik@redhat.com> - 0.10.6-3
+- Added Upgrade CIB if user specifies on-fail=demote
+- Fixed rpmdiff issue with binary stripping checker
+- Fixed removing non-empty tag by removing tagged resource group or clone
+- Resolves: rhbz#1843079 rhbz#1857295
+
 * Thu Jun 25 2020 Miroslav Lisik <mlisik@redhat.com> - 0.10.6-2
 - Added resource and operation defaults that apply to specific resource/operation types
 - Added Requires/BuildRequires: python3-pyparsing