From 95c510afa9b232a3be4dc62591322801e949b5ef Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Tue, 15 Nov 2022 10:41:52 -0500 Subject: [PATCH] import booth-1.0-251.5.bfb2f92.git.el9_1 --- ...3-1-unit-file-Remove-Alias-directive.patch | 30 +++++++++++++++++++ SPECS/booth.spec | 8 ++++- 2 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 SOURCES/bz2133833-1-unit-file-Remove-Alias-directive.patch diff --git a/SOURCES/bz2133833-1-unit-file-Remove-Alias-directive.patch b/SOURCES/bz2133833-1-unit-file-Remove-Alias-directive.patch new file mode 100644 index 0000000..f854248 --- /dev/null +++ b/SOURCES/bz2133833-1-unit-file-Remove-Alias-directive.patch @@ -0,0 +1,30 @@ +From dd090510d7fba88c41adc1b70804c1c79b036736 Mon Sep 17 00:00:00 2001 +From: Jan Friesse +Date: Tue, 27 Sep 2022 18:50:31 +0200 +Subject: [PATCH] unit file: Remove Alias directive + +Recent change in systemd made imposible to enable booth@.service any +longer - more details in BZ +https://bugzilla.redhat.com/show_bug.cgi?id=2128998. Solution is to +delete Alias directive. + +Signed-off-by: Jan Friesse +--- + conf/booth@.service.in | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/conf/booth@.service.in b/conf/booth@.service.in +index e516194..e4b8fbc 100644 +--- a/conf/booth@.service.in ++++ b/conf/booth@.service.in +@@ -8,7 +8,6 @@ ConditionFileNotEmpty=/etc/booth/%i.conf + Conflicts=pacemaker.service + + [Install] +-Alias=boothd + WantedBy=multi-user.target + + [Service] +-- +2.31.1 + diff --git a/SPECS/booth.spec b/SPECS/booth.spec index 57843b1..01e48a6 100644 --- a/SPECS/booth.spec +++ b/SPECS/booth.spec @@ -31,7 +31,7 @@ %global git_describe_str v1.0-251-gbfb2f924c07db823f5c934d1aafbc5181bb25148 # Set this to 1 when rebasing (changing git_describe_str) and increase otherwise -%global release 4 +%global release 5 # 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}) @@ -64,6 +64,7 @@ Url: https://github.com/%{github_owner}/%{name} Source0: https://github.com/%{github_owner}/%{name}/archive/%{booth_short_sha1}/%{booth_archive_name}.tar.gz Patch0: bz2111669-1-Revert-Refactor-main-substitute-is_auth_req-macro.patch Patch1: bz2111669-2-config-Add-enable-authfile-option.patch +Patch2: bz2133833-1-unit-file-Remove-Alias-directive.patch # direct build process dependencies BuildRequires: autoconf @@ -312,6 +313,11 @@ VERBOSE=1 make check %{_usr}/lib/ocf/resource.d/booth/sharedrsc %changelog +* Tue Oct 25 2022 Jan Friesse - 1.0-251.5.bfb2f92.git +- Resolves: rhbz#2133833 + +- unit file: Remove Alias directive + * Tue Aug 09 2022 Jan Friesse - 1.0-251.4.bfb2f92.git - Related: rhbz#2111669