From 37a204466581952664aa4d6d27660e4f45544e4d Mon Sep 17 00:00:00 2001
From: Jan Friesse <jfriesse@redhat.com>
Date: Thu, 23 Nov 2023 13:57:46 +0100
Subject: [PATCH] - Resolves: RHEL-15268 - Resolves: RHEL-7029

- New upstream release (RHEL-15268)
- Upstream releases should now be released regularly, so convert spec
  to use them instead of git snapshots (RHEL-15268)
- Fix exit code on grant/revoke command error (RHEL-7029)

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

diff --git a/booth.spec b/booth.spec
index f4a9b4e..a64fbc4 100644
--- a/booth.spec
+++ b/booth.spec
@@ -24,22 +24,6 @@
 %bcond_with run_build_tests
 %bcond_with include_unit_test
 
-# set following to the result of  `git describe --abbrev=128 $commit`
-# 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-283-g9d4029aa14323a7f3b496215d25e40bd14f33632
-
-# Set this to 1 when rebasing (changing git_describe_str) and increase otherwise
-%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})
-%global booth_numcomm %(s=%{git_describe_str}; t=${s#*-}; echo ${t%%%%-*})
-%global booth_sha1 %(s=%{git_describe_str}; t=${s##*-}; echo ${t:1})
-%global booth_short_sha1 %(s=%{booth_sha1}; echo ${s:0:7})
-%global booth_archive_name %{name}-%{booth_ver}-%{booth_numcomm}-%{booth_short_sha1}
-
 ## User and group to use for nonprivileged services (should be in sync with pacemaker)
 %global uname hacluster
 %global gname haclient
@@ -56,12 +40,12 @@
 %global test_path   %{_datadir}/booth/tests
 
 Name:           booth
-Version:        %{booth_ver}
-Release:        %{booth_numcomm}.%{release}.%{booth_short_sha1}.git%{?dist}
+Version:        1.1
+Release:        1%{?dist}
 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
+Source0:        https://github.com/%{github_owner}/%{name}/releases/download/v%{version}/%{name}-%{version}.tar.gz
 Patch0:         rhel-specific-0001-config-Add-enable-authfile-option.patch
 
 # direct build process dependencies
@@ -193,7 +177,7 @@ Automated tests for running Booth, ticket manager for multi-site clusters.
 # BUILD #
 
 %prep
-%autosetup -n %{name}-%{booth_sha1} -S git_am
+%autosetup -n %{name}-%{version} -S git_am
 
 %build
 ./autogen.sh
@@ -311,6 +295,15 @@ VERBOSE=1 make check
 %{_usr}/lib/ocf/resource.d/booth/sharedrsc
 
 %changelog
+* Thu Nov 23 2023 Jan Friesse <jfriesse@redhat.com> - 1.1-1
+- Resolves: RHEL-15268
+- Resolves: RHEL-7029
+
+- New upstream release (RHEL-15268)
+- Upstream releases should now be released regularly, so convert spec
+  to use them instead of git snapshots (RHEL-15268)
+- Fix exit code on grant/revoke command error (RHEL-7029)
+
 * Mon Nov 21 2022 Jan Friesse <jfriesse@redhat.com> - 1.0-283.1.9d4029a.git
 - Resolves: rhbz#2135866
 
diff --git a/sources b/sources
index 7e9c107..a79876c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (booth-1.0-283-9d4029a.tar.gz) = 628a3e1e128d0fdcd4600d8d4b46220363575bda83c85cd43bfe940a2a29a9176490342261354138f8d4c593b611cf0282653c1e4b3d4b4841d99ef31ba45ada
+SHA512 (booth-1.1.tar.gz) = dacc3258dd9a5f0dd72406eae753fb4900922bd2d906817a28c9ece7d7a1caaf5fd16959f8dff450382105358f2898c594171ae229ccd94e4d07f49668b0410d