X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=blobdiff_plain;f=nfs-utils.spec;h=f98ed59663789474cc0797a7956e1255ed56d7e1;hp=d714cb1497617f04621f6d4b7ca25c777b605b30;hb=9c8dfab04dcf5f5067061703d6cd08ee408eec8f;hpb=2167cbdfa4c82cd71a8f838978c595a0fd03e247

diff --git a/nfs-utils.spec b/nfs-utils.spec
index d714cb1..f98ed59 100644
--- a/nfs-utils.spec
+++ b/nfs-utils.spec
@@ -1,10 +1,13 @@
+%define rquotad 0
+%{?do_rquotad:%define rquotad 1}
+
 # We don't use libtool. 
 %define __libtoolize :
 
 Summary: NFS utlilities and supporting daemons for the kernel NFS server.
 Name: nfs-utils
-Version: 0.3.2
-Release: 4
+Version: 1.0.5
+Release: 1
 Source0: ftp://nfs.sourceforge.net/pub/nfs/%{name}-%{version}.tar.gz
 Group: System Environment/Daemons
 Obsoletes: nfs-server
@@ -35,14 +38,14 @@ clients which are mounted on that host.
 %setup -q
 
 %build
-%if %{_target_cpu} != %{_build_cpu}
 CC=%{__cc}; export CC
-CXX=%{__cxx}; export CXX
-BUILD_CC=gcc; export BUILD_CC
-%configure --build=%{__build_alias}
-%else
-%configure
+CC_FOR_BUILD=gcc; export CC_FOR_BUILD
+%configure \
+%if !%{rquotad}
+	--disable-rquotad \
 %endif
+	--build=%{_build_alias}
+
 make all
 
 %install
@@ -50,10 +53,12 @@ rm -rf $RPM_BUILD_ROOT
 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/sysconfig
 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/nfs $RPM_BUILD_ROOT/etc/sysconfig/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
@@ -84,6 +89,7 @@ fi
 %defattr(-,root,root)
 %config /etc/rc.d/init.d/nfs
 %dir /var/lib/nfs
+%config(noreplace) /etc/sysconfig/nfs
 %config(noreplace) /var/lib/nfs/xtab
 %config(noreplace) /var/lib/nfs/etab
 %config(noreplace) /var/lib/nfs/rmtab
@@ -95,7 +101,9 @@ fi
 /usr/sbin/nhfsstone
 /usr/sbin/rpc.mountd
 /usr/sbin/rpc.nfsd
+%if %{rquotad}
 /usr/sbin/rpc.rquotad
+%endif
 /usr/sbin/showmount
 %{_mandir}/man?/*
 %config /etc/rc.d/init.d/nfslock