diff --git a/.gitignore b/.gitignore index bb9f63e..839e3bb 100644 --- a/.gitignore +++ b/.gitignore @@ -45,3 +45,5 @@ /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 diff --git a/cri-o.spec b/cri-o.spec index 2b06cd7..6f0a55b 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -7,7 +7,7 @@ %global git_tree_state clean %global criocli_path "" -Version: 1.29.4 +Version: 1.32.0 %if 0%{?rhel} && 0%{?rhel} <= 9 %define gobuild(o:) %{expand: @@ -26,11 +26,11 @@ Version: 1.29.4 %endif # Commit for the builds -%global commit0 51ea93e0b9af5ad2cfa7f8071ec48d99bf39a3ec +%global commit0 b7f3c240bcbda6fae8d43561694d18317e09e167 Name: cri-o Epoch: 0 -Release: 3%{?dist} +Release: 5%{?dist} Summary: Open Container Initiative-based implementation of Kubernetes Container Runtime Interface # Upstream license specification: Apache-2.0 @@ -40,7 +40,7 @@ URL: https://github.com/cri-o/cri-o Source0: %url/archive/v%{version}/%{name}-%{version}.tar.gz %if 0%{?rhel} -BuildRequires: golang >= 1.19 +BuildRequires: golang >= 1.23 %endif %if 0%{?rhel} && 0%{?rhel} <= 8 # e.g. el6 has ppc64 arch without gcc-go, so EA tag is required @@ -104,14 +104,16 @@ 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="$(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)" +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" %if 0%{?rhel} && 0%{?rhel} <= 8 BUILDTAGS="$BUILDTAGS containers_image_openpgp" @@ -222,6 +224,26 @@ 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 diff --git a/sources b/sources index 2fbbe6e..9249c0d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cri-o-1.29.4.tar.gz) = 84c132662a726c829f1ddb7ef6722b4b201a74a4b7bcde23d56db9bfde550dd95c125b4f7f4c14e3024a5477087261c90bcbe0ea8492dba84c68cc40cb1a6314 +SHA512 (cri-o-1.32.0.tar.gz) = 800091f74a3176edfee207cdb85b207913d9433d3d6fa5f5ba971d026fd5d5a5daaee646cb8f983bceea5c4f75cb75a0093ae835b77cca2567de00819d400f96