From 001c4106ee4c9f3bdc62aa45f5b7ccb316d9fdee Mon Sep 17 00:00:00 2001 From: zhourenjian Date: Wed, 25 Jun 2025 16:24:14 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E5=AF=B9kubernetes-client?= =?UTF-8?q?=E7=9A=84conflict=E5=A3=B0=E6=98=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit 6e01fcd07a3f62a6d5c45a517dcfebf4c04b4aaf) --- k3s.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/k3s.spec b/k3s.spec index a1f1aec..38c071c 100644 --- a/k3s.spec +++ b/k3s.spec @@ -3,7 +3,7 @@ Name: k3s Version: 1.24.2+rc1+k3s2 -Release: 4 +Release: 5 Summary: Installer for k3s optimised for openSUSE MicroOS License: Apache-2.0 Group: System/Management @@ -24,7 +24,6 @@ Requires: k3s-selinux Requires: iptables Conflicts: cri-tools Conflicts: kubectl -Conflicts: kubernetes-client Conflicts: kubernetes-client-provider Requires(post): systemd @@ -93,6 +92,9 @@ cp install.sh %{buildroot}%{_sbindir}/k3s-install.sh %{_sbindir}/k3s-install.sh %changelog +* Tue Jun 24 2025 Renjian Zhou - 1.24.2+rc1+k3s2-5 +- delete conflict of kubernetes-client + * Sun Apr 21 2024 Yuncheng Zhu - 1.24.2+rc1+k3s2-4 - change requirement docker-runc to runc -- Gitee