From c8e365c7155dfba743951597b480c46fd0fd9526 Mon Sep 17 00:00:00 2001 From: Miroslav Lisik Date: Oct 05 2021 16:40:50 +0000 Subject: Rebased to latest upstream sources (see CHANGELOG.md) - Updated pcs-web-ui - Stop bundling rubygems daemons eventmachine mustermann rack rack-protection ruby2_keywords sinatra tilt --- diff --git a/.gitignore b/.gitignore index c25ef80..3210b8f 100644 --- a/.gitignore +++ b/.gitignore @@ -91,3 +91,6 @@ /pcs-0.10.9.tar.gz /pcs-web-ui-0.1.6.tar.gz /pcs-web-ui-node-modules-0.1.6-fips-fix.tar.xz +/pcs-0.10.11.tar.gz +/pcs-web-ui-0.1.9.tar.gz +/pcs-web-ui-node-modules-0.1.9.tar.xz diff --git a/pcs.spec b/pcs.spec index 3a69d42..7217433 100644 --- a/pcs.spec +++ b/pcs.spec @@ -1,16 +1,13 @@ Name: pcs -Version: 0.10.9 +Version: 0.10.11 Release: 1%{?dist} # https://docs.fedoraproject.org/en-US/packaging-guidelines/LicensingGuidelines/ # https://fedoraproject.org/wiki/Licensing:Main?rd=Licensing#Good_Licenses # GPLv2: pcs -# MIT: dacite, daemons, ember, handlebars, jquery, jquery-ui, mustermann, rack, -# rack-protection, sinatra, tilt -# (GPLv2 or Ruby): eventmachine +# MIT: dacite, ember, handlebars, jquery, jquery-ui # (GPLv2 or Ruby) and BSD: thin -# (BSD or Ruby): ruby2_keywords -License: GPLv2 and MIT and (GPLv2 or Ruby) and BSD and (BSD or Ruby) +License: GPLv2 and MIT and (GPLv2 or Ruby) and BSD URL: https://github.com/ClusterLabs/pcs Group: System Environment/Base Summary: Pacemaker Configuration System @@ -20,8 +17,8 @@ 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.6 -%global ui_modules_version 0.1.6-fips-fix +%global ui_commit 0.1.9 +%global ui_modules_version 0.1.9 %global ui_src_name pcs-web-ui-%{ui_commit} %global pcs_snmp_pkg_name pcs-snmp @@ -29,15 +26,7 @@ Summary: Pacemaker Configuration System %global pyagentx_version 0.4.pcs.2 %global dacite_version 1.6.0 -%global version_rubygem_daemons 1.4.0 -%global version_rubygem_eventmachine 1.2.7 -%global version_rubygem_mustermann 1.1.1 -%global version_rubygem_rack 2.2.3 -%global version_rubygem_rack_protection 2.0.8.1 -%global version_rubygem_ruby2_keywords 0.0.5 -%global version_rubygem_sinatra 2.0.8.1 %global version_rubygem_thin 1.8.1 -%global version_rubygem_tilt 2.0.10 # javascript bundled libraries for old web-ui %global ember_version 1.4.0 @@ -57,18 +46,10 @@ Source0: %{url}/archive/%{version_or_commit}/%{pcs_source_name}.tar.gz Source41: https://github.com/ondrejmular/pyagentx/archive/v%{pyagentx_version}/pyagentx-%{pyagentx_version}.tar.gz Source42: https://github.com/konradhalas/dacite/archive/v%{dacite_version}/dacite-%{dacite_version}.tar.gz -Source81: https://rubygems.org/downloads/daemons-%{version_rubygem_daemons}.gem -Source82: https://rubygems.org/downloads/eventmachine-%{version_rubygem_eventmachine}.gem -Source83: https://rubygems.org/downloads/mustermann-%{version_rubygem_mustermann}.gem -Source84: https://rubygems.org/downloads/rack-%{version_rubygem_rack}.gem -Source85: https://rubygems.org/downloads/rack-protection-%{version_rubygem_rack_protection}.gem -Source86: https://rubygems.org/downloads/ruby2_keywords-%{version_rubygem_ruby2_keywords}.gem -Source87: https://rubygems.org/downloads/sinatra-%{version_rubygem_sinatra}.gem Source88: https://rubygems.org/downloads/thin-%{version_rubygem_thin}.gem -Source89: https://rubygems.org/downloads/tilt-%{version_rubygem_tilt}.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_modules_version}.tar.xz +Source100: https://github.com/ClusterLabs/pcs-web-ui/archive/%{ui_commit}/%{ui_src_name}.tar.gz +Source101: https://github.com/ClusterLabs/pcs-web-ui/releases/download/%{ui_commit}/pcs-web-ui-node-modules-%{ui_modules_version}.tar.xz # Patch0: name.patch @@ -97,13 +78,19 @@ BuildRequires: python3-distro BuildRequires: ruby >= 2.2.0 BuildRequires: ruby-devel BuildRequires: rubygem-backports +BuildRequires: rubygem-daemons BuildRequires: rubygem-ethon +BuildRequires: rubygem-eventmachine BuildRequires: rubygem-ffi BuildRequires: rubygem-io-console BuildRequires: rubygem-json BuildRequires: rubygem-mustermann BuildRequires: rubygem-open4 +BuildRequires: rubygem-rack +BuildRequires: rubygem-rack-protection BuildRequires: rubygem-rack-test +BuildRequires: rubygem-sinatra +BuildRequires: rubygem-tilt %if 0%{?fedora} >= 34 || 0%{?eln} || 0%{?rhel} >= 9 BuildRequires: rubygem(rexml) BuildRequires: rubygem(webrick) @@ -149,11 +136,18 @@ Requires: python3-tornado # ruby and gems for pcsd Requires: ruby >= 2.2.0 Requires: rubygem-backports +Requires: rubygem-daemons Requires: rubygem-ethon +Requires: rubygem-eventmachine Requires: rubygem-ffi Requires: rubygem-json +Requires: rubygem-mustermann Requires: rubygem-open4 +Requires: rubygem-rack +Requires: rubygem-rack-protection Requires: rubygem-rack-test +Requires: rubygem-sinatra +Requires: rubygem-tilt %if 0%{?fedora} >= 34 || 0%{?eln} || 0%{?rhel} >= 9 Requires: rubygem(rexml) Requires: rubygem(webrick) @@ -183,16 +177,7 @@ Requires: logrotate Provides: bundled(dacite) = %{dacite_version} # bundled rubygems -Provides: bundled(daemons) = %{version_rubygem_daemons} -Provides: bundled(eventmachine) = %{version_rubygem_eventmachine} -Provides: bundled(mustermann) = %{version_rubygem_mustermann} -Provides: bundled(rack) = %{version_rubygem_rack} -Provides: bundled(rack) = %{version_rubygem_rack} -Provides: bundled(rack-protection) = %{version_rubygem_rack_protection} -Provides: bundled(ruby2_keywords) = %{version_rubygem_ruby2_keywords} -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} @@ -279,17 +264,7 @@ tar -xf %SOURCE101 -C %{pcsd_public_dir}/%{ui_src_name} # 1) rubygems sources mkdir -p %{rubygem_cache_dir} -cp -f %SOURCE81 %{rubygem_cache_dir} -cp -f %SOURCE82 %{rubygem_cache_dir} -cp -f %SOURCE83 %{rubygem_cache_dir} -cp -f %SOURCE84 %{rubygem_cache_dir} -cp -f %SOURCE85 %{rubygem_cache_dir} -cp -f %SOURCE86 %{rubygem_cache_dir} -cp -f %SOURCE87 %{rubygem_cache_dir} cp -f %SOURCE88 %{rubygem_cache_dir} -cp -f %SOURCE89 %{rubygem_cache_dir} -# For reason why we are renaming open4 rubygem, see comment of source -# definition above. # 2) prepare python bundles mkdir -p %{pcs_bundled_dir}/src @@ -310,7 +285,7 @@ pwd %make_install # build web ui and put it to pcsd -make -C %{pcsd_public_dir}/%{ui_src_name} build +make -C %{pcsd_public_dir}/%{ui_src_name} build BUILD_USE_EXISTING_NODE_MODULES=true mv %{pcsd_public_dir}/%{ui_src_name}/build ${RPM_BUILD_ROOT}%{_libdir}/%{pcsd_public_dir}/ui rm -r %{pcsd_public_dir}/%{ui_src_name} @@ -326,16 +301,6 @@ cp %{pcs_bundled_dir}/src/pyagentx-*/README.md pyagentx_README.md cp %{pcs_bundled_dir}/src/dacite-*/LICENSE dacite_LICENSE cp %{pcs_bundled_dir}/src/dacite-*/README.md dacite_README.md -mv %{rubygem_bundle_dir}/gems/daemons-%{version_rubygem_daemons}/LICENSE daemons_LICENSE -mv %{rubygem_bundle_dir}/gems/eventmachine-%{version_rubygem_eventmachine}/LICENSE eventmachine_LICENSE -mv %{rubygem_bundle_dir}/gems/eventmachine-%{version_rubygem_eventmachine}/GNU eventmachine_GNU -mv %{rubygem_bundle_dir}/gems/mustermann-%{version_rubygem_mustermann}/LICENSE mustermann_LICENSE -mv %{rubygem_bundle_dir}/gems/rack-%{version_rubygem_rack}/MIT-LICENSE rack_MIT-LICENSE -mv %{rubygem_bundle_dir}/gems/rack-protection-%{version_rubygem_rack_protection}/License rack-protection_License -mv %{rubygem_bundle_dir}/gems/ruby2_keywords-%{version_rubygem_ruby2_keywords}/LICENSE ruby2_keywords_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 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. @@ -349,7 +314,6 @@ rm -rf $RPM_BUILD_ROOT/usr/lib/debug rm -rf $RPM_BUILD_ROOT%{_prefix}/src/debug # We can remove files required for gem compilation -rm -rf $RPM_BUILD_ROOT%{_libdir}/%{rubygem_bundle_dir}/gems/eventmachine-%{version_rubygem_eventmachine}/ext rm -rf $RPM_BUILD_ROOT%{_libdir}/%{rubygem_bundle_dir}/gems/thin-%{version_rubygem_thin}/ext %check @@ -430,14 +394,6 @@ remove_all_tests %doc dacite_README.md %license dacite_LICENSE %license COPYING -%license daemons_LICENSE -%license eventmachine_LICENSE -%license eventmachine_GNU -%license mustermann_LICENSE -%license rack_MIT-LICENSE -%license rack-protection_License -%license ruby2_keywords_LICENSE -%license sinatra_LICENSE %{python3_sitelib}/* %{_sbindir}/pcs %{_sbindir}/pcsd @@ -478,6 +434,11 @@ remove_all_tests %license pyagentx_LICENSE.txt %changelog +* Tue Oct 05 2021 Miroslav Lisik - 0.10.11-1 +- Rebased to latest upstream sources (see CHANGELOG.md) +- Updated pcs-web-ui +- Stop bundling rubygems daemons eventmachine mustermann rack rack-protection ruby2_keywords sinatra tilt + * Mon Aug 16 2021 Miroslav Lisik - 0.10.9-1 - Rebased to latest upstream sources (see CHANGELOG.md) - Updated pcs-web-ui diff --git a/sources b/sources index 238305b..4fc469e 100644 --- a/sources +++ b/sources @@ -1,14 +1,6 @@ SHA512 (pyagentx-0.4.pcs.2.tar.gz) = d4194fec9a3e5fefe3793d49b7fec1feafef294c7e613a06046c2993daeefc5cb39d7c5b2b402ff83e49b2d976953f862264288c758c0be09d997b5323cc558a SHA512 (dacite-1.6.0.tar.gz) = 034255f095589d309fe5805413d8b148f430cd20a0de305b7954083b530d516da1d8f3f00ebb5264a8cfb77f2b2a76f1e2d863e78bd191f1d85021c5553815da -SHA512 (daemons-1.4.0.gem) = 48510e9873c692c7060d99d9aab3215225f193373e91cb9121b08859afb3119a0a668838b9018807523889ecf23211f64e39540b3aa683f5c7dee7126e8c36a0 -SHA512 (eventmachine-1.2.7.gem) = fdbcf9fc933e2414e70f8f48153e9ba6ed7a0029cdf49cdcb4ab72ab26683e727a36c099f017f20681f9c361179461743e501278ca9bd5612e693e26867cc516 -SHA512 (mustermann-1.1.1.gem) = 55d5fd9b8309e0b806b2fb0af409fbc71b958b8f91116991439f2c66b1f71f17647a61020b0349a86132e7d3da383121719ea330538abb8f3c8bef5fbff0b747 -SHA512 (rack-2.2.3.gem) = aabda2ac4aeea6b119c5d570a6c36b5c114f879cc73678a6f385b71f2191501a86adc3bed6f0e0bacfc1e4c48c2374714588669ede898053dc7719899bf71635 -SHA512 (rack-protection-2.0.8.1.gem) = 264aef904d9ae1c38197ad4ad44f1638905bd180fc4bb402c47856c37168059e8e975ca2de5518b1e5cebf79b970024b7d9f5f8b8908880451357dea5e428562 -SHA512 (ruby2_keywords-0.0.5.gem) = f6b9078b111e68c0017e0025ecdccb976c7a32f35c1a8adf9fd879db0c91f89eb9bd799f9527a846e28056f2a5fbf0f3610cda9538570288c493613c35c83a6f -SHA512 (sinatra-2.0.8.1.gem) = a63c8bbf468d059ce1e545c4da72208db34ef677141540b31a24a82537c15bbc020c712b9d9eb49470af45b4ce27f65ab21191ee47ebae7c45b9bbd86600ea3e SHA512 (thin-1.8.1.gem) = c200ea03b7876b2a17b5875557fa967b8d01db20cc401811f314f3285f8249b8793e4709b7bc033a9c5813b9a51e3093c55f717b4a98b8fda171aa82813b7419 -SHA512 (tilt-2.0.10.gem) = d2e0e1976da24ea4d8581d29a3ac2c0772c2e42f1cd04c48f1e3c1745a14d7cd319f14cead3e5341ec0f6c07aa216b50c29ad96984a85a9757ff9f7cc89b80df -SHA512 (pcs-0.10.9.tar.gz) = ced62db86f42427474b0ae97009f09bed0d0f4bae5ab1188fc58aace0b598863ac80ab443a8555b5d414f8332422144a3e1ef810ef46b9b3e1a5c8b2ef09985e -SHA512 (pcs-web-ui-0.1.6.tar.gz) = d5361155e943330d489fbc69442777a0c45d6fec12894a6b2158e0ad583d2fd2307a13615d39a770352c4c37473919b5e13c8d13e84cd4b778ac719de51c6c20 -SHA512 (pcs-web-ui-node-modules-0.1.6-fips-fix.tar.xz) = a209c3acac3a992627c146c75e9ebdbc735b38ba8f98935377694b8c13e4318ee5059c75833962cf188fc963ecefe68a6762daf7b4499c54538b1493cc0d712e +SHA512 (pcs-0.10.11.tar.gz) = 220dcba99c479a6a7c6d35c7a4c04e46a336c0ff6454da997560c1e9c8fd39f41d16cbcc247502baa9508ac7e6a4cf7357f4d5bfccafc3d36164dbc7334877a4 +SHA512 (pcs-web-ui-0.1.9.tar.gz) = 6572c9afcc31cac4be89e474e6abb31f0e21ebbc4ebf6cbcff4d391496003b8abbfb44e99752447741b3ca8bab551d55ddd442a7ead94fa44240f9879776fc60 +SHA512 (pcs-web-ui-node-modules-0.1.9.tar.xz) = de1adaeb0c6e93f9487ccfa20f6c517d71d0a3d40ede98c09dac2fa4d7f3f1e58eb4d47b598b56e4d07ace5faf157229c53878e095eb0d11806dfa539e90261d