diff --git a/.gitignore b/.gitignore index 7adb963..904844d 100644 --- a/.gitignore +++ b/.gitignore @@ -7,19 +7,19 @@ SOURCES/ethon-0.15.0.gem SOURCES/eventmachine-1.2.7.gem SOURCES/ffi-1.15.5.gem SOURCES/json-2.6.2.gem -SOURCES/mustermann-1.1.1.gem +SOURCES/mustermann-2.0.2.gem SOURCES/open4-1.3.4-1.gem SOURCES/pcs-0.10.14.tar.gz SOURCES/pcs-web-ui-0.1.13.tar.gz SOURCES/pcs-web-ui-node-modules-0.1.13.tar.xz SOURCES/pyagentx-0.4.pcs.2.tar.gz SOURCES/python-dateutil-2.8.1.tar.gz -SOURCES/rack-2.2.3.1.gem -SOURCES/rack-protection-2.2.0.gem +SOURCES/rack-2.2.6.2.gem +SOURCES/rack-protection-2.2.4.gem SOURCES/rack-test-1.1.0.gem SOURCES/rexml-3.2.5.gem SOURCES/ruby2_keywords-0.0.5.gem -SOURCES/sinatra-2.2.0.gem +SOURCES/sinatra-2.2.4.gem SOURCES/thin-1.8.1.gem -SOURCES/tilt-2.0.10.gem +SOURCES/tilt-2.0.11.gem SOURCES/tornado-6.1.0.tar.gz diff --git a/.pcs.metadata b/.pcs.metadata index 32792b6..d95ef98 100644 --- a/.pcs.metadata +++ b/.pcs.metadata @@ -7,19 +7,19 @@ 7a5b2896e210fac9759c786ee4510f265f75b481 SOURCES/eventmachine-1.2.7.gem 97632b7975067266c0b39596de0a4c86d9330658 SOURCES/ffi-1.15.5.gem 86c10824191e8f351da3fe0a0b6db94a813ada3a SOURCES/json-2.6.2.gem -50a4e37904485810cb05e27d75c9783e5a8f3402 SOURCES/mustermann-1.1.1.gem +f5f804366823c1126791dfefd98dd0539563785c SOURCES/mustermann-2.0.2.gem 41a7fe9f8e3e02da5ae76c821b89c5b376a97746 SOURCES/open4-1.3.4-1.gem 825eab03553c98465e1de265c151ece149ddba04 SOURCES/pcs-0.10.14.tar.gz f7455776936492ce7b241f9801d6bbc946b0461a SOURCES/pcs-web-ui-0.1.13.tar.gz bd18d97d611233914828719c97b4d98d079913d2 SOURCES/pcs-web-ui-node-modules-0.1.13.tar.xz 3176b2f2b332c2b6bf79fe882e83feecf3d3f011 SOURCES/pyagentx-0.4.pcs.2.tar.gz bd26127e57f83a10f656b62c46524c15aeb844dd SOURCES/python-dateutil-2.8.1.tar.gz -be609467c819d263c138c417548431b81f8da216 SOURCES/rack-2.2.3.1.gem -21cfac2453436c6856da31e741bbfa59da4973e1 SOURCES/rack-protection-2.2.0.gem +872e3dadb596908640d003c55073590dd78f77c5 SOURCES/rack-2.2.6.2.gem +5347315a7283f0b04443e924ed4eaa17807432c8 SOURCES/rack-protection-2.2.4.gem b80bc5ca38a885e747271675ba91dd3d02136bf1 SOURCES/rack-test-1.1.0.gem e7f48fa5fb2d92e6cb21d6b1638fe41a5a7c4287 SOURCES/rexml-3.2.5.gem d017b9e4d1978e0b3ccc3e2a31493809e4693cd3 SOURCES/ruby2_keywords-0.0.5.gem -5f0d7e63f9d8683f39ad23afe7e00b99602b87cc SOURCES/sinatra-2.2.0.gem +fa6a6c98f885e93f54c23dd0454cae906e82c31b SOURCES/sinatra-2.2.4.gem 1ac6292a98e17247b7bb847a35ff868605256f7b SOURCES/thin-1.8.1.gem -d265c822a6b228392d899e9eb5114613d65e6967 SOURCES/tilt-2.0.10.gem +360d77c80d2851a538fb13d43751093115c34712 SOURCES/tilt-2.0.11.gem c23c617c7a0205e465bebad5b8cdf289ae8402a2 SOURCES/tornado-6.1.0.tar.gz diff --git a/SPECS/pcs.spec b/SPECS/pcs.spec index e9ce2a4..0ddbd10 100644 --- a/SPECS/pcs.spec +++ b/SPECS/pcs.spec @@ -1,6 +1,6 @@ Name: pcs Version: 0.10.14 -Release: 5%{?dist}.1 +Release: 5%{?dist}.2 # https://docs.fedoraproject.org/en-US/packaging-guidelines/LicensingGuidelines/ # https://fedoraproject.org/wiki/Licensing:Main?rd=Licensing#Good_Licenses # GPLv2: pcs @@ -42,16 +42,16 @@ ExclusiveArch: i686 x86_64 s390x ppc64le aarch64 %global version_rubygem_eventmachine 1.2.7 %global version_rubygem_ffi 1.15.5 %global version_rubygem_json 2.6.2 -%global version_rubygem_mustermann 1.1.1 +%global version_rubygem_mustermann 2.0.2 %global version_rubygem_open4 1.3.4 -%global version_rubygem_rack 2.2.3.1 -%global version_rubygem_rack_protection 2.2.0 +%global version_rubygem_rack 2.2.6.2 +%global version_rubygem_rack_protection 2.2.4 %global version_rubygem_rack_test 1.1.0 %global version_rubygem_rexml 3.2.5 %global version_rubygem_ruby2_keywords 0.0.5 -%global version_rubygem_sinatra 2.2.0 +%global version_rubygem_sinatra 2.2.4 %global version_rubygem_thin 1.8.1 -%global version_rubygem_tilt 2.0.10 +%global version_rubygem_tilt 2.0.11 # javascript bundled libraries for old web-ui %global ember_version 1.4.0 @@ -387,7 +387,7 @@ pwd cp -r %{_builddir}/%{ui_src_name}/build ${RPM_BUILD_ROOT}%{_libdir}/%{pcsd_public_dir}/ui # prepare license files -# some rubygems do not have a license file (ruby2_keywords, thin) +# some rubygems do not have a license file (thin) mv %{rubygem_bundle_dir}/gems/backports-%{version_rubygem_backports}/LICENSE.txt backports_LICENSE.txt mv %{rubygem_bundle_dir}/gems/daemons-%{version_rubygem_daemons}/LICENSE daemons_LICENSE mv %{rubygem_bundle_dir}/gems/ethon-%{version_rubygem_ethon}/LICENSE ethon_LICENSE @@ -402,6 +402,7 @@ mv %{rubygem_bundle_dir}/gems/open4-%{version_rubygem_open4}/LICENSE open4_LICEN 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/rack-test-%{version_rubygem_rack_test}/MIT-LICENSE.txt rack-test_MIT-LICENSE.txt +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 @@ -537,6 +538,7 @@ remove_all_tests %license rack_MIT-LICENSE %license rack-protection_License %license rack-test_MIT-LICENSE.txt +%license ruby2_keywords_LICENSE %license sinatra_LICENSE %license tilt_COPYING %{python3_sitelib}/* @@ -579,6 +581,11 @@ remove_all_tests %license pyagentx_LICENSE.txt %changelog +* Thu Jan 26 2023 Michal Pospisil - 0.10.14-5.el8_7.2 +- Updated bundled rubygems: mustermann, rack, rack_protection, sinatra, tilt +- Added license for rubygem ruby2_keywords +- Resolves: rhbz#2159424 + * Mon Dec 19 2022 Michal Pospisil - 0.10.14-5.el8_7.1 - Fixed displaying of bool and integer values in `pcs resource config` command - Resolves: rhbz#2151577