From da38698e6340c2478be6e1a7bc2c4a330683ad83 Mon Sep 17 00:00:00 2001
From: Jindrich Novy <jnovy@redhat.com>
Date: Tue, 14 Mar 2023 17:20:24 +0100
Subject: [PATCH] skopeo-1.6.2-7.el8

- update to the latest content of https://github.com/containers/skopeo/tree/release-1.6
  (https://github.com/containers/skopeo/commit/2b16a1c)
- Related: #2176055

Signed-off-by: Jindrich Novy <jnovy@redhat.com>
---
 .gitignore                                |  3 +--
 gating.yaml                               |  7 -------
 skopeo.spec                               |  9 +++++++--
 sources                                   |  2 +-
 tests/roles/bats_installed/tasks/main.yml | 12 ------------
 tests/test_skopeo.sh                      | 14 --------------
 tests/test_skopeo.yml                     | 17 -----------------
 tests/tests.yml                           |  1 -
 8 files changed, 9 insertions(+), 56 deletions(-)
 delete mode 100644 gating.yaml
 delete mode 100644 tests/roles/bats_installed/tasks/main.yml
 delete mode 100755 tests/test_skopeo.sh
 delete mode 100644 tests/test_skopeo.yml
 delete mode 100644 tests/tests.yml

diff --git a/.gitignore b/.gitignore
index ec70060..f6a3a77 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1 @@
-SOURCES/release-1.6-c20c32d.tar.gz
-/release-1.6-c20c32d.tar.gz
+/*.tar.gz
diff --git a/gating.yaml b/gating.yaml
deleted file mode 100644
index e49fcf1..0000000
--- a/gating.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-# recipients: jnovy, lsm5, santiago
---- !Policy
-product_versions:
-  - rhel-9
-decision_context: osci_compose_gate
-rules:
-  - !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional}
diff --git a/skopeo.spec b/skopeo.spec
index 6f2b6c4..e60a503 100644
--- a/skopeo.spec
+++ b/skopeo.spec
@@ -12,13 +12,13 @@ go build -buildmode pie -compiler gc -tags="rpm_crashtraceback libtrust_openssl
 
 %global branch release-1.6
 %global import_path github.com/containers/%{name}
-%global commit0 c20c32dc25f4bb0ec2e0cfadb51d692f4b0b50ca
+%global commit0 2b16a1ccfb89ef07688d191ed97712622e2aa7e0
 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
 
 Epoch: 2
 Name: skopeo
 Version: 1.6.2
-Release: 5%{?dist}
+Release: 7%{?dist}
 Summary: Inspect container images and repositories on registries
 License: ASL 2.0
 URL: https://%{import_path}
@@ -119,6 +119,11 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath}
 %{_datadir}/%{name}/test
 
 %changelog
+* Tue Mar 14 2023 Jindrich Novy <jnovy@redhat.com> - 2:1.6.2-7
+- update to the latest content of https://github.com/containers/skopeo/tree/release-1.6
+  (https://github.com/containers/skopeo/commit/2b16a1c)
+- Related: #2176055
+
 * Tue Aug 16 2022 Jindrich Novy <jnovy@redhat.com> - 2:1.6.2-5
 - update to the latest content of https://github.com/containers/skopeo/tree/release-1.6
   (https://github.com/containers/skopeo/commit/c20c32d)
diff --git a/sources b/sources
index 08dcf78..050d855 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (release-1.6-c20c32d.tar.gz) = bb60c488394387f16899059400c53f4174113997a1b02e9b3b366e6bdbe86f1f9a62578fc8d574cefca707e36cfdf7b74a6edaa64dfc3a6dcf7f35333d5732db
+SHA512 (release-1.6-2b16a1c.tar.gz) = 80cf60541fc3d2671d7fabaf00fb1e5272960142a122f79fabc3bd1d057292f238f544f638998e8082a5d366c392fbc11bc66020f1b393ffa5b627696aa65073
diff --git a/tests/roles/bats_installed/tasks/main.yml b/tests/roles/bats_installed/tasks/main.yml
deleted file mode 100644
index 00010b6..0000000
--- a/tests/roles/bats_installed/tasks/main.yml
+++ /dev/null
@@ -1,12 +0,0 @@
----
-# Sigh; RHEL8 doesn't have BATS
-- name: bats | fetch and unpack tarball
-  unarchive:
-    src: https://github.com/bats-core/bats-core/archive/v1.5.0.tar.gz
-    dest: /root
-    remote_src: true
-
-- name: bats | install
-  command: ./install.sh /usr/local
-  args:
-    chdir: /root/bats-core-1.5.0
diff --git a/tests/test_skopeo.sh b/tests/test_skopeo.sh
deleted file mode 100755
index 561b3fb..0000000
--- a/tests/test_skopeo.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/bash -e
-
-# Log program and kernel versions
-echo "Important package versions:"
-(
-    uname -r
-    rpm -qa | egrep 'skopeo|podman|conmon|crun|runc|iptable|slirp|systemd' | sort
-) | sed -e 's/^/  /'
-
-# Log environment; or at least the useful bits
-echo "Environment:"
-env | grep -v LS_COLORS= | sort | sed -e 's/^/  /'
-
-SKOPEO_BINARY=/usr/bin/skopeo bats /usr/share/skopeo/test/system
diff --git a/tests/test_skopeo.yml b/tests/test_skopeo.yml
deleted file mode 100644
index 065f31f..0000000
--- a/tests/test_skopeo.yml
+++ /dev/null
@@ -1,17 +0,0 @@
----
-- hosts: localhost
-  tags: classic
-  roles:
-    - role: bats_installed
-    - role: standard-test-basic
-      tags:
-        - classic
-        - container
-      required_packages:
-        - skopeo
-        - skopeo-tests
-      tests:
-        - root-test:
-            dir: ./
-            run: ./test_skopeo.sh
-            timeout: 15m
diff --git a/tests/tests.yml b/tests/tests.yml
deleted file mode 100644
index aa28816..0000000
--- a/tests/tests.yml
+++ /dev/null
@@ -1 +0,0 @@
-- import_playbook: test_skopeo.yml