2000-03-13 H.J. Lu <hjl@lucon.org>

	* etc/redhat/nfsd.init: Updated.

	* etc/redhat/nfslock.init: Updated.

	* nfs-utils.spec.in: Updated.

	* configure.in (VERSION): Set to "0.1.7".
	* configure: Regenerated.
	* nfs-utils.spec: Updated.

	* README: Updated.

1 files changed, 43 insertions, 33 deletions

diff --git a/nfs-utils.spec b/nfs-utils.spec
index 28d9b76..3217cdb 100644
--- a/nfs-utils.spec
+++ b/nfs-utils.spec
@@ -1,38 +1,50 @@
-Summary: The utilities for Linux NFS client and server.
+Summary: NFS utlilities and supporting daemons for the kernel NFS server.
 Name: nfs-utils
-Version: 0.1.6
+Version: 0.1.7
 Release: 1
-Source0: ftp://ftp.valinux.com/pub/support/hjl/nfs/%{name}-%{version}.tar.gz
+Source0: ftp://nfs.sourceforge.net/pub/nfs/%{name}-%{version}.tar.gz
 Group: System Environment/Daemons
-Obsoletes: nfs-server nfs-server-clients knfsd knfsd-clients knfsd-lock
-Provides: nfs-server nfs-server-clients knfsd knfsd-clients knfsd-lock
+Obsoletes: nfs-server
+Obsoletes: knfsd
+Obsoletes: knfsd-clients
+Obsoletes: nfs-server-clients 
+Obsoletes: knfsd-lock
+Provides: nfs-server 
+Provides: nfs-server-clients 
+Provides: knfsd-lock 
+Provides: knfsd-clients 
+Provides: knfsd
 Copyright: GPL
-ExcludeArch: armv4l
 Buildroot: /var/tmp/%{name}-root
-Serial: 1
-Requires: kernel >= 2.2.5, portmap >= 4.0
+Requires: kernel >= 2.2.7, portmap >= 4.0
 
 %description
-The nfs-utils package provides the utilities for Linux NFS client and
-server.
+The nfs-utils package provides a daemon for the kernel NFS server and
+related tools, which provides a much higher level of performance than the
+traditional Linux NFS server used by most users.
+
+This package also contains the showmount program.  Showmount queries the
+mount daemon on a remote host for information about the NFS (Network File
+System) server on the remote host.  For example, showmount can display the
+clients which are mounted on that host.
 
 %prep
 %setup -q
 
 %build
-./configure
+CFLAGS="$RPM_OPT_FLAGS" ./configure
 make all
 
 %install
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT{/sbin,/usr/{sbin,man/man5,man/man8}}
 mkdir -p $RPM_BUILD_ROOT/etc/rc.d/init.d
-mkdir -p $RPM_BUILD_ROOT/dev
-
 make install install_prefix=$RPM_BUILD_ROOT
 install -s -m 755 tools/rpcdebug/rpcdebug $RPM_BUILD_ROOT/sbin
-install -m 755 etc/redhat/nfsd.init $RPM_BUILD_ROOT/etc/rc.d/init.d/nfs
+install -m 755 etc/redhat/nfs.init $RPM_BUILD_ROOT/etc/rc.d/init.d/nfs
 install -m 755 etc/redhat/nfslock.init $RPM_BUILD_ROOT/etc/rc.d/init.d/nfslock
+touch $RPM_BUILD_ROOT/var/lib/nfs/rmtab
+mv $RPM_BUILD_ROOT/usr/sbin/{rpc.lockd,rpc.statd} $RPM_BUILD_ROOT/sbin
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -47,34 +59,32 @@ if [ "$1" = "0" ]; then
     /sbin/chkconfig --del nfslock
 fi
 
+%triggerpostun -- nfs-server
+/sbin/chkconfig --add nfs
+
+%triggerpostun -- knfsd
+/sbin/chkconfig --add nfs
+
+%triggerpostun -- knfsd-clients
+/sbin/chkconfig --add nfslock
+
 %files
 %defattr(-,root,root)
+%config /etc/rc.d/init.d/nfs
+%dir /var/lib/nfs
+%config(noreplace) /var/lib/nfs/xtab
+%config(noreplace) /var/lib/nfs/etab
+%config(noreplace) /var/lib/nfs/rmtab
 /sbin/rpcdebug
+/sbin/rpc.lockd
+/sbin/rpc.statd
 /usr/sbin/exportfs
 /usr/sbin/nfsstat
 /usr/sbin/nhfsstone
-/usr/sbin/rpc.lockd
 /usr/sbin/rpc.mountd
 /usr/sbin/rpc.nfsd
 /usr/sbin/rpc.rquotad
-/usr/sbin/rpc.statd
 /usr/sbin/showmount
-/usr/man/man5/exports.5
-/usr/man/man8/exportfs.8
-/usr/man/man8/mountd.8
-/usr/man/man8/nfsd.8
-/usr/man/man8/nfsstat.8
-/usr/man/man8/rpc.mountd.8
-/usr/man/man8/rpc.nfsd.8
-/usr/man/man8/rpc.statd.8
-/usr/man/man8/rpc.rquotad.8
-/usr/man/man8/rquotad.8
-/usr/man/man8/showmount.8
-/usr/man/man8/statd.8
-%config /etc/rc.d/init.d/nfs
+/usr/man/man?/*
 %config /etc/rc.d/init.d/nfslock
-%dir /var/lib/nfs
-%config(noreplace) /var/lib/nfs/xtab
-%config(noreplace) /var/lib/nfs/etab
-%config(noreplace) /var/lib/nfs/rmtab
 %doc README