From 1a7d95a76a1a834e9871825efecd394394bb7bc9 Mon Sep 17 00:00:00 2001 From: jxy_git Date: Tue, 28 Feb 2023 16:44:34 +0800 Subject: [PATCH] Delete the error macro (cherry picked from commit 069bef5de703066b3c0aae0352f1ca50fe1231c9) --- booth.spec | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/booth.spec b/booth.spec index c8090e1..7621634 100644 --- a/booth.spec +++ b/booth.spec @@ -10,7 +10,7 @@ %global git_describe_str v1.0-283-g9d4029aa14323a7f3b496215d25e40bd14f33632 # 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 %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_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 %global _python_bytecompile_extra 0 @@ -237,8 +233,8 @@ VERBOSE=1 make check %dir %{_sysconfdir}/booth %exclude %{_sysconfdir}/booth/booth.conf.example -%dir %attr (750, %{uname}, %{gname}) %{_var}/lib/booth/ -%dir %attr (750, %{uname}, %{gname}) %{_var}/lib/booth/cores +%dir %attr (750, hacluster, haclient) %{_var}/lib/booth/ +%dir %attr (750, hacluster, haclient) %{_var}/lib/booth/cores %files arbitrator %{_unitdir}/booth@.service @@ -268,6 +264,9 @@ VERBOSE=1 make check %{_usr}/lib/ocf/resource.d/booth/sharedrsc %changelog +* Tue Feb 28 2023 jiangxinyu - 1.0-7 +- Delete the error macro + * Tue Feb 07 2023 jiangxinyu - 1.0-6 - Rebase to newest upstream snapshot -- Gitee