From 6bae2bb3f75bd8962455fdc32bc2a87694392215 Mon Sep 17 00:00:00 2001
From: Jan Friesse <jfriesse@redhat.com>
Date: Fri, 7 Jun 2024 17:54:27 +0200
Subject: [PATCH] - Resolves: RHEL-22016 - Resolves: RHEL-40410

- New upstream release (RHEL-40410)
- Add support for GnuTLS and stop using libgcrypt (RHEL-22016)

Signed-off-by: Jan Friesse <jfriesse@redhat.com>
---
 booth.spec | 21 ++++++++++-----------
 sources    |  2 +-
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/booth.spec b/booth.spec
index 6f7068f..526f7ce 100644
--- a/booth.spec
+++ b/booth.spec
@@ -22,7 +22,6 @@
 %bcond_with html_man
 %bcond_with glue
 %bcond_with run_build_tests
-%bcond_with include_unit_test
 
 ## User and group to use for nonprivileged services (should be in sync with pacemaker)
 %global uname hacluster
@@ -40,8 +39,8 @@
 %global test_path   %{_datadir}/booth/tests
 
 Name:           booth
-Version:        1.1
-Release:        3%{?dist}
+Version:        1.2
+Release:        1%{?dist}
 Summary:        Ticket Manager for Multi-site Clusters
 License:        GPL-2.0-or-later
 Url:            https://github.com/%{github_owner}/%{name}
@@ -59,7 +58,7 @@ BuildRequires:  asciidoctor
 BuildRequires:  gcc
 BuildRequires:  pkgconfig
 # linking dependencies
-BuildRequires:  libgcrypt-devel
+BuildRequires:  gnutls-devel
 BuildRequires:  libxml2-devel
 ## just for <pacemaker/crm/services.h> include
 BuildRequires:  pacemaker-libs-devel
@@ -164,9 +163,6 @@ Requires:       %{name}-arbitrator = %{version}-%{release}
 Requires:       %{name}-site = %{version}-%{release}
 Requires:       gdb
 Requires:       %{__python3}
-%if 0%{?with_include_unit_test}
-Requires:       python3-pexpect
-%endif
 # runtests.py suite (for perl and ss)
 Requires:       perl-interpreter iproute
 
@@ -208,10 +204,6 @@ mkdir -p %{buildroot}/%{test_path}
 # Copy tests from tarball
 cp -a -t %{buildroot}/%{test_path} \
         -- conf test
-%if 0%{?with_include_unit_test}
-cp -a -t %{buildroot}/%{test_path} \
-        -- unit-tests script/unit-test.py
-%endif
 chmod +x %{buildroot}/%{test_path}/test/booth_path
 chmod +x %{buildroot}/%{test_path}/test/live_test.sh
 mkdir -p %{buildroot}/%{test_path}/src
@@ -294,6 +286,13 @@ VERBOSE=1 make check
 %{_usr}/lib/ocf/resource.d/booth/sharedrsc
 
 %changelog
+* Fri Jun 07 2024 Jan Friesse <jfriesse@redhat.com> - 1.2-1
+- Resolves: RHEL-22016
+- Resolves: RHEL-40410
+
+- New upstream release (RHEL-40410)
+- Add support for GnuTLS and stop using libgcrypt (RHEL-22016)
+
 * Tue Jan 23 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
 
diff --git a/sources b/sources
index a79876c..67b588e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (booth-1.1.tar.gz) = dacc3258dd9a5f0dd72406eae753fb4900922bd2d906817a28c9ece7d7a1caaf5fd16959f8dff450382105358f2898c594171ae229ccd94e4d07f49668b0410d
+SHA512 (booth-1.2.tar.gz) = b63217e561fd5e8ede1ba432ec6b4ef6efb73dc16a501814cf07b82f87a23c3f734ebf09c56a5d521668ee57ed02be48d257aabb1d2e3c4840f1219ef13d3fde