From 1a9d12c92e923ef7a93e9008008d2128cc7ff9ac Mon Sep 17 00:00:00 2001
From: eabdullin <ed.abdullin.1@gmail.com>
Date: Fri, 31 May 2024 16:29:53 +0000
Subject: [PATCH] Import from AlmaLinux stable repository

---
 .booth.metadata  |  1 -
 .gitignore       |  2 +-
 SPECS/booth.spec | 31 +++++++++++--------------------
 3 files changed, 12 insertions(+), 22 deletions(-)
 delete mode 100644 .booth.metadata

diff --git a/.booth.metadata b/.booth.metadata
deleted file mode 100644
index 0abddfe..0000000
--- a/.booth.metadata
+++ /dev/null
@@ -1 +0,0 @@
-1fe5851af81995b4187b6c24ffbb9e8edead7060 SOURCES/booth-1.0-283-9d4029a.tar.gz
diff --git a/.gitignore b/.gitignore
index 9cc4d95..776a303 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/booth-1.0-283-9d4029a.tar.gz
+SOURCES/booth-1.1.tar.gz
diff --git a/SPECS/booth.spec b/SPECS/booth.spec
index 59d2baf..277abda 100644
--- a/SPECS/booth.spec
+++ b/SPECS/booth.spec
@@ -24,22 +24,6 @@
 %bcond_with run_build_tests
 %bcond_without 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,13 @@ 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-15265
+
+- New upstream release (RHEL-15265)
+- Upstream releases should now be released regularly, so convert spec
+  to use them instead of git snapshots (RHEL-15265)
+
 * Mon Nov 21 2022 Jan Friesse <jfriesse@redhat.com> - 1.0-283.1.9d4029a.git
 - Resolves: rhbz#2135865