diff --git a/.gitignore b/.gitignore index 839e3bb..b3cab74 100644 --- a/.gitignore +++ b/.gitignore @@ -45,5 +45,4 @@ /cri-o-1.29.2.tar.gz /cri-o-1.29.3.tar.gz /cri-o-1.29.4.tar.gz -/cri-o-1.31.1.tar.gz -/cri-o-1.32.0.tar.gz +/cri-o-1.29.11.tar.gz diff --git a/cri-o.spec b/cri-o.spec index 6f0a55b..90a9330 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -7,7 +7,7 @@ %global git_tree_state clean %global criocli_path "" -Version: 1.32.0 +Version: 1.29.11 %if 0%{?rhel} && 0%{?rhel} <= 9 %define gobuild(o:) %{expand: @@ -26,21 +26,20 @@ Version: 1.32.0 %endif # Commit for the builds -%global commit0 b7f3c240bcbda6fae8d43561694d18317e09e167 +%global commit0 16d9bd6ab866a5157fe2f33e7d7d8a1c86cebae9 Name: cri-o Epoch: 0 -Release: 5%{?dist} +Release: 1%{?dist} Summary: Open Container Initiative-based implementation of Kubernetes Container Runtime Interface # Upstream license specification: Apache-2.0 -# Automatically converted from old format: ASL 2.0 - review is highly recommended. -License: Apache-2.0 +License: ASL 2.0 URL: https://github.com/cri-o/cri-o Source0: %url/archive/v%{version}/%{name}-%{version}.tar.gz %if 0%{?rhel} -BuildRequires: golang >= 1.23 +BuildRequires: golang >= 1.21 %endif %if 0%{?rhel} && 0%{?rhel} <= 8 # e.g. el6 has ppc64 arch without gcc-go, so EA tag is required @@ -104,16 +103,14 @@ sed -i 's/\/local//' contrib/systemd/%{service_name}.service sed -i 's/\/local//' contrib/systemd/%{service_name}-wipe.service %build -%global __golang_extldflags -Wl,-z,undefs - export GO111MODULE=on export GOFLAGS=-mod=vendor -export BUILDTAGS="containers_image_ostree_stub -$(hack/btrfs_installed_tag.sh) -$(hack/btrfs_tag.sh) $(hack/openpgp_tag.sh) -$(hack/seccomp_tag.sh) $(hack/selinux_tag.sh) -$(hack/libsubid_tag.sh) exclude_graphdriver_devicemapper" +export BUILDTAGS="$(hack/btrfs_installed_tag.sh) +$(hack/btrfs_tag.sh) $(hack/libdm_installed.sh) +$(hack/libdm_no_deferred_remove_tag.sh) +$(hack/seccomp_tag.sh) +$(hack/selinux_tag.sh)" %if 0%{?rhel} && 0%{?rhel} <= 8 BUILDTAGS="$BUILDTAGS containers_image_openpgp" @@ -224,31 +221,9 @@ sed -i -e 's/,metacopy=on//g' /etc/containers/storage.conf %endif %changelog -* Fri Oct 10 2025 Alejandro Sáez - 0:1.32.0-5 -- rebuild - -* Fri Aug 15 2025 Maxwell G - 0:1.32.0-4 -- Rebuild for golang-1.25.0 - -* Wed Jul 23 2025 Fedora Release Engineering - 0:1.32.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Thu Jan 16 2025 Fedora Release Engineering - 0:1.32.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Mon Dec 23 2024 Bradley G Smith - 0:1.32.0-1 -- Bump to v1.32.0 -- Add -Wl,-z,undefs linker flags to resolve https://github.com/cri-o/cri-o/issues/8860 -- Update BUILDTAGS to conform to upstream - -* Thu Oct 24 2024 Dennis Gilmore - 0:1.31.1-1 -- update to 1.31.1 - -* Wed Jul 24 2024 Miroslav Suchý - 0:1.29.4-3 -- convert license to SPDX - -* Wed Jul 17 2024 Fedora Release Engineering - 0:1.29.4-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild +* Sun Jan 5 2025 Bradley G. Smith - 0:1.29.11-1 +- Bump tp v1.29.11 +- Aligns F40 version with Kubernetes * Tue Apr 30 2024 Bradley G Smith - 0:1.29.4-1 - Bump to v1.29.4 @@ -257,7 +232,6 @@ sed -i -e 's/,metacopy=on//g' /etc/containers/storage.conf * Sat Apr 27 2024 Bradley G Smith - 0:1.29.3-1 - Bump to v1.29.3 - Add support for autogenerated bundled provides -- Remove otelttrpc patch added in v1.29.2 to fix rpm build error. No longer needed. * Thu Mar 21 2024 Peter Hunt - 0:1.29.2-1 - bump to v1.29.2 diff --git a/sources b/sources index 9249c0d..1dce03c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cri-o-1.32.0.tar.gz) = 800091f74a3176edfee207cdb85b207913d9433d3d6fa5f5ba971d026fd5d5a5daaee646cb8f983bceea5c4f75cb75a0093ae835b77cca2567de00819d400f96 +SHA512 (cri-o-1.29.11.tar.gz) = 0f21a29d401bb9e9b758ca6ee59d145d668b7012c898a4963b3237dba35c6cb276ec9b3295ac68bf74f8c18edc5f6b98a45c06211fc52d420a297f630d6d5002