packages/booth
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Delete the error macro

Browse Source 
(cherry picked from commit 069bef5de703066b3c0aae0352f1ca50fe1231c9)
This commit is contained in:
jxy_git 2023-02-28 16:44:34 +08:00 committed by openeuler-sync-bot
parent cbf9426258
commit 1a7d95a76a
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
booth.spec
View File

@ -10,7 +10,7 @@
%global git_describe_str v1.0-283-g9d4029aa14323a7f3b496215d25e40bd14f33632 %global git_describe_str v1.0-283-g9d4029aa14323a7f3b496215d25e40bd14f33632
# Set this to 1 when rebasing (changing git_describe_str) and increase otherwise # Set this to 1 when rebasing (changing git_describe_str) and increase otherwise
%global release 6 %global release 7
# Run shell script to parse git_describe str into version, numcomm and sha1 hash # Run shell script to parse git_describe str into version, numcomm and sha1 hash
%global booth_ver %(s=%{git_describe_str}; vver=${s%%%%-*}; echo ${vver:1}) %global booth_ver %(s=%{git_describe_str}; vver=${s%%%%-*}; echo ${vver:1})
@ -19,10 +19,6 @@
%global booth_short_sha1 %(s=%{booth_sha1}; echo ${s:0:7}) %global booth_short_sha1 %(s=%{booth_sha1}; echo ${s:0:7})
%global booth_archive_name %{name}-%{booth_ver}-%{booth_numcomm}-%{booth_short_sha1} %global booth_archive_name %{name}-%{booth_ver}-%{booth_numcomm}-%{booth_short_sha1}
## User and group to use for nonprivileged services (should be in sync with pacemaker)
%global uname hacluster
%global gname haclient
# Disable automatic compilation of Python files in extra directories # Disable automatic compilation of Python files in extra directories
%global _python_bytecompile_extra 0 %global _python_bytecompile_extra 0
@ -237,8 +233,8 @@ VERBOSE=1 make check
%dir %{_sysconfdir}/booth %dir %{_sysconfdir}/booth
%exclude %{_sysconfdir}/booth/booth.conf.example %exclude %{_sysconfdir}/booth/booth.conf.example
%dir %attr (750, %{uname}, %{gname}) %{_var}/lib/booth/ %dir %attr (750, hacluster, haclient) %{_var}/lib/booth/
%dir %attr (750, %{uname}, %{gname}) %{_var}/lib/booth/cores %dir %attr (750, hacluster, haclient) %{_var}/lib/booth/cores
%files arbitrator %files arbitrator
%{_unitdir}/booth@.service %{_unitdir}/booth@.service
@ -268,6 +264,9 @@ VERBOSE=1 make check
%{_usr}/lib/ocf/resource.d/booth/sharedrsc %{_usr}/lib/ocf/resource.d/booth/sharedrsc
%changelog %changelog
* Tue Feb 28 2023 jiangxinyu <jiangxinyu@kylinos.cn> - 1.0-7
- Delete the error macro
* Tue Feb 07 2023 jiangxinyu <jiangxinyu@kylinos.cn> - 1.0-6 * Tue Feb 07 2023 jiangxinyu <jiangxinyu@kylinos.cn> - 1.0-6
- Rebase to newest upstream snapshot - Rebase to newest upstream snapshot