From ea27ec9dcc74ec8a8fc420cd51c6f0b6437f9e31 Mon Sep 17 00:00:00 2001 From: Bradley G Smith Date: Tue, 3 Sep 2024 10:51:35 -0700 Subject: [PATCH 1/3] Update to v1.29.8 No change from v1.29.7 according to upstream changelog. --- cri-o.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/cri-o.spec b/cri-o.spec index 2b06cd7..8b1808b 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.29.8 %if 0%{?rhel} && 0%{?rhel} <= 9 %define gobuild(o:) %{expand: @@ -26,7 +26,7 @@ Version: 1.29.4 %endif # Commit for the builds -%global commit0 51ea93e0b9af5ad2cfa7f8071ec48d99bf39a3ec +%global commit0 322899959d3ffa60b431dc8470a5cb2779fcd22c Name: cri-o Epoch: 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.20 %endif %if 0%{?rhel} && 0%{?rhel} <= 8 # e.g. el6 has ppc64 arch without gcc-go, so EA tag is required @@ -222,6 +222,9 @@ sed -i -e 's/,metacopy=on//g' /etc/containers/storage.conf %endif %changelog +* Tue Sep 3 2024 Bradley G Smith - 0:1.29.8-1 +- Bump to v1.29.8 + * Wed Jul 24 2024 Miroslav Suchý - 0:1.29.4-3 - convert license to SPDX From 5a0e6997c3a8247c758f34e0163ffccb29a5ab44 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 24 Oct 2024 20:21:17 -0500 Subject: [PATCH 2/3] update to v1.30.6 Signed-off-by: Dennis Gilmore --- .gitignore | 1 + cri-o.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index bb9f63e..d09077e 100644 --- a/.gitignore +++ b/.gitignore @@ -45,3 +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.30.6.tar.gz diff --git a/cri-o.spec b/cri-o.spec index 2b06cd7..95883fb 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.30.6 %if 0%{?rhel} && 0%{?rhel} <= 9 %define gobuild(o:) %{expand: @@ -30,7 +30,7 @@ Version: 1.29.4 Name: cri-o Epoch: 0 -Release: 3%{?dist} +Release: 1%{?dist} Summary: Open Container Initiative-based implementation of Kubernetes Container Runtime Interface # Upstream license specification: Apache-2.0 @@ -222,6 +222,9 @@ sed -i -e 's/,metacopy=on//g' /etc/containers/storage.conf %endif %changelog +* Thu Oct 24 2024 Dennis Gilmore - 0:1.30.6-1 +- update to v1.30.6 + * Wed Jul 24 2024 Miroslav Suchý - 0:1.29.4-3 - convert license to SPDX diff --git a/sources b/sources index 2fbbe6e..a27480a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cri-o-1.29.4.tar.gz) = 84c132662a726c829f1ddb7ef6722b4b201a74a4b7bcde23d56db9bfde550dd95c125b4f7f4c14e3024a5477087261c90bcbe0ea8492dba84c68cc40cb1a6314 +SHA512 (cri-o-1.30.6.tar.gz) = 3e8e3422a0fac9b603775a9b05626134b0e8b37425ddbbf39e155283ecdc7ac50184bb578179bc25585711286320034251318c599039d3b539d0f4d7f334c341 From 4febc4f032836996399d238aad65ad14b64c0340 Mon Sep 17 00:00:00 2001 From: Bradley G Smith Date: Mon, 23 Dec 2024 07:38:36 -0800 Subject: [PATCH 3/3] Update to release v1.30.8 CRI-O out of sync with kubernetes rpm which is frozen at v1.29.x and replaced by versioned rpms. --- .gitignore | 1 + cri-o.spec | 11 ++++++++--- sources | 2 +- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index d09077e..636e1d3 100644 --- a/.gitignore +++ b/.gitignore @@ -46,3 +46,4 @@ /cri-o-1.29.3.tar.gz /cri-o-1.29.4.tar.gz /cri-o-1.30.6.tar.gz +/cri-o-1.30.8.tar.gz diff --git a/cri-o.spec b/cri-o.spec index 65088f0..d01462d 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -7,7 +7,7 @@ %global git_tree_state clean %global criocli_path "" -Version: 1.30.6 +Version: 1.30.8 %if 0%{?rhel} && 0%{?rhel} <= 9 %define gobuild(o:) %{expand: @@ -26,7 +26,7 @@ Version: 1.30.6 %endif # Commit for the builds -%global commit0 322899959d3ffa60b431dc8470a5cb2779fcd22c +%global commit0 59f960f46697517f048e6ff3caf728ae75cb384 Name: cri-o Epoch: 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.20 +BuildRequires: golang >= 1.22.2 %endif %if 0%{?rhel} && 0%{?rhel} <= 8 # e.g. el6 has ppc64 arch without gcc-go, so EA tag is required @@ -222,6 +222,11 @@ sed -i -e 's/,metacopy=on//g' /etc/containers/storage.conf %endif %changelog +* Mon Dec 23 2024 Bradley G Smith - 0:1.30.8-1 +- Bump to v1.30.8 +- Version not in sync with Kubernetes and CRI-Tools which are frozen + at v1.29.x and replaced by versioned rpms. + * Thu Oct 24 2024 Dennis Gilmore - 0:1.30.6-1 - update to v1.30.6 diff --git a/sources b/sources index a27480a..6dd97f3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cri-o-1.30.6.tar.gz) = 3e8e3422a0fac9b603775a9b05626134b0e8b37425ddbbf39e155283ecdc7ac50184bb578179bc25585711286320034251318c599039d3b539d0f4d7f334c341 +SHA512 (cri-o-1.30.8.tar.gz) = 7662be746c296c347272732926955ffe7f1b41d8b38009d214365e9918d0e90e0c3612fc012b98cb3ccc4394f31a7f33238bf84567b2ba9fc1faf44d776a10a1