diff --git a/.gitignore b/.gitignore index 6bd612e..4c8b596 100644 --- a/.gitignore +++ b/.gitignore @@ -63,3 +63,8 @@ /pcs-0.10.3.tar.gz /tornado-6.0.3.tar.gz /pcs-0.10.4.tar.gz +/pcs-0.10.5.tar.gz +/pcs-web-ui-0.1.2.tar.gz +/pcs-web-ui-node-modules-0.1.2.tar.xz +/tilt-2.0.9.gem +/dacite-1.1.0.tar.gz diff --git a/pcs.spec b/pcs.spec index 1655d1b..3fb52c6 100644 --- a/pcs.spec +++ b/pcs.spec @@ -1,6 +1,6 @@ Name: pcs -Version: 0.10.4 -Release: 2%{?dist} +Version: 0.10.5 +Release: 1%{?dist} # https://fedoraproject.org/wiki/Licensing:Main?rd=Licensing#Good_Licenses # GPLv2: pcs # ASL 2.0: tornado @@ -14,14 +14,15 @@ 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.1 +%global ui_commit 0.1.2 %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.3 -%global rubygem_tilt_version 2.0.8 +%global dacite_version 1.1.0 +%global rubygem_tilt_version 2.0.9 # 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 @@ -54,6 +55,7 @@ Source11: https://rubygems.org/downloads/tilt-%{rubygem_tilt_version}.gem Source41: https://github.com/ondrejmular/pyagentx/archive/v%{pyagentx_version}/pyagentx-%{pyagentx_version}.tar.gz Source42: https://github.com/tornadoweb/tornado/archive/v%{tornado_version}/tornado-%{tornado_version}.tar.gz +Source44: https://github.com/konradhalas/dacite/archive/v%{dacite_version}/dacite-%{dacite_version}.tar.gz 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 @@ -128,6 +130,10 @@ Requires: rubygem-rack Requires: rubygem-rack-protection Requires: rubygem-rack-test Requires: rubygem-sinatra +# ruby and gems for pcsd-ruby +Requires: rubygem-daemons +Requires: rubygem-eventmachine +Requires: rubygem-thin # for killall Requires: psmisc # for working with certificates (validation etc.) @@ -151,6 +157,7 @@ Requires: liberation-sans-fonts Requires: overpass-fonts Provides: bundled(tornado) = %{tornado_version} +Provides: bundled(dacite) = %{dacite_version} Provides: bundled(rubygem-tilt) = %{rubygem_tilt_version} %description @@ -251,6 +258,12 @@ update_times %SOURCE42 `find %{bundled_src_dir}/tornado -follow` cp %{bundled_src_dir}/tornado/LICENSE tornado_LICENSE cp %{bundled_src_dir}/tornado/README.rst tornado_README.rst +# 7) sources for python dacite +tar -xzf %SOURCE44 -C %{bundled_src_dir} +mv %{bundled_src_dir}/dacite-%{dacite_version} %{bundled_src_dir}/dacite +cp %{bundled_src_dir}/dacite/LICENSE dacite_LICENSE +cp %{bundled_src_dir}/dacite/README.md dacite_README.md + %build %define debug_package %{nil} @@ -281,6 +294,7 @@ make install \ BASH_COMPLETION_DIR=%{_datadir}/bash-completion/completions \ 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` \ BUILD_GEMS=false \ SYSTEMCTL_OVERRIDE=true \ hdrdir="%{_includedir}" \ @@ -314,7 +328,9 @@ run_all_tests(){ # BUNDLED_LIB_LOCATION=$RPM_BUILD_ROOT%{pcs_libdir}/pcs/bundled/packages \ %{__python3} pcs_test/suite.py -v --vanilla \ - # --all-but \ + --all-but \ + pcs_test.tier0.daemon.app.test_app_remote.SyncConfigMutualExclusive.test_get_not_locked \ + pcs_test.tier0.daemon.app.test_app_remote.SyncConfigMutualExclusive.test_post_not_locked \ test_result_python=$? @@ -344,20 +360,30 @@ remove_all_tests() { run_all_tests remove_all_tests +%posttrans +# Make sure the new version of the daemon is runnning. +# Also, make sure to start pcsd-ruby if it hasn't been started or even +# installed before. This is done by restarting pcsd.service. +%{_bindir}/systemctl daemon-reload +%{_bindir}/systemctl try-restart pcsd.service + %post %systemd_post pcsd.service +%systemd_post pcsd-ruby.service %post -n %{pcs_snmp_pkg_name} %systemd_post pcs_snmp_agent.service %preun %systemd_preun pcsd.service +%systemd_preun pcsd-ruby.service %preun -n %{pcs_snmp_pkg_name} %systemd_preun pcs_snmp_agent.service %postun %systemd_postun_with_restart pcsd.service +%systemd_postun_with_restart pcsd-ruby.service %postun -n %{pcs_snmp_pkg_name} %systemd_postun_with_restart pcs_snmp_agent.service @@ -366,7 +392,9 @@ remove_all_tests %doc CHANGELOG.md %doc README.md %doc tornado_README.rst +%doc dacite_README.md %license tornado_LICENSE +%license dacite_LICENSE %license COPYING %{python3_sitelib}/pcs %{python3_sitelib}/pcs-%{version}-py3.*.egg-info @@ -376,7 +404,9 @@ remove_all_tests %{pcs_libdir}/pcsd/* %{pcs_libdir}/pcsd/.bundle/config %{pcs_libdir}/pcs/bundled/packages/tornado* +%{pcs_libdir}/pcs/bundled/packages/dacite* %{_unitdir}/pcsd.service +%{_unitdir}/pcsd-ruby.service %{_datadir}/bash-completion/completions/pcs %{_sharedstatedir}/pcsd %{_sysconfdir}/pam.d/pcsd @@ -398,6 +428,7 @@ remove_all_tests %exclude %{pcs_libdir}/pcsd/Makefile %exclude %{pcs_libdir}/pcsd/pcsd.conf %exclude %{pcs_libdir}/pcsd/pcsd.service +%exclude %{pcs_libdir}/pcsd/pcsd-ruby.service %exclude %{pcs_libdir}/pcsd/pcsd.8 %exclude %{pcs_libdir}/pcsd/public/js/dev/* %exclude %{python3_sitelib}/pcs/bash_completion @@ -418,6 +449,9 @@ remove_all_tests %license pyagentx_LICENSE.txt %changelog +* Wed Mar 18 2020 Miroslav Lisik - 0.10.5-1 +- Rebased to latest upstream sources (see CHANGELOG.md) + * Wed Jan 29 2020 Fedora Release Engineering - 0.10.4-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/sources b/sources index 14f7af3..22f0c11 100644 --- a/sources +++ b/sources @@ -1,7 +1,8 @@ SHA512 (pcsd-bundle-config-1) = f2a2df2dab39c2012cc6a91517716dde8f5a48788d1069c4addf619bc4dc45a98fd48f0f7964b5400e43e84fe96f942a550d2762553fea97e63dc7ad9b8be823 SHA512 (pyagentx-0.4.pcs.2.tar.gz) = d4194fec9a3e5fefe3793d49b7fec1feafef294c7e613a06046c2993daeefc5cb39d7c5b2b402ff83e49b2d976953f862264288c758c0be09d997b5323cc558a -SHA512 (tilt-2.0.8.gem) = 1767f2e5ce45afe95d84d32de7c2b6fe24ff7cb6f7ee8485d84344820b2f6e969ae60a6fbaa7141f7fe135c6540d96fa5b27fd8010b95c0ded5d049a315001d5 -SHA512 (pcs-web-ui-0.1.1.tar.gz) = 470356be3f934b078c10ac7027db9bc690511249909c3439c86ebbf93926e1047c128b8ec9e10d09f99b67d7657dfbf77f016bf2e6ddb32c97dccc5285dd7d64 -SHA512 (pcs-web-ui-node-modules-0.1.1.tar.xz) = 8d8d53ebeca697bce5085c539a27cac5a17a7eaf35ec69b6e1412f95d64a2f3c876e77996e3c1d8c1edb1ebaf7dd3e7638dbe4ce94533738428b34a72acb8d42 SHA512 (tornado-6.0.3.tar.gz) = 8caaa64d14edcb3993dffea3175685d82afb0068a8e8834cbb6eb9e15883fe113bb57cd98d99c25362bef0a6ee2762f2baf24effd645ecd77f035583cc4de756 -SHA512 (pcs-0.10.4.tar.gz) = 9a789ba2ab7ca4dc871e65a20837fdbc4254121c0f30658aee7eb8b69126c1701dddbe4cb994d1e1f7650d0c2449dd8e353ee04ba97eb715f0fab5c946c919b3 +SHA512 (pcs-0.10.5.tar.gz) = 38393f4ffec7c3062819cac099c9946eafec27326ac770af987f000f6617a417e04cf1ea209c3e6e1ca28b283822b448394325864d403af2fea140370f974e0e +SHA512 (pcs-web-ui-0.1.2.tar.gz) = 2fcb1c600cc644234036b47d7d277bb083945f3827c3f561d4301d901f2df579bf3f15da9f185ed3067951b76d17d102088d64aa921be2caa29d393d8342fb2a +SHA512 (pcs-web-ui-node-modules-0.1.2.tar.xz) = 48bc9e60170e8aedf744c57d78813b5a2e241a104c9a309f551aeaaa808f1a2bd77c6bae46a5833e1502a0bf222774b2604dfd4f75b4ddc461e50f49bf73f468 +SHA512 (tilt-2.0.9.gem) = 522b2b40ca1eefc7df66cb421c66734699a2ffb1e7d1797181c2718f7ca018d3376c1a2b3617b5d3549115af69108db4c3c4632e2682329d5baf24bfdae92b42 +SHA512 (dacite-1.1.0.tar.gz) = d7b1ce482584de3f4bc5c381cac054a7a7fd844e497b15e862f23b89b145d244bcf91eddb5a214e257822d362df19159ae379d71b1a7ff969790652905f7531f