From a2a76a81cbdb98c2d7e35c2f68c5c472e53fc7e1 Mon Sep 17 00:00:00 2001
From: Ed Santiago <santiago@redhat.com>
Date: Mon, 19 Jul 2021 08:52:33 -0600
Subject: [PATCH] Try to deal with buildah copy-helper nightmare

Signed-off-by: Ed Santiago <santiago@redhat.com>
---
 buildah.spec          | 8 +++++++-
 tests/test_buildah.sh | 1 +
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/buildah.spec b/buildah.spec
index 746c34f..98f691a 100644
--- a/buildah.spec
+++ b/buildah.spec
@@ -33,7 +33,7 @@
 
 Name: %{repo}
 Version: 1.22.0
-Release: 0.11.dev.git%{shortcommit0}%{?dist}
+Release: 0.13.dev.git%{shortcommit0}%{?dist}
 Summary: A command line tool used for creating OCI Images
 License: ASL 2.0
 URL: https://%{name}.io
@@ -128,6 +128,7 @@ export BUILDTAGS+=' exclude_graphdriver_btrfs'
 %endif
 %gobuild -o bin/%{name} %{import_path}/cmd/%{name}
 %gobuild -o bin/imgtype %{import_path}/tests/imgtype
+%gobuild -o bin/copy    %{import_path}/tests/copy
 GOMD2MAN=go-md2man %{__make} -C docs
 
 %install
@@ -138,6 +139,7 @@ make DESTDIR=%{buildroot} PREFIX=%{_prefix} -C docs install
 install -d -p %{buildroot}/%{_datadir}/%{name}/test/system
 cp -pav tests/. %{buildroot}/%{_datadir}/%{name}/test/system
 cp bin/imgtype %{buildroot}/%{_bindir}/%{name}-imgtype
+cp bin/copy    %{buildroot}/%{_bindir}/%{name}-copy
 
 #define license tag if not already defined
 %{!?_licensedir:%global license %doc}
@@ -154,9 +156,13 @@ cp bin/imgtype %{buildroot}/%{_bindir}/%{name}-imgtype
 %files tests
 %license LICENSE
 %{_bindir}/%{name}-imgtype
+%{_bindir}/%{name}-copy
 %{_datadir}/%{name}/test
 
 %changelog
+* Mon Jul 19 2021 Eduardo Santiago <santiago@redhat.com> - 1.22.0-0.13.dev.gitec35bc4
+- Try to deal with new buildah-copy-helper nightmare
+
 * Fri Jul 16 2021 Lokesh Mandvekar <lsm5@fedoraproject.org> - 1.22.0-0.12.dev.gitec35bc4
 - Resolves: #1969264, #1982880 - Security fix for CVE-2021-3602
 
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