Author: baggins                      Date: Mon May  8 12:00:20 2006 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- up to 1.0.8
- NFSv4 support:
        - added idmapd daemon
        - gss disabled because it needs very recent heimdal (cvs snapshot)
        - added missing dirs (/var/lib/nfs/{v4recovery,rpc_pipefs}

---- Files affected:
SPECS:
   nfs-utils.spec (1.87 -> 1.87.2.1) 

---- Diffs:

================================================================
Index: SPECS/nfs-utils.spec
diff -u SPECS/nfs-utils.spec:1.87 SPECS/nfs-utils.spec:1.87.2.1
--- SPECS/nfs-utils.spec:1.87   Wed Dec 22 15:10:27 2004
+++ SPECS/nfs-utils.spec        Mon May  8 14:00:14 2006
@@ -5,12 +5,12 @@
 Summary(ru):   őÔÉĚÉÔŮ ÄĚŃ NFS É ÄĹÍĎÎŮ ĐĎÄÄĹŇÖËÉ ÄĚŃ NFS-ÓĹŇ×ĹŇÁ ŃÄŇÁ
 Summary(uk):   őÔÉĚŚÔÉ ÄĚŃ NFS ÔÁ ÄĹÍĎÎÉ ĐŚÄÔŇÉÍËÉ ÄĚŃ NFS-ÓĹŇ×ĹŇÁ ŃÄŇÁ
 Name:          nfs-utils
-Version:       1.0.7
-Release:       2
+Version:       1.0.8
+Release:       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
@@ -20,16 +20,23 @@
 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
+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
 URL:           http://nfs.sourceforge.net/
 BuildRequires: autoconf
-PreReq:                rc-scripts >= 0.4.0
-PreReq:                setup >= 2.4.6-7
+BuildRequires: automake
+# GSS requires devel snap
+#BuildRequires:        heimdal-static
+BuildRequires: libevent-devel
+BuildRequires: libnfsidmap-devel
+BuildRequires: librpcsecgss-devel >= 0.10
+Requires:      rc-scripts >= 0.4.0
+Requires:      setup >= 2.4.6-7
 Requires(post,preun):  /sbin/chkconfig
 Requires(post):        fileutils
 Requires(post):        sed
@@ -134,6 +141,25 @@
 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
+
+%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.
+
 %prep
 %setup -q -a1
 %patch0 -p1
@@ -141,17 +167,16 @@
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
-%patch5 -p1
-
-chmod u+w configure
 
 %build
+%{__aclocal} -I aclocal
 %{__autoconf}
-# nfsv4 needs libevent and libnfsidmap
-# gss needs nfsidmap.h
+%{__automake}
+# GSS requires devel heimdal snap
 %configure \
        --disable-gss \
-       --disable-nfsv4 \
+       --with-krb5=/usr \
+       --enable-nfsv4 \
        --enable-nfsv3 \
        --enable-secure-statd \
        --with-statedir=/var/lib/nfs
@@ -160,35 +185,40 @@
 %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}
+       $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 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
 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}.8
+rm -f 
$RPM_BUILD_ROOT%{_mandir}/man8/rpc.{mountd,nfsd,rquotad,statd,lockd,idmapd}.8
 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
 
 touch $RPM_BUILD_ROOT/var/lib/nfs/xtab
 
 ln -sf /bin/true $RPM_BUILD_ROOT/sbin/fsck.nfs
 
-mv -f nfs/*.ps ./
 mv -f nfs html
 
 %clean
@@ -263,7 +293,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
@@ -278,6 +308,8 @@
 %attr(754,root,root) /etc/rc.d/init.d/nfs
 
 %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
 
 %attr(664,root,fileshare) %config(noreplace) %verify(not size mtime md5) 
%{_sysconfdir}/exports
 %config(noreplace) %verify(not size mtime md5) /etc/sysconfig/nfsd
@@ -323,12 +355,29 @@
 #%config(noreplace) %verify(not size mtime md5) /etc/sysconfig/rquotad
 #%%{_mandir}/man8/rpc.rquotad.8*
 
+%files idmapd
+%defattr(644,root,root,755)
+%attr(664,root,fileshare) %config(noreplace) %verify(not size mtime md5) 
%{_sysconfdir}/idmapd.conf
+%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*
+
 %define date   %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
 * %{date} PLD Team <[EMAIL PROTECTED]>
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.87.2.1  2006/05/08 12:00:14  baggins
+- up to 1.0.8
+- NFSv4 support:
+       - added idmapd daemon
+       - gss disabled because it needs very recent heimdal (cvs snapshot)
+       - added missing dirs (/var/lib/nfs/{v4recovery,rpc_pipefs}
+
 Revision 1.87  2004/12/22 14:10:27  hawk
 - oops
 
================================================================

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

_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to