From 802967c6425289e71296284c7f376fc3426c1f7f Mon Sep 17 00:00:00 2001
From: Jindrich Novy <jnovy@redhat.com>
Date: Mon, 26 Jul 2021 08:14:05 +0200
Subject: [PATCH] buildah-1.21.4-2.el9

- add buildah-copy helper
- Related: #1970747

Signed-off-by: Jindrich Novy <jnovy@redhat.com>
---
 buildah.spec          | 9 ++++++++-
 tests/test_buildah.sh | 1 +
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/buildah.spec b/buildah.spec
index f05a31a..35618d3 100644
--- a/buildah.spec
+++ b/buildah.spec
@@ -20,7 +20,7 @@ go build -buildmode pie -compiler gc -tags="rpm_crashtraceback libtrust_openssl
 
 Name: buildah
 Version: 1.21.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: A command line tool used for creating OCI Images
 License: ASL 2.0
 URL: https://%{name}.io
@@ -99,6 +99,7 @@ export LDFLAGS="$LDFLAGS -X main.buildInfo=`date +%s` -X main.cniVersion=${CNI_V
 rm -f src/github.com/containers/storage/drivers/register/register_btrfs.go
 %gobuild -o bin/%{name} %{import_path}/cmd/%{name}
 %gobuild -o imgtype %{import_path}/tests/imgtype
+%gobuild -o bin/copy %{import_path}/tests/copy
 GOMD2MAN=go-md2man %{__make} -C docs
 
 %install
@@ -107,6 +108,7 @@ make DESTDIR=%{buildroot} PREFIX=%{_prefix} install install.completions
 install -d -p %{buildroot}/%{_datadir}/%{name}/test/system
 cp -pav tests/. %{buildroot}/%{_datadir}/%{name}/test/system
 cp imgtype %{buildroot}/%{_bindir}/%{name}-imgtype
+cp bin/copy %{buildroot}/%{_bindir}/%{name}-copy
 make DESTDIR=%{buildroot} PREFIX=%{_prefix} -C docs install
 
 #define license tag if not already defined
@@ -124,9 +126,14 @@ make DESTDIR=%{buildroot} PREFIX=%{_prefix} -C docs install
 %files tests
 %license LICENSE
 %{_bindir}/%{name}-imgtype
+%{_bindir}/%{name}-copy
 %{_datadir}/%{name}/test
 
 %changelog
+* Mon Jul 26 2021 Jindrich Novy <jnovy@redhat.com> - 1.21.4-2
+- add buildah-copy helper
+- Related: #1970747
+
 * Mon Jul 26 2021 Jindrich Novy <jnovy@redhat.com> - 1.21.4-1
 - update to the latest content of https://github.com/containers/buildah/tree/release-1.21
   (https://github.com/containers/buildah/commit/9c83683)
diff --git a/tests/test_buildah.sh b/tests/test_buildah.sh
index 13ac761..948e84c 100755
--- a/tests/test_buildah.sh
+++ b/tests/test_buildah.sh
@@ -13,6 +13,7 @@ env | grep -v LS_COLORS= | sort | sed -e 's/^/  /'
 
 export BUILDAH_BINARY=/usr/bin/buildah
 export IMGTYPE_BINARY=/usr/bin/buildah-imgtype
+export COPY_BINARY=/usr/bin/buildah-copy
 
 ###############################################################################
 # BEGIN setup/teardown