diff --git a/skopeo.spec b/skopeo.spec index 191fe18..b47d2c9 100644 --- a/skopeo.spec +++ b/skopeo.spec @@ -10,7 +10,7 @@ %global gomodulesmode GO111MODULE=on #%%global branch release-1.21 -%global commit0 23dddaad3d8f86f8c1d3204646b14aa0da86a85e +%global commit0 267465e170820673de25149378284fb352daa65e %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) # No btrfs on RHEL @@ -43,7 +43,7 @@ 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.22.0 +Version: 1.22.2 # 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} @@ -157,6 +157,10 @@ 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} @@ -177,10 +181,20 @@ make \ %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 +* Thu Apr 23 2026 Jindrich Novy - 2:1.22.2-2 +- update to https://github.com/containers/skopeo/releases/tag/v1.22.2 +- re-add test file installation to fix tier0 tests +- Resolves: RHEL-170602 + +* Thu Apr 23 2026 Jindrich Novy - 2:1.22.2-1 +- update to https://github.com/containers/skopeo/releases/tag/v1.22.2 +- Resolves: RHEL-170602 + * Mon Feb 23 2026 Jindrich Novy - 1:1.22.0-2 - Rebuild for new golang to address CVE-2025-68121 - Resolves: RHEL-149649 diff --git a/sources b/sources index e788a32..d1b3b96 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (skopeo-1.22.0-23dddaa.tar.gz) = 5cc16dd37e03acfcbadea6d5598d71db0ad3c85986c57af6368181892e25b342d1b1fb833fdb6f4b8347e70482b2b4998ac4e68190ac36457c2512ed59cdc47f +SHA512 (skopeo-1.22.2-267465e.tar.gz) = 2c76c7bc028b2686f58f5024fd233230cb773b33c1d69064c432c190ccdf6381135c7b9156036e52f435522c550b3b86ffea7a1e652c36f151b426c6ac184ecb diff --git a/test/tmt/test.sh b/test/tmt/test.sh old mode 100644 new mode 100755