From 7052067601860135e003552ac6e96af1d6529395 Mon Sep 17 00:00:00 2001
From: Jan Friesse <jfriesse@redhat.com>
Date: Thu, 15 Oct 2020 13:49:37 +0200
Subject: [PATCH] Implement new versioning scheme

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

diff --git a/booth.spec b/booth.spec
index e416b77..7bb4d9d 100644
--- a/booth.spec
+++ b/booth.spec
@@ -23,6 +23,22 @@
 %bcond_with glue
 %bcond_with run_build_tests
 
+# 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-199-gac1d34ce172678a8f5ba415e976cf2366d45e15e
+
+# 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
@@ -30,30 +46,8 @@
 # Disable automatic compilation of Python files in extra directories
 %global _python_bytecompile_extra 0
 
-%global specver 6
-%global boothver 1.0
-# set following to the actual commit or, for final release, concatenate
-# "boothver" macro to "v" (will yield a tag per the convention)
-%global commit ac1d34ce172678a8f5ba415e976cf2366d45e15e
-%global lparen (
-%global rparen )
-%global shortcommit %(c=%{commit}; case ${c} in
-                      v*%{rparen} echo ${c:1};;
-                      *%{rparen} echo ${c:0:7};; esac)
-%global pre_release %(s=%{shortcommit}; [ ${s: -3:2} != rc ]; echo $?)
-%global post_release %([ %{commit} = v%{shortcommit} ]; echo $?)
 %global github_owner ClusterLabs
 
-%if 0%{pre_release}
-%global boothrel    0.%{specver}.%(s=%{shortcommit}; echo ${s: -3})
-%else
-%if 0%{post_release}
-%global boothrel    %{specver}.%{shortcommit}.git
-%else
-%global boothrel    %{specver}
-%endif
-%endif
-
 %{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}}
 # https://fedoraproject.org/wiki/EPEL:Packaging?rd=Packaging:EPEL#The_.25license_tag
 %{!?_licensedir:%global license %doc}
@@ -61,12 +55,12 @@
 %global test_path   %{_datadir}/booth/tests
 
 Name:           booth
-Version:        %{boothver}
-Release:        %{boothrel}%{?dist}.5
+Version:        %{booth_ver}
+Release:        %{booth_numcomm}.%{release}.%{booth_short_sha1}.git%{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/%{commit}/%{name}-%{shortcommit}.tar.gz
+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
 
@@ -195,7 +189,7 @@ Automated tests for running Booth, ticket manager for multi-site clusters.
 # BUILD #
 
 %prep
-%autosetup -n %{name}-%{commit} -S git_am
+%autosetup -n %{name}-%{booth_sha1} -S git_am
 
 %build
 ./autogen.sh
@@ -298,6 +292,9 @@ VERBOSE=1 make check
 %{_usr}/lib/ocf/resource.d/booth/sharedrsc
 
 %changelog
+* Thu Oct 15 2020 Jan Friesse <jfriesse@redhat.com> - 1.0-199.1.ac1d34c.git
+- Implement new versioning scheme
+
 * Tue Sep 29 2020 Jan Friesse <jfriesse@redhat.com> - 1.0-6.ac1d34c.git.5
 - Remove net-tools (netstat) dependency and replace it with iproute (ss)
 - Disable running tests during build by default (conditional run_build_tests)
diff --git a/sources b/sources
index 750160d..8a5f453 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (booth-ac1d34c.tar.gz) = 557bc42faceee65b272fefea6eaa8a6b2895f497fd0e20f2d29b15a967dc860cc0a518bae1c346fe5679714eb7b33ed14ff79ee087932c568b099529ec57fcfe
+SHA512 (booth-1.0-199-ac1d34c.tar.gz) = 557bc42faceee65b272fefea6eaa8a6b2895f497fd0e20f2d29b15a967dc860cc0a518bae1c346fe5679714eb7b33ed14ff79ee087932c568b099529ec57fcfe