From 8b760725dda902737330b195e2799a8c70d775e3 Mon Sep 17 00:00:00 2001 From: wguanghao Date: Wed, 20 Dec 2023 14:46:00 +0800 Subject: [PATCH] fix conflict between nfs-utils and nfs-utils-min --- nfs-utils.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/nfs-utils.spec b/nfs-utils.spec index 9a57aac..a260a79 100644 --- a/nfs-utils.spec +++ b/nfs-utils.spec @@ -45,7 +45,7 @@ Requires(post): systemd Requires(preun): systemd Requires(postun): systemd Requires(postun): glibc - +Obsoletes: nfs-utils-min Provides: exportfs = %{epoch}:%{version}-%{release} Provides: nfsstat = %{epoch}:%{version}-%{release} @@ -107,7 +107,7 @@ Requires: rpcbind Requires(post): systemd Requires(preun): systemd Requires(postun): systemd -Conflicts: nfs-utils +Obsoletes: nfs-utils %description -n nfs-utils-min Minimal NFS utilities for supporting clients @@ -295,6 +295,9 @@ fi %{_mandir}/*/* %changelog +* wed Dec 20 2023 wuguanghao - 2:2.6.2-6 +- fix the conflict between nfs-utils and nfs-utils-min + * Tue Dec 19 2023 wuguanghao - 2:2.6.2-5 - backport bugfix patches from community -- Gitee