From c40d53ff4858979a53a263bf30dcf2d0edb0eabc Mon Sep 17 00:00:00 2001
From: Jindrich Novy <jnovy@redhat.com>
Date: Wed, 4 Feb 2026 10:25:45 +0100
Subject: [PATCH] skopeo-1.21.0-1.el9

- update to https://github.com/containers/skopeo/releases/tag/v1.21.0
- Related: RHEL-111919

Signed-off-by: Jindrich Novy <jnovy@redhat.com>
---
 skopeo.spec | 43 ++++++++++++++++++++++---------------------
 sources     |  2 +-
 2 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/skopeo.spec b/skopeo.spec
index 76c496c..2132e02 100644
--- a/skopeo.spec
+++ b/skopeo.spec
@@ -9,8 +9,8 @@
 
 %global gomodulesmode GO111MODULE=on
 
-#%%global branch release-1.18
-%global commit0 e2c1eecd40b9121adf431a33cbbe60d22dc9fad7
+%global branch release-1.21
+%global commit0 48a05d71f0fa4cce3dc3f4187d1e93d7f004b495
 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
 
 # No btrfs on RHEL
@@ -43,10 +43,10 @@ Epoch: %{conditional_epoch}
 # If that's what you're reading, Version must be 0, and will be updated by Packit for
 # copr and koji builds.
 # If you're reading this on dist-git, the version is automatically filled in by Packit.
-Version: 1.20.0
+Version: 1.21.0
 # The `AND` needs to be uppercase in the License for SPDX compatibility
 License: Apache-2.0 AND BSD-2-Clause AND BSD-3-Clause AND ISC AND MIT AND MPL-2.0
-Release: 2%{?dist}
+Release: 1%{?dist}
 %if %{defined golang_arches_future}
 ExclusiveArch: %{golang_arches_future}
 %else
@@ -76,23 +76,20 @@ BuildRequires: make
 BuildRequires: shadow-utils-subid-devel
 BuildRequires: sqlite-devel
 Requires: containers-common >= 4:1-21
+%if %{defined sequoia}
+Requires: podman-sequoia
+%endif
 
 %description
 Command line utility to inspect images and repositories directly on Docker
-registries without the need to pull them
+registries without the need to pull them.
 
 # NOTE: The tests subpackage is only intended for testing and will not be supported
 # for end-users and/or customers.
 %package tests
-Summary: Tests for %{name}
+Summary: Test dependencies for %{name}
 
 Requires: %{name} = %{epoch}:%{version}-%{release}
-%if %{undefined rhel}
-Requires: bats
-%endif
-%if %{defined fakeroot}
-Requires: fakeroot
-%endif
 Requires: gnupg
 Requires: jq
 Requires: golang
@@ -101,11 +98,12 @@ Requires: crun
 Requires: httpd-tools
 Requires: openssl
 Requires: squashfs-tools
+# bats and fakeroot are not present on RHEL and ELN so they shouldn't be strong deps
+Recommends: bats
+Recommends: fakeroot
 
 %description tests
-%{summary}
-
-This package contains system tests for %{name}
+This package installs system test dependencies for %{name}
 
 %prep
 %if 0%{?branch:1}
@@ -143,6 +141,10 @@ export BUILDTAGS="$BASEBUILDTAGS exclude_graphdriver_btrfs"
 export BUILDTAGS="$BUILDTAGS libtrust_openssl"
 %endif
 
+%if %{defined sequoia}
+export BUILDTAGS="$BUILDTAGS containers_image_sequoia"
+%endif
+
 # unset LDFLAGS earlier set from set_build_flags
 LDFLAGS=''
 
@@ -155,10 +157,6 @@ make \
     PREFIX=%{_prefix} \
     install-binary install-docs install-completions
 
-# system tests
-install -d -p %{buildroot}/%{_datadir}/%{name}/test/system
-cp -pav systemtest/* %{buildroot}/%{_datadir}/%{name}/test/system/
-
 #define license tag if not already defined
 %{!?_licensedir:%global license %doc}
 
@@ -179,11 +177,14 @@ cp -pav systemtest/* %{buildroot}/%{_datadir}/%{name}/test/system/
 %dir %{_datadir}/zsh/site-functions
 %{_datadir}/zsh/site-functions/_%{name}
 
+# Only test dependencies installed, no files.
 %files tests
-%license LICENSE vendor/modules.txt
-%{_datadir}/%{name}/test
 
 %changelog
+* Wed Feb 04 2026 Jindrich Novy <jnovy@redhat.com> - 1:1.21.0-1
+- update to https://github.com/containers/skopeo/releases/tag/v1.21.0
+- Related: RHEL-111919
+
 * Fri Nov 21 2025 Jindrich Novy <jnovy@redhat.com> - 1:1.20.0-2
 - rebuild for CVE-2025-58183
 - Resolves: RHEL-125721
diff --git a/sources b/sources
index fa9709e..5f0e6d2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (skopeo-1.20.0-e2c1eec.tar.gz) = fa660c36be2b3465a5f62bd41d55a21c3b0ca81f3842ab99b9569cc22fe68922660ece6635d82fcf80b148a3f1cc31e0b2279fe45b0ce25214328a06e0a09aee
+SHA512 (release-1.21-48a05d7.tar.gz) = 6acc0d8d60015f6d411ce5a246e28489493f3f96df59bfb40371517a45fff328ee65ebc317fb98b6de808391fec8c64befc000d605eeb7a38d7a80c97e8ba646