1. Added nfs-utils.spec.in.

2. Updated for 0.1.4.

diff --git a/ChangeLog b/ChangeLog
index 82e2f3feb71057840dff6348fbd41ac9e22de60f..0291fb7d1f00ceb1472957d48112aa75b26c98c0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+Mon Dec  6 09:42:45 1999  H.J. Lu <hjl@lucon.org>
+
+       * configure.in (VERSION): Set to "0.1.4".
+       * configure: Regenerated.
+       * nfs-utils.spec: Updated.
+
+       * README: Updated.
+
+Mon Dec  6 09:28:07 1999  H.J. Lu <hjl@lucon.org>
+
+       * nfs-utils.spec.in: New file.
+
+       * config.mk.in (VERSION): Changed to "nfs-utils @VERSION@".
+
+       * configure.in (nfs-utils.spec): Added to AC_OUTPUT.
+
 1999-12-04  Chip Salzenberg  <chip@valinux.com>
 
        * config.mk.in: Use $(CC) as set by configure.

diff --git a/README b/README
index 9dac65ea106c51ab2abc0ba3d672a59c8121e929..6c460b4cefe9e192d4687149304de286f486ad44 100644 (file)
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-This is the Linux NFS utility package version 0.1.3. It is based on
+This is the Linux NFS utility package version 0.1.4. It is based on
 knfsd 1.4.7.
 
 WARNING: The NFS servers in Linux 2.2 to 2.2.13 are not compatible with
@@ -65,8 +65,8 @@ will get the latest version.
 
 The files are
 
-ftp://ftp.linuxnfs.sourceforge.org/pub/nfs/nfs-utils-0.1.3.tar.gz
-ftp://ftp.linuxnfs.sourceforge.org/pub/nfs/nfs-utils-0.1.2-0.1.3.diff.gz
+ftp://ftp.linuxnfs.sourceforge.org/pub/nfs/nfs-utils-0.1.4.tar.gz
+ftp://ftp.linuxnfs.sourceforge.org/pub/nfs/nfs-utils-0.1.3-0.1.4.diff.gz
 
 To compile, just do
 
@@ -81,7 +81,7 @@ They are tested on RedHat 6.1.
 
 On RedHat 6.1, you can use
 
-# rpm -ta nfs-utils-0.1.3.tar.gz
+# rpm -ta nfs-utils-0.1.4.tar.gz
 
 to build the source and binary RPMs.
 
@@ -95,4 +95,4 @@ Thanks.
 
 H.J.
 hjl@lucon.org
-11/29/99
+12/06/99

diff --git a/config.mk.in b/config.mk.in
index 76ade0145a4c10579fe752cc872fe6647559fc4a..7b56aab3b8ad0a4425c1345d9b6b270a067c5c01 100644 (file)
--- a/config.mk.in
+++ b/config.mk.in
@@ -2,7 +2,7 @@
 # Configuration stuff for nfs-utils
 #
 
-VERSION                = @VERSION@
+VERSION                = nfs-utils @VERSION@
 
 prefix         = $(install_prefix)@prefix@
 exec_prefix    = $(install_prefix)@prefix@

diff --git a/configure b/configure
index d0c6f0ceed7e790b2710d62654be1d14c76c862e..7048150942ed34076379269192616738bdb15df4 100755 (executable)
--- a/configure
+++ b/configure
@@ -544,7 +544,7 @@ fi
 
 
 # The nfs-utils version
-VERSION="nfs-utils 0.1.3"
+VERSION="0.1.4"
 
 
 # Check whether --with-statedir or --without-statedir was given.
@@ -1593,7 +1593,7 @@ done
 ac_given_srcdir=$srcdir
 ac_given_INSTALL="$INSTALL"
 
-trap 'rm -fr `echo "config.mk support/include/config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
+trap 'rm -fr `echo "config.mk nfs-utils.spec support/include/config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
 EOF
 cat >> $CONFIG_STATUS <<EOF
 
@@ -1681,7 +1681,7 @@ EOF
 
 cat >> $CONFIG_STATUS <<EOF
 
-CONFIG_FILES=\${CONFIG_FILES-"config.mk"}
+CONFIG_FILES=\${CONFIG_FILES-"config.mk nfs-utils.spec"}
 EOF
 cat >> $CONFIG_STATUS <<\EOF
 for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then

diff --git a/configure.in b/configure.in
index 231c233f20fb1e37d0b8935c872434f829fbcd8d..5acc9869deec363b4b5863fe899974c26043646a 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -4,7 +4,7 @@ AC_INIT(rules.mk)
 AC_PREFIX_DEFAULT(/usr)
 
 # The nfs-utils version
-VERSION="nfs-utils 0.1.3"
+VERSION="0.1.4"
 AC_SUBST(VERSION)
 
 dnl *************************************************************
@@ -82,4 +82,4 @@ AC_DEFINE_UNQUOTED(NFS_STATEDIR, "$statedir")
 AC_SUBST(LDFLAGS)
 AC_SUBST(CXXFLAGS)
 AC_SUBST(CFLAGS)
-AC_OUTPUT(config.mk)
+AC_OUTPUT(config.mk nfs-utils.spec)

diff --git a/nfs-utils.spec b/nfs-utils.spec
index 6ba9dd050b0e37f3c28298929470758c65af6cd2..652627018fd35664b05a54b742b36848b2bb682b 100644 (file)
--- a/nfs-utils.spec
+++ b/nfs-utils.spec
@@ -1,6 +1,6 @@
 Summary: The utilities for Linux NFS client and server.
 Name: nfs-utils
-Version: 0.1.3
+Version: 0.1.4
 Release: 1
 Source0: ftp://ftp.valinux.com/pub/support/hjl/nfs/%{name}-%{version}.tar.gz
 Group: System Environment/Daemons

diff --git a/nfs-utils.spec.in b/nfs-utils.spec.in
new file mode 100644 (file)
index 0000000..81130fd
--- /dev/null
+++ b/nfs-utils.spec.in
@@ -0,0 +1,80 @@
+Summary: The utilities for Linux NFS client and server.
+Name: nfs-utils
+Version: @VERSION@
+Release: 1
+Source0: ftp://ftp.valinux.com/pub/support/hjl/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
+Copyright: GPL
+ExcludeArch: armv4l
+Buildroot: /var/tmp/%{name}-root
+Serial: 1
+Requires: kernel >= 2.2.5, portmap >= 4.0
+
+%description
+The nfs-utils package provides the utilities for Linux NFS client and
+server.
+
+%prep
+%setup -q
+
+%build
+./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/nfslock.init $RPM_BUILD_ROOT/etc/rc.d/init.d/nfslock
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%post
+/sbin/chkconfig --add nfs
+/sbin/chkconfig --add nfslock
+
+%preun
+if [ "$1" = "0" ]; then
+    /sbin/chkconfig --del nfs
+    /sbin/chkconfig --del nfslock
+fi
+
+%files
+%defattr(-,root,root)
+/sbin/rpcdebug
+/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
+%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