From 22734eee244dc8c81f6c72c07b8a1dce460efa56 Mon Sep 17 00:00:00 2001 From: Miroslav Lisik Date: Fri, 2 Oct 2020 12:12:46 +0200 Subject: [PATCH 1/2] Rebased to latest upstream sources (see CHANGELOG.md) - Added dependency on python packages pyparsing and dateutil - Fixed virtual bundle provides for ember, handelbars, jquery and jquery-ui --- .gitignore | 1 + pcs.spec | 23 +++++++++++++++++++++-- sources | 2 +- 3 files changed, 23 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index b00b7e6..f2436b7 100644 --- a/.gitignore +++ b/.gitignore @@ -74,3 +74,4 @@ /pcs-0.10.6.tar.gz /pcs-web-ui-0.1.3.tar.gz /pcs-web-ui-node-modules-0.1.3.tar.xz +/pcs-0.10.7.tar.gz diff --git a/pcs.spec b/pcs.spec index 7825a3b..d2810e1 100644 --- a/pcs.spec +++ b/pcs.spec @@ -1,9 +1,9 @@ Name: pcs -Version: 0.10.6 +Version: 0.10.7 Release: 1%{?dist} # https://fedoraproject.org/wiki/Licensing:Main?rd=Licensing#Good_Licenses # GPLv2: pcs -# MIT: handlebars +# MIT: ember, handlebars, jquery, jquery-ui License: GPLv2 and MIT URL: https://github.com/ClusterLabs/pcs Summary: Pacemaker Configuration System @@ -21,6 +21,12 @@ Summary: Pacemaker Configuration System %global pyagentx_version 0.4.pcs.2 %global dacite_version 1.5.1 +# bundled libraries for old web-ui +%global ember_version 1.4.0 +%global jquery_version 1.9.1 +%global jquery_ui_version 1.10.1 +%global handlebars_version 1.2.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 @@ -49,9 +55,11 @@ BuildRequires: git BuildRequires: coreutils # python for pcs BuildRequires: python3 >= 3.6 +BuildRequires: python3-dateutil >= 2.7.0 BuildRequires: python3-devel BuildRequires: python3-setuptools BuildRequires: python3-pycurl +BuildRequires: python3-pyparsing BuildRequires: python3-tornado # ruby and gems for pcsd BuildRequires: ruby >= 2.2.0 @@ -86,10 +94,12 @@ BuildRequires: npm # python and libraries for pcs, setuptools for pcs entrypoint Requires: python3 >= 3.6 +Requires: python3-dateutil >= 2.7.0 Requires: python3-lxml Requires: python3-setuptools Requires: python3-clufter => 0.70.0 Requires: python3-pycurl +Requires: python3-pyparsing Requires: python3-tornado # ruby and gems for pcsd Requires: ruby >= 2.2.0 @@ -130,6 +140,10 @@ Requires: liberation-sans-fonts Requires: overpass-fonts Provides: bundled(dacite) = %{dacite_version} +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 @@ -381,6 +395,11 @@ remove_all_tests %license pyagentx_LICENSE.txt %changelog +* Wed Sep 30 2020 Miroslav Lisik - 0.10.7-1 +- Rebased to latest upstream sources (see CHANGELOG.md) +- Added dependency on python packages pyparsing and dateutil +- Fixed virtual bundle provides for ember, handelbars, jquery and jquery-ui + * Tue Jul 21 2020 Miroslav Lisik - 0.10.6-1 - Rebased to latest upstream sources (see CHANGELOG.md) - Updated pcs-web-ui diff --git a/sources b/sources index 01ac62a..d1b83c1 100644 --- a/sources +++ b/sources @@ -1,5 +1,5 @@ SHA512 (pyagentx-0.4.pcs.2.tar.gz) = d4194fec9a3e5fefe3793d49b7fec1feafef294c7e613a06046c2993daeefc5cb39d7c5b2b402ff83e49b2d976953f862264288c758c0be09d997b5323cc558a SHA512 (dacite-1.5.1.tar.gz) = ac1a3ffcd7e75fe99e6a3baf8623d3caee8940f0d2a8e455f86d71f71e1ff76b0bfad0c112a2ebdf2a81d4be9c9bd99adea94603f674c28e68959cb299d0039d -SHA512 (pcs-0.10.6.tar.gz) = e2e4ddc100a93d97ba8ecda1d3b4aa75f7a88be1f8aa9cc3de72cf67268b679f34007374129781cfc2567f091e472c3fa7a83e15037d68a3ea47edabcfd0b0ad SHA512 (pcs-web-ui-0.1.3.tar.gz) = caf28046e11d75f77ab96ab27fe3eb8b09bf767a0daee0155dbc7999ede2ae80f937328cc7fd6c0620caafbb6fda61d8076ec30ed2e2911fbf5dc6a0e1eb915b SHA512 (pcs-web-ui-node-modules-0.1.3.tar.xz) = 61cb28e7a6fe1253da24537101d502b3116d148db6eb81512067a0d6bdbafb7a93e3c546fb020515921ee846254be20dabbab79198c6e9bcfc3a18e7ebb5fdca +SHA512 (pcs-0.10.7.tar.gz) = c76a11fa162258ee311dcceca50674d7638396880596a826a711d944aab421ed06a6c4eb41f9dc997c01b72bce73c98c4f7be3fcd8fafb8ae16902f6a1e0c521 From 023360c643d9d152fdc1bf25b0de9d272848e950 Mon Sep 17 00:00:00 2001 From: Miroslav Lisik Date: Thu, 4 Feb 2021 16:43:37 +0100 Subject: [PATCH 2/2] Rebased to latest upstream sources (see CHANGELOG.md) - Updated pcs-web-ui - Updated bundled python dependency: dacite - Changed BuildRequires from git to git-core - Added BuildRequires: make --- .gitignore | 4 ++++ pcs.spec | 16 ++++++++++++---- sources | 8 ++++---- 3 files changed, 20 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index f2436b7..73d10a8 100644 --- a/.gitignore +++ b/.gitignore @@ -75,3 +75,7 @@ /pcs-web-ui-0.1.3.tar.gz /pcs-web-ui-node-modules-0.1.3.tar.xz /pcs-0.10.7.tar.gz +/dacite-1.6.0.tar.gz +/pcs-0.10.8.tar.gz +/pcs-web-ui-0.1.5.tar.gz +/pcs-web-ui-node-modules-0.1.5.tar.xz diff --git a/pcs.spec b/pcs.spec index d2810e1..6522d7c 100644 --- a/pcs.spec +++ b/pcs.spec @@ -1,5 +1,5 @@ Name: pcs -Version: 0.10.7 +Version: 0.10.8 Release: 1%{?dist} # https://fedoraproject.org/wiki/Licensing:Main?rd=Licensing#Good_Licenses # GPLv2: pcs @@ -13,13 +13,13 @@ Summary: Pacemaker Configuration System %global pcs_source_name %{name}-%{version_or_commit} # ui_commit can be determined by hash, tag or branch -%global ui_commit 0.1.3 +%global ui_commit 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 dacite_version 1.5.1 +%global dacite_version 1.6.0 # bundled libraries for old web-ui %global ember_version 1.4.0 @@ -50,7 +50,8 @@ Source101: https://github.com/idevat/pcs-web-ui/releases/download/%{ui_commit}/p # Patch0: name.patch # git for patches -BuildRequires: git +BuildRequires: make +BuildRequires: git-core #printf from coreutils is used in makefile BuildRequires: coreutils # python for pcs @@ -395,6 +396,13 @@ remove_all_tests %license pyagentx_LICENSE.txt %changelog +* Thu Feb 04 2021 Miroslav Lisik - 0.10.8-1 +- Rebased to latest upstream sources (see CHANGELOG.md) +- Updated pcs-web-ui +- Updated bundled python dependency: dacite +- Changed BuildRequires from git to git-core +- Added BuildRequires: make + * Wed Sep 30 2020 Miroslav Lisik - 0.10.7-1 - Rebased to latest upstream sources (see CHANGELOG.md) - Added dependency on python packages pyparsing and dateutil diff --git a/sources b/sources index d1b83c1..ccc5682 100644 --- a/sources +++ b/sources @@ -1,5 +1,5 @@ SHA512 (pyagentx-0.4.pcs.2.tar.gz) = d4194fec9a3e5fefe3793d49b7fec1feafef294c7e613a06046c2993daeefc5cb39d7c5b2b402ff83e49b2d976953f862264288c758c0be09d997b5323cc558a -SHA512 (dacite-1.5.1.tar.gz) = ac1a3ffcd7e75fe99e6a3baf8623d3caee8940f0d2a8e455f86d71f71e1ff76b0bfad0c112a2ebdf2a81d4be9c9bd99adea94603f674c28e68959cb299d0039d -SHA512 (pcs-web-ui-0.1.3.tar.gz) = caf28046e11d75f77ab96ab27fe3eb8b09bf767a0daee0155dbc7999ede2ae80f937328cc7fd6c0620caafbb6fda61d8076ec30ed2e2911fbf5dc6a0e1eb915b -SHA512 (pcs-web-ui-node-modules-0.1.3.tar.xz) = 61cb28e7a6fe1253da24537101d502b3116d148db6eb81512067a0d6bdbafb7a93e3c546fb020515921ee846254be20dabbab79198c6e9bcfc3a18e7ebb5fdca -SHA512 (pcs-0.10.7.tar.gz) = c76a11fa162258ee311dcceca50674d7638396880596a826a711d944aab421ed06a6c4eb41f9dc997c01b72bce73c98c4f7be3fcd8fafb8ae16902f6a1e0c521 +SHA512 (dacite-1.6.0.tar.gz) = 034255f095589d309fe5805413d8b148f430cd20a0de305b7954083b530d516da1d8f3f00ebb5264a8cfb77f2b2a76f1e2d863e78bd191f1d85021c5553815da +SHA512 (pcs-0.10.8.tar.gz) = 8b9ba62279431e481d062e804d24480d2a274d2f4897a82149df6116ff3df2394d97a3ee77a6dee4c563d915bab0142124a8942524fcc4e894912086e865353c +SHA512 (pcs-web-ui-0.1.5.tar.gz) = ec4adf8ca5858c1f1f82e8f58e36864805bedc6dc10674fab83498aff5422a0497703ecd96fda17b4c1f6beffa64fe5a80a82fb4f75b2102fe1a4753a5d057e9 +SHA512 (pcs-web-ui-node-modules-0.1.5.tar.xz) = cf1ef7e9280e7a0e864407e15f33edb98dce72e93d6917b74d5833ba184be248d87f6f309a2667bb2cbba0f33d1afde6a706832473505df87ed65835512da82c