From 97e4cb5dc516d6302fbc56ac509d2e6d5933d9cb Mon Sep 17 00:00:00 2001
From: Jindrich Novy <jnovy@redhat.com>
Date: Wed, 8 Mar 2023 13:11:49 +0100
Subject: [PATCH] skopeo-1.11.2-0.3.el8

- fix build
- Related: #2176055

Signed-off-by: Jindrich Novy <jnovy@redhat.com>
---
 .gitignore                                |  3 +--
 gating.yaml                               |  7 -------
 skopeo.spec                               | 13 +++++++++----
 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, 11 insertions(+), 58 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 a29322d..f6a3a77 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1 @@
-SOURCES/skopeo-1.10.0-ee60474.tar.gz
-/skopeo-1.10.0-ee60474.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 7c360c8..e5af7cb 100644
--- a/skopeo.spec
+++ b/skopeo.spec
@@ -1,3 +1,4 @@
+%global debug_package %{nil}
 %global with_check 0
 
 %if 0%{?rhel} > 7 && ! 0%{?fedora}
@@ -8,14 +9,14 @@ go build -buildmode pie -compiler gc -tags="rpm_crashtraceback libtrust_openssl
 %endif
 
 %global import_path github.com/containers/%{name}
-#%%global branch main
-%global commit0 ee60474d5a4d99745aac9855797ad4b26510d786
+%global branch release-1.11
+%global commit0 3f98753bfdaa2c9e0465328b279f48bbdaa2ddaa
 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
 
 Epoch: 2
 Name: skopeo
-Version: 1.10.0
-Release: 1%{?dist}
+Version: 1.11.2
+Release: 0.3%{?dist}
 Summary: Inspect container images and repositories on registries
 License: ASL 2.0
 URL: https://%{import_path}
@@ -121,6 +122,10 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath}
 %{_datadir}/%{name}/test
 
 %changelog
+* Wed Mar 08 2023 Jindrich Novy <jnovy@redhat.com> - 2:1.11.2-0.3
+- fix build
+- Related: #2176055
+
 * Thu Oct 06 2022 Jindrich Novy <jnovy@redhat.com> - 2:1.10.0-1
 - update to https://github.com/containers/skopeo/releases/tag/v1.10.0
 - Related: #2123641
diff --git a/sources b/sources
index d0141dc..1e3ce19 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (skopeo-1.10.0-ee60474.tar.gz) = 5a86a494a31e1825debfc44db72907d0d065a793e54d8b599612adb39900b2963376164964038bb216fce7cf228edb058cc00353d99a552a6b44bbadf5d89b26
+SHA512 (release-1.11-3f98753.tar.gz) = ed5120b5e2350fb48508d570033bb7c2b98e6efd57186626353d01c9d0f364645e875442317edfec9d32750fd29d5f3eacff7075b0910e1ece4ec9421bc1fb71
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