2000-09-27 H.J. Lu <hjl@lucon.org>

	* nfs-utils.spec: Rebuild.

diff --git a/ChangeLog b/ChangeLog
index 2ab89915d09a4355fe1506109bcfc60e5dc7ac9f..c1f9c5769c15d0b3a04d381e15880a6abc43f09e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2000-09-27  H.J. Lu <hjl@lucon.org>
+
+       * nfs-utils.spec: Rebuild.
+

 2000-09-27  H.J. Lu <hjl@lucon.org>
 
        * README: Updated for 0.2.1.
 2000-09-27  H.J. Lu <hjl@lucon.org>
 
        * README: Updated for 0.2.1.

diff --git a/nfs-utils.spec b/nfs-utils.spec
index a6fd89ea81812e37ff9d7131f394d41b08845cab..ba1e7583af8d039679b45846dd5d42aafc28f83d 100644 (file)
--- a/nfs-utils.spec
+++ b/nfs-utils.spec
@@ -32,14 +32,16 @@ clients which are mounted on that host.
 %setup -q
 
 %build
 %setup -q
 
 %build

-CFLAGS="$RPM_OPT_FLAGS" ./configure
+%configure

 make all
 
 %install
 rm -rf $RPM_BUILD_ROOT
 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/{/sbin,/usr/sbin}
+mkdir -p $RPM_BUILD_ROOT%{_mandir}/{man5,man8}

 mkdir -p $RPM_BUILD_ROOT/etc/rc.d/init.d
 mkdir -p $RPM_BUILD_ROOT/etc/rc.d/init.d

-make install install_prefix=$RPM_BUILD_ROOT
+mkdir -p $RPM_BUILD_ROOT/var/lib/nfs
+make install_prefix=$RPM_BUILD_ROOT MANDIR=$RPM_BUILD_ROOT%{_mandir} SBINDIR=$RPM_BUILD_ROOT%{_prefix}/sbin install

 install -s -m 755 tools/rpcdebug/rpcdebug $RPM_BUILD_ROOT/sbin
 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
 install -s -m 755 tools/rpcdebug/rpcdebug $RPM_BUILD_ROOT/sbin
 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


@@ -85,6 +87,6 @@ fi
 /usr/sbin/rpc.nfsd
 /usr/sbin/rpc.rquotad
 /usr/sbin/showmount
 /usr/sbin/rpc.nfsd
 /usr/sbin/rpc.rquotad
 /usr/sbin/showmount

-/usr/man/man?/*
+%{_mandir}/man?/*

 %config /etc/rc.d/init.d/nfslock
 %doc README
 %config /etc/rc.d/init.d/nfslock
 %doc README