From 30e7657cfac323d4870b04846b52bfe79a337357 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Tue, 1 Feb 2022 15:13:23 -0500
Subject: [PATCH] import skopeo-1.5.2-1.module+el8.5.0+13517+4134e2e1

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

diff --git a/.gitignore b/.gitignore
index e5ab20f..5612c59 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/release-1.4-01e51ce.tar.gz
+SOURCES/skopeo-1.5.2-8a88191.tar.gz
diff --git a/.skopeo.metadata b/.skopeo.metadata
index e44cf1e..52595c6 100644
--- a/.skopeo.metadata
+++ b/.skopeo.metadata
@@ -1 +1 @@
-013bf3ab337eb45a8a7aa635ba4c3209e867a1f9 SOURCES/release-1.4-01e51ce.tar.gz
+90849e5c46e5407a8ce9e10ae4a5811db884c526 SOURCES/skopeo-1.5.2-8a88191.tar.gz
diff --git a/SPECS/skopeo.spec b/SPECS/skopeo.spec
index ee8a29a..3047eef 100644
--- a/SPECS/skopeo.spec
+++ b/SPECS/skopeo.spec
@@ -1,5 +1,3 @@
-%global _lto_cflags %{nil}
-
 %global with_check 0
 
 %global _find_debuginfo_dwz_opts %{nil}
@@ -12,18 +10,17 @@ go build -buildmode pie -compiler gc -tags="rpm_crashtraceback libtrust_openssl
 %define gobuild(o:) GO111MODULE=off go build -buildmode pie -compiler gc -tags="rpm_crashtraceback ${BUILDTAGS:-}" -ldflags "${LDFLAGS:-} -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n') -extldflags '-Wl,-z,relro -Wl,-z,now -specs=/usr/lib/rpm/redhat/redhat-hardened-ld '" -a -v %{?**};
 %endif
 
-%global import_path github.com/containers/skopeo
-%global branch release-1.4
-%global commit0 01e51ce610e3cfe1230a10af982e962c4ad1c990
-%global shortcommit0 %%(c=%%{commit0}; echo ${c:0:7})
+%global import_path github.com/containers/%{name}
+%global commit0 8a88191c844a35cd54048c34bee3a6656ed5df5f
+%global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
 
-Epoch: 1
+Epoch: 2
 Name: skopeo
-Version: 1.4.2
-Release: 0.1%{?dist}
+Version: 1.5.2
+Release: 1%{?dist}
 Summary: Inspect container images and repositories on registries
 License: ASL 2.0
-URL: https://github.com/containers/skopeo
+URL: https://%{import_path}
 # https://fedoraproject.org/wiki/PackagingDrafts/Go#Go_Language_Architectures
 ExclusiveArch: %{go_arches}
 %if 0%{?branch:1}
@@ -40,13 +37,14 @@ BuildRequires: pkgconfig(devmapper)
 BuildRequires: glib2-devel
 BuildRequires: make
 Requires: containers-common >= 2:1-2
+Requires: system-release
 
 %description
 Command line utility to inspect images and repositories directly on Docker
 registries without the need to pull them
 
 %package tests
-Summary:         Tests for %{name}
+Summary: Tests for %{name}
 Requires: %{name} = %{epoch}:%{version}-%{release}
 #Requires: bats  (which RHEL8 doesn't have. If it ever does, un-comment this)
 Requires: gnupg
@@ -81,7 +79,7 @@ for v in vendor/*; do
     fi
 done
 
-export GOPATH=$(pwd):$(pwd)/vendor:%{gopath}
+export GOPATH=$(pwd):$(pwd)/vendor
 export GO111MODULE=off
 export CGO_CFLAGS="%{optflags} -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64"
 export BUILDTAGS="exclude_graphdriver_btrfs btrfs_noversion $(hack/libdm_tag.sh)"
@@ -92,10 +90,6 @@ mkdir -p bin
 %install
 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
-rm -f %{buildroot}/%{_sysconfdir}/containers/registries.d/default.yaml
-
 # system tests
 install -d -p %{buildroot}/%{_datadir}/%{name}/test/system
 cp -pav systemtest/* %{buildroot}/%{_datadir}/%{name}/test/system/
@@ -124,6 +118,14 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath}
 %{_datadir}/%{name}/test
 
 %changelog
+* Mon Nov 29 2021 Jindrich Novy <jnovy@redhat.com> - 2:1.5.2-1
+- update to https://github.com/containers/skopeo/releases/tag/v1.5.2
+- Related: #2021990
+
+* Wed Nov 10 2021 Jindrich Novy <jnovy@redhat.com> - 2:1.5.1-1
+- update to https://github.com/containers/skopeo/releases/tag/v1.5.1
+- Related: #2001445
+
 * Thu Aug 26 2021 Jindrich Novy <jnovy@redhat.com> - 1:1.4.2-0.1
 - update to the latest content of https://github.com/containers/skopeo/tree/release-1.4
   (https://github.com/containers/skopeo/commit/01e51ce)