diff --git a/skopeo.spec b/skopeo.spec index 5b818c0..3944167 100644 --- a/skopeo.spec +++ b/skopeo.spec @@ -9,8 +9,8 @@ %global gomodulesmode GO111MODULE=on -#%%global branch release-1.21 -%global commit0 9645b282ca2d8792235db5a3e142ea9ae2f0c63b +%global branch release-1.22 +%global commit0 094478d3691b8e54b8d9e87d9693f7933d75408c %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) # No btrfs on RHEL @@ -28,7 +28,7 @@ %define conditional_epoch 1 %define fakeroot 1 %else -%define conditional_epoch 2 +%define conditional_epoch 3 %endif Name: skopeo @@ -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.23.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: 1%{?dist} @@ -56,7 +56,7 @@ Summary: Inspect container images and repositories on registries URL: https://github.com/containers/%{name} # Tarball fetched from upstream %if 0%{?branch:1} -Source0: https://github.com/containers/%{name}/tarball/%{commit0}/%{branch}-%{shortcommit0}.tar.gz +Source0: https://gitlab.cee.redhat.com/sustaining-engineering/container-tools/src-git/%{name}/-/archive/%{commit0}/%{branch}-%{shortcommit0}.tar.gz %else Source0: https://github.com/containers/%{name}/archive/%{commit0}/%{name}-%{version}-%{shortcommit0}.tar.gz %endif @@ -106,11 +106,7 @@ Recommends: fakeroot This package installs system test dependencies for %{name} %prep -%if 0%{?branch:1} -%autosetup -Sgit -n containers-%{name}-%{shortcommit0} -%else %autosetup -Sgit -n %{name}-%{commit0} -%endif # The %%install stage should not rebuild anything but only install what's # built in the %%build stage. So, remove any dependency on build targets. sed -i 's/^install-binary: bin\/%{name}.*/install-binary:/' Makefile @@ -186,6 +182,11 @@ cp -pav systemtest/* %{buildroot}/%{_datadir}/%{name}/test/system/ %{_datadir}/%{name}/test %changelog +* Thu Jul 30 2026 Jindrich Novy - 3:1.22.2-1 +- switch to sustaining-engineering GitLab release-1.22 branch and bump epoch to + fix upgrade path +- Resolves: RHEL-220456 + * Wed Jun 17 2026 Jindrich Novy - 2:1.23.0-1 - update to https://github.com/containers/skopeo/releases/tag/v1.23.0 - Resolves: RHEL-185740 diff --git a/sources b/sources index ec9ef41..255052f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (skopeo-1.23.0-9645b28.tar.gz) = 969bb1f6ec8b0dc00989314e68ccea09493c211843e88c06acf02eadeecaffe42e176d322a25f496529820d06afa229406e30ed9c0c50234721c54e72106d148 +SHA512 (release-1.22-094478d.tar.gz) = 6a550070d83335cf4d004964094cba901bc8bbf7894d771c8ade56d05ec6c0dc04f137ea0b3788d7121c5d81e7812f9157a66b3b175b4a1893f91253094d171b