From 86fe1dc8aed9a3aec00f5e35e7c93f399baffa82 Mon Sep 17 00:00:00 2001
From: Lokesh Mandvekar <lsm5@fedoraproject.org>
Date: Thu, 5 Aug 2021 14:34:08 -0400
Subject: [PATCH] buildah-1.22.0-1

- bump to v1.22.0

Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
---
 .gitignore   |  1 +
 buildah.spec | 15 +++++++--------
 sources      |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/.gitignore b/.gitignore
index 89b6a70..9d28040 100644
--- a/.gitignore
+++ b/.gitignore
@@ -673,3 +673,4 @@
 /buildah-802a904.tar.gz
 /buildah-6d5d1ae.tar.gz
 /buildah-ec35bc4.tar.gz
+/v1.22.0.tar.gz
diff --git a/buildah.spec b/buildah.spec
index fc39a9d..5ed2d78 100644
--- a/buildah.spec
+++ b/buildah.spec
@@ -24,19 +24,17 @@
 # https://github.com/containers/buildah
 %global import_path %{provider}.%{provider_tld}/%{project}/%{repo}
 %global git0 https://%{import_path}
-%global commit0 ec35bc428a4b19a4a6892845644aa48aa577739e
-%global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
 
-%define built_tag v1.21.4
+%define built_tag v1.22.0
 %define built_tag_strip %(b=%{built_tag}; echo ${b:1})
 
 Name: %{repo}
 Version: 1.22.0
-Release: 0.15.dev.git%{shortcommit0}%{?dist}
+Release: 1%{?dist}
 Summary: A command line tool used for creating OCI Images
 License: ASL 2.0
 URL: https://%{name}.io
-Source: %{git0}/archive/%{commit0}/%{name}-%{shortcommit0}.tar.gz
+Source: %{git0}/archive/%{built_tag}.tar.gz
 BuildRequires: device-mapper-devel
 BuildRequires: golang >= 1.16.6
 BuildRequires: git
@@ -95,9 +93,7 @@ Requires: nmap-ncat
 This package contains system tests for %{name}
 
 %prep
-%autosetup -Sgit -n %{name}-%{commit0}
-sed -i 's/GOMD2MAN =/GOMD2MAN ?=/' docs/Makefile
-sed -i '/docs install/d' Makefile
+%autosetup -Sgit -n %{name}-%{built_tag_strip}
 
 %build
 mkdir _build
@@ -159,6 +155,9 @@ cp bin/copy    %{buildroot}/%{_bindir}/%{name}-copy
 %{_datadir}/%{name}/test
 
 %changelog
+* Thu Aug 05 2021 Lokesh Mandvekar <lsm5@fedoraproject.org> - 1.22.0-1
+- bump to v1.22.0
+
 * Mon Aug 02 2021 Lokesh Mandvekar <lsm5@fedoraproject.org> - 1.22.0-0.15.dev.gitec35bc4
 - Resolves: #1983596, #1987738 - Security fix for CVE-2021-34558
 
diff --git a/sources b/sources
index 98402c0..26e82f0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (buildah-ec35bc4.tar.gz) = aff2c9b3a6dce1691d211e92aca0a59adeb52331a18e7b26230513f4e929ae299810af013a40c1e85d7060de264bedbc5a6c56d9337433189b14d49648d08a2a
+SHA512 (v1.22.0.tar.gz) = 372ba3740f22af82aac07d51b48737168061a25d7d5ab1db63a381833211dd967aefb36f80cc97a4770a04d8b95a7fe9d3a892c091a82f85579e993b403b270b