SPECS: nfs-utils.spec - merge from AC-branch with CITI patch

Mon May 8 17:55:43 CEST 2006

Author: baggins                      Date: Mon May  8 15:55:43 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- merge from AC-branch with CITI patch

---- Files affected:
SPECS:
   nfs-utils.spec (1.102 -> 1.103) 

---- Diffs:

================================================================
Index: SPECS/nfs-utils.spec
diff -u SPECS/nfs-utils.spec:1.102 SPECS/nfs-utils.spec:1.103

--- SPECS/nfs-utils.spec:1.102	Thu May  4 22:57:26 2006
+++ SPECS/nfs-utils.spec	Mon May  8 17:55:38 2006
@@ -11,12 +11,12 @@
 Summary(ru):	őÔÉĚÉÔŮ ÄĚŃ NFS É ÄĹÍĎÎŮ ĐĎÄÄĹŇÖËÉ ÄĚŃ NFS-ÓĹŇ×ĹŇÁ ŃÄŇÁ
 Summary(uk):	őÔÉĚŚÔÉ ÄĚŃ NFS ÔÁ ÄĹÍĎÎÉ ĐŚÄÔŇÉÍËÉ ÄĚŃ NFS-ÓĹŇ×ĹŇÁ ŃÄŇÁ
 Name:		nfs-utils
-Version:	1.0.7
-Release:	5
+Version:	1.0.8
+Release:	0.1
 License:	GPL
 Group:		Networking/Daemons
 Source0:	http://dl.sourceforge.net/nfs/%{name}-%{version}.tar.gz
-# Source0-md5:	8f863120261cd572ad320a9152581e11
+# Source0-md5:	74fc2dd04b40c9d619ca41d3787ef8db
 Source1:	ftp://ftp.linuxnfs.sourceforge.org/pub/nfs/nfs.doc.tar.gz
 # Source1-md5:	ae7db9c61c5ad04f83bb99e5caed73da
 Source2:	nfs.init
@@ -26,24 +26,25 @@
 Source6:	nfslock.sysconfig
 Source7:	rquotad.sysconfig
 Source8:	nfsfs.init
-Patch0:		%{name}-paths.patch
-Patch1:		%{name}-time.patch
-Patch2:		%{name}-eepro-support.patch
-Patch3:		%{name}-install.patch
-Patch4:		%{name}-nolibs.patch
-Patch5:		%{name}-usn36.patch
-Patch6:		http://www.citi.umich.edu/projects/nfsv4/linux/nfs-utils-patches/1.0.7-2/%{name}-1.0.7-CITI_NFS4_ALL-2.dif
-Patch7:		%{name}-heimdal-internals.patch
-Patch8:		%{name}-rquotad-curblocks.patch
+Source9:	nfsfs.sysconfig
+Patch0:		%{name}-time.patch
+Patch1:		%{name}-eepro-support.patch
+Patch2:		%{name}-install.patch
+Patch3:		%{name}-nolibs.patch
+Patch4:		%{name}-heimdal.patch
+Patch5:		%{name}-heimdal-internals.patch
+Patch6:		http://www.citi.umich.edu/projects/nfsv4/linux/nfs-utils-patches/1.0.8-1/%{name}-1.0.8-CITI_NFS4_ALL-1.dif
 URL:		http://nfs.sourceforge.net/
 BuildRequires:	autoconf
+BuildRequires:	automake
 %if %{with nfs4}
 BuildRequires:	heimdal-devel >= 0.7
 BuildRequires:	libevent-devel >= 1.1a
 BuildRequires:	libnfsidmap-devel
-BuildRequires:	librpcsecgss-devel
+BuildRequires:	librpcsecgss-devel >= 0.10
 %endif
 BuildRequires:	libwrap-devel
+BuildRequires:	sed >= 4.0
 Requires(post):	fileutils
 Requires(post):	sed >= 4.0
 Requires(post,preun):	/sbin/chkconfig
@@ -172,22 +173,20 @@
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
-%patch7 -p1
-%patch8 -p1
-
-chmod u+w configure
 
 %build
 %if "%{_lib}" == "lib64"
-sed -i -e 's#/lib/#/%{_lib}/#g' configure.in
+sed -i -e 's#/lib/#/%{_lib}/#g' aclocal/kerberos5.m4
 %endif
-sed -i -e 's#libroken.a#libroken.so#g' configure.in
+sed -i -e 's#libroken.a#libroken.so#g' aclocal/kerberos5.m4
+%{__aclocal} -I aclocal
 %{__autoconf}
+%{__automake}
 %configure \
 %if %{with nfs4}
-	--enable-nfsv4 \
 	--enable-gss \
 	--with-krb5=%{_prefix} \
+	--enable-nfsv4 \
 %else
 	--disable-gss \
 	--disable-nfsv4 \
@@ -195,18 +194,21 @@
 	--enable-nfsv3 \
 	--enable-secure-statd \
 	--with-statedir=/var/lib/nfs
+
 %{__make} all
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{/sbin,%{_sbindir},%{_mandir}/man{5,8}} \
-	$RPM_BUILD_ROOT{%{_sysconfdir}/{rc.d/init.d,sysconfig},%{_var}/lib/nfs/{rpc_pipefs,v4recovery}}
+	$RPM_BUILD_ROOT%{_sysconfdir}/{rc.d/init.d,sysconfig} \
+	$RPM_BUILD_ROOT%{_var}/lib/nfs/{rpc_pipefs,v4recovery}
 
 %{__make} install \
-	install_prefix=$RPM_BUILD_ROOT
+	DESTDIR=$RPM_BUILD_ROOT
 
-install utils/idmapd/idmapd.conf $RPM_BUILD_ROOT%{_sysconfdir}
 install tools/rpcdebug/rpcdebug $RPM_BUILD_ROOT/sbin
+install utils/idmapd/idmapd.conf $RPM_BUILD_ROOT%{_sysconfdir}/
+
 install %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/nfs
 install %{SOURCE3} $RPM_BUILD_ROOT/etc/rc.d/init.d/nfslock
 install %{SOURCE4} $RPM_BUILD_ROOT/etc/rc.d/init.d/rquotad
@@ -214,11 +216,12 @@
 install %{SOURCE5} $RPM_BUILD_ROOT/etc/sysconfig/nfsd
 install %{SOURCE6} $RPM_BUILD_ROOT/etc/sysconfig/nfslock
 install %{SOURCE7} $RPM_BUILD_ROOT/etc/sysconfig/rquotad
+install %{SOURCE9} $RPM_BUILD_ROOT/etc/sysconfig/nfsclient
 
 > $RPM_BUILD_ROOT%{_var}/lib/nfs/rmtab
 > $RPM_BUILD_ROOT%{_sysconfdir}/exports
 
-rm -f $RPM_BUILD_ROOT%{_mandir}/man8/rpc.{mountd,nfsd,rquotad,statd,lockd,gssd,idmapd,svcgssd}.8
+rm -f $RPM_BUILD_ROOT%{_mandir}/man8/rpc.{mountd,nfsd,rquotad,statd,lockd,svcgssd,gssd,idmapd}.8
 rm -f $RPM_BUILD_ROOT%{_mandir}/man5/rpc.idmapd.conf.5
 echo ".so lockd.8"   > 	$RPM_BUILD_ROOT%{_mandir}/man8/rpc.lockd.8
 echo ".so mountd.8"  > 	$RPM_BUILD_ROOT%{_mandir}/man8/rpc.mountd.8
@@ -226,9 +229,9 @@
 echo ".so rquotad.8" >	$RPM_BUILD_ROOT%{_mandir}/man8/rpc.rquotad.8
 echo ".so statd.8"   >	$RPM_BUILD_ROOT%{_mandir}/man8/rpc.statd.8
 %if %{with nfs4}
-echo ".so gssd.8"    >  $RPM_BUILD_ROOT%{_mandir}/man8/rpc.gssd.8
-echo ".so idmapd.8"  >  $RPM_BUILD_ROOT%{_mandir}/man8/rpc.idmapd.8
-echo ".so svcgssd.8" >  $RPM_BUILD_ROOT%{_mandir}/man8/rpc.svcgssd.8
+echo ".so gssd.8"    >	$RPM_BUILD_ROOT%{_mandir}/man8/rpc.gssd.8
+echo ".so idmapd.8"  >	$RPM_BUILD_ROOT%{_mandir}/man8/rpc.idmapd.8
+echo ".so svcgssd.8" >	$RPM_BUILD_ROOT%{_mandir}/man8/rpc.svcgssd.8
 echo ".so idmapd.conf.5" > $RPM_BUILD_ROOT%{_mandir}/man5/rpc.idmapd.conf.5
 %endif
 
@@ -236,15 +239,12 @@
 
 ln -sf /bin/true $RPM_BUILD_ROOT/sbin/fsck.nfs
 
-cp -a nfs nfs-copy
-mv -f nfs-copy/*.ps ./
-mv -f nfs-copy html
+mv -f nfs html
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
-sed -i -e 's/NFSDTYPE=.*/NFSDTYPE=K/' /etc/sysconfig/nfsd
 /sbin/chkconfig --add nfs
 %service nfs restart "NFS daemon"
 
@@ -286,7 +286,7 @@
 
 %files
 %defattr(644,root,root,755)
-%doc ChangeLog README *.ps html
+%doc ChangeLog README html
 %attr(755,root,root) /sbin/rpcdebug
 %attr(755,root,root) /sbin/fsck.nfs
 %attr(755,root,root) %{_sbindir}/exportfs
@@ -318,7 +318,6 @@
 %{_mandir}/man8/nfsstat.8*
 %{_mandir}/man8/rpc.mountd.8*
 %{_mandir}/man8/rpc.nfsd.8*
-
 %if %{with nfs4}
 %attr(755,root,root) %{_sbindir}/rpc.svcgssd
 %{_mandir}/man8/*svcgss*
@@ -339,6 +338,7 @@
 %files clients
 %defattr(644,root,root,755)
 %attr(754,root,root) /etc/rc.d/init.d/nfsfs
+%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/nfsclient
 %attr(755,root,root) %{_sbindir}/showmount
 %{_mandir}/man8/showmount.8*
 
@@ -361,6 +361,7 @@
 %attr(755,root,root) %dir %{_var}/lib/nfs/rpc_pipefs
 %attr(755,root,root) %dir %{_var}/lib/nfs/v4recovery
 %if %{with nfs4}
+%attr(755,root,root) %{_sbindir}/gss_*
 %attr(755,root,root) %{_sbindir}/rpc.idmapd
 %attr(660,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/idmapd.conf
 %{_mandir}/man[58]/*idmap*
@@ -372,6 +373,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.103  2006/05/08 15:55:38  baggins
+- merge from AC-branch with CITI patch
+
 Revision 1.102  2006/05/04 20:57:26  wiget
 - rebuild with libevent 1.1a
 - release 5
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/nfs-utils.spec?r1=1.102&r2=1.103&f=u

