diff --git a/0001-unit-file-Remove-Alias-directive.patch b/0001-unit-file-Remove-Alias-directive.patch new file mode 100644 index 0000000..9457836 --- /dev/null +++ b/0001-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.27.0 + diff --git a/booth.rpmlintrc b/booth.rpmlintrc index ae1945c..a123536 100644 --- a/booth.rpmlintrc +++ b/booth.rpmlintrc @@ -17,7 +17,7 @@ addFilter(r'booth-(site|test)\.[^:]+: (W|E): only-non-binary-in-usr-lib') # dangling symlink is ok for geostore and boothd (they actually points to booth binary) addFilter(r'booth-site\.[^:]+: (W|E): dangling-symlink /usr/sbin/geostore /usr/sbin/boothd') -addFilter(r'booth-test\.[^:]+: (W|E): dangling-symlink /usr/share/booth/tests/src/boothd /usr/sbin/boothd') +#addFilter(r'booth-test\.[^:]+: (W|E): dangling-symlink /usr/share/booth/tests/src/boothd /usr/sbin/boothd') # booth unit test is distributed non-executable by upstream -addFilter(r'booth-test\.[^:]+: (W|E): non-executable-script /usr/share/booth/tests/unit-test.py') +#addFilter(r'booth-test\.[^:]+: (W|E): non-executable-script /usr/share/booth/tests/unit-test.py') diff --git a/booth.spec b/booth.spec index 1153645..386d09f 100644 --- a/booth.spec +++ b/booth.spec @@ -31,7 +31,7 @@ %global git_describe_str v1.0-266-gf288d5949073986a29d0286caec16c721e8e632a # Set this to 1 when rebasing (changing git_describe_str) and increase otherwise -%global release 3 +%global release 4 # 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}) @@ -62,6 +62,7 @@ Summary: Ticket Manager for Multi-site Clusters License: GPLv2+ Url: https://github.com/%{github_owner}/%{name} Source0: https://github.com/%{github_owner}/%{name}/archive/%{booth_short_sha1}/%{booth_archive_name}.tar.gz +Patch1: 0001-unit-file-Remove-Alias-directive.patch # direct build process dependencies BuildRequires: autoconf @@ -310,6 +311,9 @@ VERBOSE=1 make check %{_usr}/lib/ocf/resource.d/booth/sharedrsc %changelog +* Thu Sep 29 2022 Jan Friesse - 1.0-266.4.f288d59.git +- Remove Alias directive from booth@.service unit file + * Tue Aug 09 2022 Jan Friesse - 1.0-266.3.f288d59.git - Remove template unit from systemd_(post|preun|postun_with_restart) macro