From e5a92625e9892334a6869344c5b989956bcdfb19 Mon Sep 17 00:00:00 2001 From: Jan Friesse Date: Thu, 15 Oct 2020 14:08:05 +0200 Subject: [PATCH] New upstream release Update to current snapshot (commit dd88847) to fix testsuite, use autotools generated makefiles and other improvements Signed-off-by: Jan Friesse --- booth.spec | 20 ++++++++++++++++---- sources | 2 +- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/booth.spec b/booth.spec index 7bb4d9d..6eaf60a 100644 --- a/booth.spec +++ b/booth.spec @@ -27,7 +27,7 @@ # 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-199-gac1d34ce172678a8f5ba415e976cf2366d45e15e +%global git_describe_str v1.0-237-gdd88847c8e7c55f18ace774cf70545aa137bd296 # Set this to 1 when rebasing (changing git_describe_str) and increase otherwise %global release 1 @@ -61,8 +61,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 -Patch0: 0001-build-Do-not-link-with-pcmk-libraries.patch -Patch1: 0002-test-Add-compatibility-with-iproute-ss-command.patch # direct build process dependencies BuildRequires: autoconf @@ -197,7 +195,7 @@ Automated tests for running Booth, ticket manager for multi-site clusters. --with-initddir=%{_initrddir} \ --docdir=%{_pkgdocdir} \ --enable-user-flags \ - %{!?with_html_man:--without-html_man} \ + %{?with_html_man:--with-html_man} \ %{!?with_glue:--without-glue} \ PYTHON=%{__python3} %{make_build} @@ -264,6 +262,12 @@ VERBOSE=1 make check %dir %attr (750, %{uname}, %{gname}) %{_var}/lib/booth/ %dir %attr (750, %{uname}, %{gname}) %{_var}/lib/booth/cores +# Generated html docs +%if 0%{?with_html_man} +%{_pkgdocdir}/booth-keygen.8.html +%{_pkgdocdir}/boothd.8.html +%endif + %files arbitrator %{_unitdir}/booth@.service %{_unitdir}/booth-arbitrator.service @@ -284,6 +288,11 @@ VERBOSE=1 make check %dir %{_datadir}/booth %{_datadir}/booth/service-runnable +# Generated html docs +%if 0%{?with_html_man} +%{_pkgdocdir}/geostore.8.html +%endif + %files test %doc %{_pkgdocdir}/README-testing # /usr/share/booth provided by -site @@ -292,6 +301,9 @@ VERBOSE=1 make check %{_usr}/lib/ocf/resource.d/booth/sharedrsc %changelog +* Thu Oct 15 2020 Jan Friesse - 1.0-237.1.dd88847.git +- Rebase to newest upstream snapshot + * Thu Oct 15 2020 Jan Friesse - 1.0-199.1.ac1d34c.git - Implement new versioning scheme diff --git a/sources b/sources index 8a5f453..ad2c144 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (booth-1.0-199-ac1d34c.tar.gz) = 557bc42faceee65b272fefea6eaa8a6b2895f497fd0e20f2d29b15a967dc860cc0a518bae1c346fe5679714eb7b33ed14ff79ee087932c568b099529ec57fcfe +SHA512 (booth-1.0-237-dd88847.tar.gz) = 889e67b3ce0d35800030f289eb9bca6d282ed75ab4def44910e35a1aa7b1bd9b1ccc65347222206542e1f7f49814a84e22e46dc004a0b19634a91954b0f89f88