From 046a8a6f33ec6dffe3facbb2838d6ae2445221bc Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Wed, 25 Aug 2021 00:28:03 +0000
Subject: [PATCH] import skopeo-1.4.1-1.module+el8.5.0+12332+af0a4708

---
 .gitignore        |  2 +-
 .skopeo.metadata  |  2 +-
 SPECS/skopeo.spec | 47 +++++++++++++++++++++++++++++------------------
 3 files changed, 31 insertions(+), 20 deletions(-)

diff --git a/.gitignore b/.gitignore
index 12ca7cc..1ae1c77 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/release-1.4-a44da44.tar.gz
+SOURCES/v1.4.1.tar.gz
diff --git a/.skopeo.metadata b/.skopeo.metadata
index 4629f78..d293efd 100644
--- a/.skopeo.metadata
+++ b/.skopeo.metadata
@@ -1 +1 @@
-57fcf42eb601e54559ecfba64a692d3158faa0db SOURCES/release-1.4-a44da44.tar.gz
+2d7654dbace931b725b63cbcfb88d490c56eef22 SOURCES/v1.4.1.tar.gz
diff --git a/SPECS/skopeo.spec b/SPECS/skopeo.spec
index f1268c5..a4d5023 100644
--- a/SPECS/skopeo.spec
+++ b/SPECS/skopeo.spec
@@ -13,33 +13,34 @@ go build -buildmode pie -compiler gc -tags="rpm_crashtraceback libtrust_openssl
 %endif
 
 %global import_path github.com/containers/skopeo
-%global branch release-1.4
-%global commit0 a44da449d35e4621e9993f406d5a4f98dd89965e
-%global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
+#%%global branch release-1.4
+#%%global commit0 ea32394313d673932b62520ae47a2b7c3956e572
+#%%global shortcommit0 %%(c=%%{commit0}; echo ${c:0:7})
 
 Epoch: 1
 Name: skopeo
-Version: 1.4.0
-Release: 6%{?dist}
+Version: 1.4.1
+Release: 1%{?dist}
 Summary: Inspect container images and repositories on registries
 License: ASL 2.0
 URL: https://github.com/containers/skopeo
 # 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
+#%%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: %{url}/archive/v%{version}.tar.gz
 BuildRequires: git-core
-BuildRequires: golang >= 1.12.12-4
+BuildRequires: golang >= 1.16.6
 BuildRequires: go-md2man
 BuildRequires: gpgme-devel
 BuildRequires: libassuan-devel
 BuildRequires: pkgconfig(devmapper)
 BuildRequires: glib2-devel
 BuildRequires: make
-Requires: containers-common
+Requires: containers-common >= 2:1-2
 
 %description
 Command line utility to inspect images and repositories directly on Docker
@@ -61,11 +62,12 @@ Requires: openssl
 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/install-binary: bin\/%{name}/install-binary:/' Makefile
 sed -i 's/install-docs: docs/install-docs:/' Makefile
 
@@ -90,7 +92,7 @@ mkdir -p bin
 %{__make} docs
 
 %install
-make install DESTDIR=%{buildroot} PREFIX=%{_prefix}
+make install-binary install-docs install-completions DESTDIR=%{buildroot} PREFIX=%{_prefix}
 
 # remove bits which are parts of containers-common
 rm -f %{buildroot}/%{_sysconfdir}/containers/policy.json
@@ -124,6 +126,15 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath}
 %{_datadir}/%{name}/test
 
 %changelog
+* Fri Aug 20 2021 Lokesh Mandvekar <lsm5@redhat.com> - 1:1.4.1-1
+- update to v1.4.1
+- Related: #1934415
+
+* Tue Aug 17 2021 Jindrich Novy <jnovy@redhat.com> - 1:1.4.0-7
+- update to the latest content of https://github.com/containers/skopeo/tree/release-1.4
+  (https://github.com/containers/skopeo/commit/ea32394)
+- Related: #1934415
+
 * Wed Aug 11 2021 Jindrich Novy <jnovy@redhat.com> - 1:1.4.0-6
 - carve away containers-common - it's now a separate package
 - Related: #1934415