From 053eaac99bc457a2b88165c4d6a66af4322011cf Mon Sep 17 00:00:00 2001
From: Benjamin Gilbert <bgilbert@redhat.com>
Date: Fri, 5 Feb 2021 17:39:51 -0500
Subject: [PATCH] Drop Git commit hash from Release

We've been using a release + patches workflow for a while now.
---
 .gitignore    |  1 +
 ignition.spec | 12 +++++-------
 sources       |  2 +-
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/.gitignore b/.gitignore
index 597c2c3..2d860cd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -52,3 +52,4 @@
 /ignition-db4d30d.tar.gz
 /ignition-c733d23.tar.gz
 /ignition-1d56dc8.tar.gz
+/ignition-2.9.0.tar.gz
diff --git a/ignition.spec b/ignition.spec
index 009665d..02ebb58 100644
--- a/ignition.spec
+++ b/ignition.spec
@@ -49,8 +49,6 @@
 # https://github.com/coreos/ignition
 %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo}
 %global import_path     %{provider_prefix}/v2
-%global commit          1d56dc8e717a10c1a8b392050bcb3d269cd42154
-%global shortcommit     %(c=%{commit}; echo ${c:0:7})
 # define ldflags, buildflags, testflags here. The ldflags were
 # taken from ./build. We will need to periodically check these
 # for consistency
@@ -61,11 +59,11 @@
 
 Name:           ignition
 Version:        2.9.0
-Release:        4.git%{shortcommit}%{?dist}
+Release:        4%{?dist}
 Summary:        First boot installer and configuration tool
 License:        ASL 2.0
 URL:            https://%{provider_prefix}
-Source0:        https://%{provider_prefix}/archive/%{commit}/%{repo}-%{shortcommit}.tar.gz
+Source0:        https://%{provider_prefix}/archive/v%{version}/%{repo}-%{version}.tar.gz
 # Fix AWS probing by using the IMDS token URL to ensure that networking is up
 # https://github.com/coreos/ignition/pull/1161
 Patch0:         internal-providers-aws-probe-the-IMDS-token-URL.patch 
@@ -445,9 +443,8 @@ building binaries to sign by Fedora release engineering and include on the
 Ignition project's Github releases page.
 
 %prep
-# setup command reference: http://ftp.rpm.org/max-rpm/s1-rpm-inside-macros.html
 # unpack source0 and apply patches
-%setup -T -b 0 -q -n %{repo}-%{commit}
+%setup -q
 %patch0 -p1
 
 %build
@@ -610,7 +607,8 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath}
 %endif
 
 %changelog
-* Fri Feb 05 2021 Benjamin Gilbert <bgilbert@redhat.com> - 2.9.0-4.git1d56dc8
+* Fri Feb 05 2021 Benjamin Gilbert <bgilbert@redhat.com> - 2.9.0-4
+- Drop Git commit hash from Release
 - Correctly enable IMDS patch
 - Set ExclusiveArch from %%go_arches
 
diff --git a/sources b/sources
index 2ef8e73..8a36460 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (ignition-1d56dc8.tar.gz) = 44e334128443f79f7b814a27df80288a204f2f24cb449fe43836bcb5e0c5e27f8065193d4a934cafc04221b2237f9a55695a1a7bd22158317fad1050321717c8
+SHA512 (ignition-2.9.0.tar.gz) = 714ae90fb32a45e1b21e0b0671e7933ce302cdd943cd02cfc221e8bf88269fb464ff5f740d54b444e5c341a3877bf2943ca6f2c2f1374df904386400d73ebe97