From 157c0b0f889edd03ee500f86eeec9f31d5f5f61d Mon Sep 17 00:00:00 2001 From: Jan Friesse Date: Fri, 30 Sep 2022 16:41:47 +0200 Subject: [PATCH] Rebase to newest upstream snapshot Signed-off-by: Jan Friesse --- 0001-unit-file-Remove-Alias-directive.patch | 30 --------------------- booth.spec | 8 +++--- sources | 2 +- 3 files changed, 6 insertions(+), 34 deletions(-) delete mode 100644 0001-unit-file-Remove-Alias-directive.patch diff --git a/0001-unit-file-Remove-Alias-directive.patch b/0001-unit-file-Remove-Alias-directive.patch deleted file mode 100644 index 9457836..0000000 --- a/0001-unit-file-Remove-Alias-directive.patch +++ /dev/null @@ -1,30 +0,0 @@ -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.spec b/booth.spec index 386d09f..e5e3be0 100644 --- a/booth.spec +++ b/booth.spec @@ -28,10 +28,10 @@ # This will be used to fill booth_ver, booth_numcomm and booth_sha1. # It is important to keep abbrev to get full length sha1! When updating source use # `spectool -g booth.spec` to download source. -%global git_describe_str v1.0-266-gf288d5949073986a29d0286caec16c721e8e632a +%global git_describe_str v1.0-272-g7acb75787196c25e66a0f749f690888bad066bf4 # Set this to 1 when rebasing (changing git_describe_str) and increase otherwise -%global release 4 +%global release 1 # 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,7 +62,6 @@ 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 @@ -311,6 +310,9 @@ VERBOSE=1 make check %{_usr}/lib/ocf/resource.d/booth/sharedrsc %changelog +* Fri Sep 30 2022 Jan Friesse - 1.0-272.1.7acb757.git +- Rebase to newest upstream snapshot + * Thu Sep 29 2022 Jan Friesse - 1.0-266.4.f288d59.git - Remove Alias directive from booth@.service unit file diff --git a/sources b/sources index aa22c66..ea7b2c5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (booth-1.0-266-f288d59.tar.gz) = 83e62008c03497902787ca702a472890debdec8126848ac6fed164a925d7cfa57c3db173e045e34942723c3814cbe1fc91ad3de3c9a4b4988c27005f799942fc +SHA512 (booth-1.0-272-7acb757.tar.gz) = 08d8930e7a14756ddc18ff5bcbe7e51496826df0cdb744941107fb6f1b6c05eefc909f12fcb269076a5ecc1d38f4ad35c40f022cccc66e685be99408371310d9