diff --git a/nfs-utils.spec b/nfs-utils.spec index 9a57aac3b18bfc814b1565b36957ba41ba9df8e4..a260a79691f26b27eb8f63c1b1688bbfa04867fc 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