From 5df3cedc249e6ebccc1b5e8257844586e59188a9 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Aug 25 2021 00:13:50 +0000
Subject: import buildah-1.22.3-1.module+el8.5.0+12332+af0a4708


---

diff --git a/.buildah.metadata b/.buildah.metadata
index 92e90fd..d9cc732 100644
--- a/.buildah.metadata
+++ b/.buildah.metadata
@@ -1 +1 @@
-bbca40797b29c45ddd56049f57e086a6050ade25 SOURCES/release-1.22-71b8003.tar.gz
+355ae0762c4297e16a575211827f6cdc97983249 SOURCES/v1.22.3.tar.gz
diff --git a/.gitignore b/.gitignore
index 1b6e190..1dc2479 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/release-1.22-71b8003.tar.gz
+SOURCES/v1.22.3.tar.gz
diff --git a/SPECS/buildah.spec b/SPECS/buildah.spec
index d2590aa..9864ab1 100644
--- a/SPECS/buildah.spec
+++ b/SPECS/buildah.spec
@@ -11,24 +11,25 @@ go build -buildmode pie -compiler gc -tags="rpm_crashtraceback libtrust_openssl 
 %endif
 
 %global import_path github.com/containers/buildah
-%global branch release-1.22
-%global commit0 71b8003a3505fcaa2a53f80997cea09507035e7e
-%global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
+#%%global branch release-1.22
+#%%global commit0 98960f20299ffad367603f1fbd87054f7862a97f
+#%%global shortcommit0 %%(c=%%{commit0}; echo ${c:0:7})
 
 Name: buildah
-Version: 1.22.0
-Release: 2%{?dist}
+Version: 1.22.3
+Release: 1%{?dist}
 Summary: A command line tool used for creating OCI Images
 License: ASL 2.0
 URL: https://%{name}.io
 # https://fedoraproject.org/wiki/PackagingDrafts/Go#Go_Language_Architectures
 ExclusiveArch: %{go_arches}
-%if 0%{?branch:1}
-Source0: https://%{import_path}/tarball/%{commit0}/%{branch}-%{shortcommit0}.tar.gz
-%else
-Source0: https://%{import_path}/archive/%{commit0}/%{name}-%{version}-%{shortcommit0}.tar.gz
-%endif
-BuildRequires: golang >= 1.12.12-4
+#%%if 0%%{?branch:1}
+#Source0: https://%%{import_path}/tarball/%%{commit0}/%%{branch}-%%{shortcommit0}.tar.gz
+#%%else
+#Source0: https://%%{import_path}/archive/%%{commit0}/%%{name}-%%{version}-%%{shortcommit0}.tar.gz
+#%%endif
+Source0: https://%{import_path}/archive/v%{version}.tar.gz
+BuildRequires: golang >= 1.16.6
 BuildRequires: git
 BuildRequires: glib2-devel
 BuildRequires: libseccomp-devel
@@ -70,11 +71,12 @@ Requires: nmap-ncat
 This package contains system tests for %{name}
 
 %prep
-%if 0%{?branch:1}
-%autosetup -Sgit -n containers-%{name}-%{shortcommit0}
-%else
-%autosetup -Sgit -n %{name}-%{commit0}
-%endif
+#%%if 0%{?branch:1}
+#%%autosetup -Sgit -n containers-%{name}-%{shortcommit0}
+#%%else
+#%%autosetup -Sgit -n %{name}-%{commit0}
+#%%endif
+%autosetup -Sgit -n %{name}-%{version}
 sed -i 's/GOMD2MAN =/GOMD2MAN ?=/' docs/Makefile
 sed -i '/docs install/d' Makefile
 
@@ -127,6 +129,15 @@ make DESTDIR=%{buildroot} PREFIX=%{_prefix} -C docs install
 %{_datadir}/%{name}/test
 
 %changelog
+* Fri Aug 20 2021 Lokesh Mandvekar <lsm5@redhat.com> - 1.22.3-1
+- update to v1.22.3
+- Related: #1934415
+
+* Mon Aug 16 2021 Jindrich Novy <jnovy@redhat.com> - 1.22.0-3
+- update to the latest content of https://github.com/containers/buildah/tree/release-1.22
+  (https://github.com/containers/buildah/commit/98960f2)
+- Related: #1934415
+
 * Thu Aug 05 2021 Jindrich Novy <jnovy@redhat.com> - 1.22.0-2
 - update to the latest content of https://github.com/containers/buildah/tree/release-1.22
   (https://github.com/containers/buildah/commit/71b8003)