From 5827009d64cfb08b3894a6a6ef7552e2d90b0dca11d311b1c91555db351e8ca4 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Wed, 12 Sep 2007 14:57:08 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/nfs-utils?expand=0&rev=10 --- nfs-utils.changes | 6 ++++++ nfs-utils.spec | 6 ++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/nfs-utils.changes b/nfs-utils.changes index 1350bfa..2a9f787 100644 --- a/nfs-utils.changes +++ b/nfs-utils.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Sep 12 15:36:34 CEST 2007 - ro@suse.de + +- drop conflicts with nfs-server (userspace) in nfs-client package + showmount has been removed there (#309782) + ------------------------------------------------------------------- Thu Jul 19 16:40:38 CEST 2007 - ro@suse.de diff --git a/nfs-utils.spec b/nfs-utils.spec index 5dc0e70..f0b6a6c 100644 --- a/nfs-utils.spec +++ b/nfs-utils.spec @@ -15,7 +15,7 @@ BuildRequires: e2fsprogs-devel gcc-c++ krb5-devel libevent librpcsecgss nfsidma URL: http://nfs.sourceforge.net Summary: Support Utilities for Kernel nfsd Version: 1.1.0 -Release: 5 +Release: 6 Group: Productivity/Networking/NFS License: GPL v2 or later BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -47,7 +47,6 @@ Authors: %package -n nfs-client Group: Productivity/Networking/NFS Summary: Support Utilities for NFS -Conflicts: nfs-server Obsoletes: nfs-utils < 1.1.0 Requires: portmap Provides: aaa_base:/etc/init.d/nfs @@ -233,6 +232,9 @@ rm -rf $RPM_BUILD_ROOT %doc nfs/*.html nfs/*.ps linux-nfs/* README.NFSv4 %changelog +* Wed Sep 12 2007 - ro@suse.de +- drop conflicts with nfs-server (userspace) in nfs-client package + showmount has been removed there (#309782) * Thu Jul 19 2007 - ro@suse.de - added README.NFSv4 (#182775) * Tue Jul 17 2007 - meissner@suse.de