!5 Fix booth@.service missing instance name
From: @jxy_git Reviewed-by: @yangzhao_kl Signed-off-by: @yangzhao_kl
This commit is contained in:
commit
53d91f2c51
16
booth.spec
16
booth.spec
@ -4,7 +4,7 @@
|
||||
# Disable automatic compilation of Python files in extra directories
|
||||
%global _python_bytecompile_extra 0
|
||||
|
||||
%global specver 3
|
||||
%global specver 4
|
||||
%global boothver 1.0
|
||||
# set following to the actual commit or, for final release, concatenate
|
||||
# "boothver" macro to "v" (will yield a tag per the convention)
|
||||
@ -36,9 +36,9 @@
|
||||
|
||||
Name: booth
|
||||
Version: %{boothver}
|
||||
Release: %{boothrel}%{dist}.2
|
||||
Release: %{boothrel}.2
|
||||
Summary: Ticket Manager for Multi-site Clusters
|
||||
License: GPLv2 and MIT
|
||||
License: GPLv2+ and MIT
|
||||
Url: https://github.com/%{github_owner}/%{name}
|
||||
Source0: https://github.com/%{github_owner}/%{name}/archive/%{commit}/%{name}-%{shortcommit}.tar.gz
|
||||
Patch0: 0000-test-remove-superfluous-shebangs-for-import-only-mod.patch
|
||||
@ -124,10 +124,10 @@ as an arbitrator.
|
||||
%systemd_post booth@.service booth-arbitrator.service
|
||||
|
||||
%preun arbitrator
|
||||
%systemd_preun booth@.service booth-arbitrator.service
|
||||
%systemd_preun booth-arbitrator.service
|
||||
|
||||
%postun arbitrator
|
||||
%systemd_postun_with_restart booth@.service booth-arbitrator.service
|
||||
%systemd_postun_with_restart booth-arbitrator.service
|
||||
|
||||
%package site
|
||||
Summary: Booth support for running as a full-fledged site
|
||||
@ -187,6 +187,8 @@ install -D -m 644 -t %{buildroot}/%{_mandir}/man8 \
|
||||
ln -s boothd.8 %{buildroot}/%{_mandir}/man8/booth.8
|
||||
cp -a -t %{buildroot}/%{_pkgdocdir} \
|
||||
-- ChangeLog README-testing conf/booth.conf.example
|
||||
install -d -m 0755 $RPM_BUILD_ROOT%_sysconfdir/booth
|
||||
install -D -m 0644 -p conf/booth.conf.example $RPM_BUILD_ROOT%_sysconfdir/booth/booth.conf
|
||||
# drop what we don't package anyway (COPYING added via tarball-relative path)
|
||||
rm -rf %{buildroot}/%{_initrddir}/booth-arbitrator
|
||||
rm -rf %{buildroot}/%{_pkgdocdir}/README.upgrade-from-v0.1
|
||||
@ -220,6 +222,7 @@ VERBOSE=1 make check
|
||||
# configuration
|
||||
%dir %{_sysconfdir}/booth
|
||||
%exclude %{_sysconfdir}/booth/booth.conf.example
|
||||
%{_sysconfdir}/booth/booth.conf
|
||||
|
||||
%files arbitrator
|
||||
%{_unitdir}/booth@.service
|
||||
@ -249,5 +252,8 @@ VERBOSE=1 make check
|
||||
/usr/lib/ocf/resource.d/booth/sharedrsc
|
||||
|
||||
%changelog
|
||||
* Mon Feb 28 2022 jiangxinyu <jiangxinyu@kylinos.cn> - 1.0-4
|
||||
- Fix booth@.service missing instance name.
|
||||
|
||||
* Fri Oct 30 2020 jiangxinyu <jiangxinyu@kylinos.cn> - 1.0-3
|
||||
- Init booth project
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user