SPECS (AC-branch): nfs-utils.spec - merged nfsv4 support from HEAD

baggins baggins at pld-linux.org
Mon May 8 14:38:25 CEST 2006 

Author: baggins                      Date: Mon May  8 12:38:25 2006 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- merged nfsv4 support from HEAD

---- Files affected:
SPECS:
   nfs-utils.spec (1.87.2.2 -> 1.87.2.3) 

---- Diffs:

================================================================
Index: SPECS/nfs-utils.spec
diff -u SPECS/nfs-utils.spec:1.87.2.2 SPECS/nfs-utils.spec:1.87.2.3
--- SPECS/nfs-utils.spec:1.87.2.2	Mon May  8 14:07:41 2006
+++ SPECS/nfs-utils.spec	Mon May  8 14:38:20 2006
@@ -1,4 +1,8 @@
 # $Revision$, $Date$
+#
+# Conditional build:
+%bcond_without	nfs4		# without NFSv4 support
+#
 Summary:	Kernel NFS server
 Summary(pl):	Działający na poziomie jądra serwer NFS
 Summary(pt_BR):	Os utilitários para o cliente e servidor NFS do Linux
@@ -6,7 +10,7 @@
 Summary(uk):	őÔÉĚŚÔÉ ÄĚŃ NFS ÔÁ ÄĹÍĎÎÉ ĐŚÄÔŇÉÍËÉ ÄĚŃ NFS-ÓĹŇ×ĹŇÁ ŃÄŇÁ
 Name:		nfs-utils
 Version:	1.0.8
-Release:	0.1
+Release:	0.4
 License:	GPL
 Group:		Networking/Daemons
 Source0:	http://dl.sourceforge.net/nfs/%{name}-%{version}.tar.gz
@@ -20,21 +24,22 @@
 Source6:	nfslock.sysconfig
 Source7:	rquotad.sysconfig
 Source8:	nfsfs.init
-Source9:	idmapd.sysconfig
-Source10:	idmapd.init
 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
 URL:		http://nfs.sourceforge.net/
 BuildRequires:	autoconf
 BuildRequires:	automake
-# GSS requires devel snap
-#BuildRequires:	heimdal-static
+%if %{with nfs4}
+BuildRequires:	heimdal-static
 BuildRequires:	libevent-devel
 BuildRequires:	libnfsidmap-devel
 BuildRequires:	librpcsecgss-devel >= 0.10
+%endif
+Requires:	%{name}-common = %{version}-%{release}
 Requires:	rc-scripts >= 0.4.0
 Requires:	setup >= 2.4.6-7
 Requires(post,preun):	/sbin/chkconfig
@@ -80,6 +85,7 @@
 Group:		Networking
 PreReq:		rc-scripts
 Requires(post,preun):	/sbin/chkconfig
+Requires:	%{name}-common = %{version}-%{release}
 Requires:	psmisc
 Provides:	nfsclient
 Provides:	nfs-server-clients
@@ -141,24 +147,16 @@
 poprzez NFS. Rezultaty są używane przez quota(1), aby wyświetlić quotę
 dla zdalnego systemu plików.
 
-%package idmapd
-Summary:	NFSv4 ID <-> Name Mapper
-Summary(pl):	Demon mapujący NFSv4 ID na nazwy
-Group:		Networking/Daemons
-PreReq:		rc-scripts
-Requires(post,preun):	/sbin/chkconfig
+%package common                                                                       
+Summary:	Common programs for NFS
+Summary(pl):	Wspólne programy do obsługi NFS
+Group:		Networking
 
-%description idmapd
-idmapd is the NFSv4 ID <-> name mapping daemon.  It provides
-functionality to the NFSv4 kernel client and server, to which
-it communicates via upcalls, by translating user and group IDs
-to names, and vice versa.         
-
-%description idmapd -l pl
-idmapd jest serwerem rpc mapującym NFSv4 ID na nazwy.
-Dostarcza kernelowemu klientowi i serwerowi NFSv4 funkcjonalność
-pozwalającą na komunikację z kernelem tłumacząc numery użytkowników
-i grup na nazwy, i vice versa.
+%description common
+Common programs for NFS.
+
+%description common -l pl
+Wspólne programy do obsługi NFS.
 
 %prep
 %setup -q -a1
@@ -167,19 +165,25 @@
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 %build
 %{__aclocal} -I aclocal
 %{__autoconf}
 %{__automake}
-# GSS requires devel heimdal snap
 %configure \
-	--disable-gss \
-	--with-krb5=/usr \
+%if %{with nfs4}
+	--enable-gss \
+	--with-krb5=%{_prefix} \
 	--enable-nfsv4 \
+%else
+	--disable-gss \
+	--disable-nfsv4 \
+%endif
 	--enable-nfsv3 \
 	--enable-secure-statd \
 	--with-statedir=/var/lib/nfs
+
 %{__make} all
 
 %install
@@ -198,22 +202,26 @@
 install %{SOURCE3} $RPM_BUILD_ROOT/etc/rc.d/init.d/nfslock
 install %{SOURCE4} $RPM_BUILD_ROOT/etc/rc.d/init.d/rquotad
 install %{SOURCE8} $RPM_BUILD_ROOT/etc/rc.d/init.d/nfsfs
-install %{SOURCE10} $RPM_BUILD_ROOT/etc/rc.d/init.d/idmapd
 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/idmapd
 
 > $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,idmapd}.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
 echo ".so nfsd.8"    >	$RPM_BUILD_ROOT%{_mandir}/man8/rpc.nfsd.8
 echo ".so rquotad.8" >	$RPM_BUILD_ROOT%{_mandir}/man8/rpc.rquotad.8
 echo ".so statd.8"   >	$RPM_BUILD_ROOT%{_mandir}/man8/rpc.statd.8
-echo ".so idmapd.8"   >	$RPM_BUILD_ROOT%{_mandir}/man8/rpc.idmapd.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 idmapd.conf.5" > $RPM_BUILD_ROOT%{_mandir}/man5/rpc.idmapd.conf.5
+%endif
 
 touch $RPM_BUILD_ROOT/var/lib/nfs/xtab
 
@@ -329,6 +337,10 @@
 %{_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*
+%endif
 
 %files lock
 %defattr(644,root,root,755)
@@ -348,6 +360,12 @@
 %attr(755,root,root) %{_sbindir}/showmount
 %{_mandir}/man8/showmount.8*
 
+%if %{with nfs4}
+%attr(755,root,root) %{_sbindir}/rpc.gssd
+%{_mandir}/man8/rpc.gssd*
+%{_mandir}/man8/gssd*
+%endif
+
 #%files rquotad
 #%defattr(644,root,root,755)
 #%attr(755,root,root) %{_sbindir}/rpc.rquotad
@@ -355,15 +373,17 @@
 #%config(noreplace) %verify(not size mtime md5) /etc/sysconfig/rquotad
 #%%{_mandir}/man8/rpc.rquotad.8*
 
-%files idmapd
+%files common
 %defattr(644,root,root,755)
-%attr(664,root,fileshare) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/idmapd.conf
+%attr(755,root,root) %dir %{_var}/lib/nfs
+%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(754,root,root) /etc/rc.d/init.d/idmapd
-%config(noreplace) %verify(not size mtime md5) /etc/sysconfig/idmapd
-%{_mandir}/man5/idmapd.conf.5*
-%{_mandir}/man8/idmapd.8*
-%{_mandir}/man8/rpc.idmapd.8*
+%attr(660,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/idmapd.conf
+%{_mandir}/man[58]/*idmap*
+%endif
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -371,6 +391,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.87.2.3  2006/05/08 12:38:20  baggins
+- merged nfsv4 support from HEAD
+
 Revision 1.87.2.2  2006/05/08 12:07:41  baggins
 - rel 0.1
 
================================================================

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

More information about the pld-cvs-commit mailing list