Author: baggins Date: Fri Oct 7 12:20:28 2011 GMT Module: packages Tag: HEAD ---- Log message: - merge -lock into -common - package blkmapd in -clients subpackage - drop very old triggers (it was getting messy here)
---- Files affected: packages/nfs-utils: nfs-utils.spec (1.212 -> 1.213) ---- Diffs: ================================================================ Index: packages/nfs-utils/nfs-utils.spec diff -u packages/nfs-utils/nfs-utils.spec:1.212 packages/nfs-utils/nfs-utils.spec:1.213 --- packages/nfs-utils/nfs-utils.spec:1.212 Fri Oct 7 13:41:43 2011 +++ packages/nfs-utils/nfs-utils.spec Fri Oct 7 14:20:23 2011 @@ -1,7 +1,5 @@ # $Revision$, $Date$ # TODO -# - where to package pNFS blkmapd client deamon (clients or separate package) -# - consider enabling: libmount-mount # - should unmount /proc/fs/nfsd and /var/lib/nfs/rpc_pipefs at package # uninstall (or in service nfs stop) # @@ -16,7 +14,7 @@ Summary(uk.UTF-8): Утиліти для NFS та демони підтримки для NFS-сервера ядра Name: nfs-utils Version: 1.2.5 -Release: 2 +Release: 2.1 License: GPL v2 Group: Networking/Daemons #Source0: http://www.kernel.org/pub/linux/utils/nfs/%{name}-%{version}.tar.bz2 @@ -138,32 +136,21 @@ zamountowani na tym serwerze. Ten pakiet nie jest konieczny do zamountowania zasobów NFS. -%package lock -Summary: Programs for NFS file locking -Summary(pl.UTF-8): Programy do obsługi blokowania plików poprzez NFS (lock) +%package common +Summary: Common programs for NFS +Summary(pl.UTF-8): Wspólne programy do obsługi NFS Group: Networking Requires(post,preun): /sbin/chkconfig -Requires: rc-scripts -Requires: rpcbind >= 0.1.7 +Provides: user(rpcstatd) Provides: group(rpcstatd) Provides: nfslockd -Provides: user(rpcstatd) +Provides: nfs-utils-lock +Requires: libnfsidmap >= 0.21-3 +Requires: rc-scripts +Requires: rpcbind >= 0.1.7 +Obsoletes: nfs-utils-lock Obsoletes: knfsd-lock Obsoletes: nfslockd - -%description lock -The nfs-lock pacage contains programs which support the NFS file lock. -Install nfs-lock if you want to use file lock over NFS. - -%description lock -l pl.UTF-8 -Ten pakiet zawiera programy umożliwiające wykonywanie blokowania -plików (file locking) poprzez NFS. - -%package common -Summary: Common programs for NFS -Summary(pl.UTF-8): Wspólne programy do obsługi NFS -Group: Networking -Requires: libnfsidmap >= 0.21-3 Conflicts: mount < 2.13-0.pre7.1 %description common @@ -283,6 +270,8 @@ %service nfsfs restart /sbin/chkconfig --add gssd %service gssd restart "RPC gssd" +/sbin/chkconfig --add blkmapd +%service blkmapd restart "pNFS blkmapd" %preun clients if [ "$1" = "0" ]; then @@ -290,56 +279,40 @@ /sbin/chkconfig --del nfsfs %service gssd stop /sbin/chkconfig --del gssd + %service blkmapd stop + /sbin/chkconfig --del blkmapd fi -%pre lock +%pre common %groupadd -g 191 rpcstatd %useradd -u 191 -d /var/lib/nfs/statd -s /bin/false -c "RPC statd user" -g rpcstatd rpcstatd -%post lock +%post common +/sbin/chkconfig --add idmapd +%service idmapd restart "RPC idmapd" /sbin/chkconfig --add nfslock %service nfslock restart "RPC statd" -%preun lock +%preun common if [ "$1" = "0" ]; then + %service idmapd stop + /sbin/chkconfig --del idmapd %service nfslock stop /sbin/chkconfig --del nfslock fi -%postun lock +%postun common if [ "$1" = "0" ]; then %userremove rpcstatd %groupremove rpcstatd fi -%post common -/sbin/chkconfig --add idmapd -%service idmapd restart "RPC idmapd" - -%preun common -if [ "$1" = "0" ]; then - %service idmapd stop - /sbin/chkconfig --del idmapd +%triggerpostun common -- %{name}-lock < 1.2.5-3 +if [ -f /etc/sysconfig/nfslock.rpmsave ]; then + mv -f /etc/sysconfig/nfslock{,.rpmnew} + mv -f /etc/sysconfig/nfslock.rpmsave /etc/sysconfig/nfslock fi -%triggerpostun -- %{name} < 1.1.0-0.rc1.1 -/sbin/chkconfig nfs reset -/sbin/chkconfig svcgssd reset - -%triggerpostun lock -- %{name}-lock < 1.1.0-0.rc1.1 -/sbin/chkconfig nfslock reset - -%triggerpostun clients -- %{name}-clients < 1.1.0-0.rc1.1 -if [ -f /etc/sysconfig/nfsclient.rpmsave ]; then - mv -f /etc/sysconfig/nfsfs{,.rpmnew} - mv -f /etc/sysconfig/nfsclient.rpmsave /etc/sysconfig/nfsfs -fi -/sbin/chkconfig nfsfs reset -/sbin/chkconfig gssd reset - -%triggerpostun common -- %{name}-common < 1.1.0-0.rc1.1 -/sbin/chkconfig idmapd reset - %files %defattr(644,root,root,755) %doc ChangeLog README html @@ -374,24 +347,10 @@ %{_mandir}/man8/rpcdebug.8* %{_mandir}/man8/svcgssd.8* -%files lock -%defattr(644,root,root,755) -%attr(700,rpcstatd,rpcstatd) %dir %{_var}/lib/nfs/statd -%attr(700,rpcstatd,rpcstatd) %dir %{_var}/lib/nfs/statd/sm -%attr(700,rpcstatd,rpcstatd) %dir %{_var}/lib/nfs/statd/sm.bak -%attr(600,rpcstatd,rpcstatd) %config(noreplace) %verify(not md5 mtime size) %{_var}/lib/nfs/statd/state -%attr(755,root,root) %{_sbindir}/rpc.statd -%attr(755,root,root) %{_sbindir}/sm-notify -%attr(755,root,root) %{_sbindir}/start-statd -%attr(754,root,root) /etc/rc.d/init.d/nfslock -%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/nfslock -%{_mandir}/man8/rpc.sm-notify.8* -%{_mandir}/man8/rpc.statd.8* -%{_mandir}/man8/sm-notify.8* -%{_mandir}/man8/statd.8* - %files clients %defattr(644,root,root,755) +%attr(754,root,root) /etc/rc.d/init.d/blkmapd +%attr(754,root,root) /etc/rc.d/init.d/gssd %attr(754,root,root) /etc/rc.d/init.d/nfsfs %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/nfsfs %attr(664,root,fileshare) %config(noreplace) %verify(not md5 mtime size) /etc/nfsmount.conf @@ -399,11 +358,11 @@ %attr(4755,root,root) /sbin/umount.nfs %attr(4755,root,root) /sbin/mount.nfs4 %attr(4755,root,root) /sbin/umount.nfs4 +%attr(755,root,root) %{_sbindir}/blkmapd %attr(755,root,root) %{_sbindir}/mountstats %attr(755,root,root) %{_sbindir}/nfsiostat -%attr(755,root,root) %{_sbindir}/showmount %attr(755,root,root) %{_sbindir}/rpc.gssd -%attr(754,root,root) /etc/rc.d/init.d/gssd +%attr(755,root,root) %{_sbindir}/showmount %{_mandir}/man5/nfsmount.conf.5* %{_mandir}/man8/gssd.8* %{_mandir}/man8/mount.nfs.8* @@ -415,18 +374,31 @@ %files common %defattr(644,root,root,755) +%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/nfslock +%attr(754,root,root) /etc/rc.d/init.d/idmapd +%attr(754,root,root) /etc/rc.d/init.d/nfslock %attr(755,root,root) %{_sbindir}/gss_clnt_send_err %attr(755,root,root) %{_sbindir}/gss_destroy_creds %attr(755,root,root) %{_sbindir}/nfsidmap %attr(755,root,root) %{_sbindir}/rpc.idmapd -%attr(754,root,root) /etc/rc.d/init.d/idmapd +%attr(755,root,root) %{_sbindir}/rpc.statd +%attr(755,root,root) %{_sbindir}/sm-notify +%attr(755,root,root) %{_sbindir}/start-statd %dir %{_var}/lib/nfs %dir %{_var}/lib/nfs/rpc_pipefs %dir %{_var}/lib/nfs/v4recovery +%attr(700,rpcstatd,rpcstatd) %dir %{_var}/lib/nfs/statd +%attr(700,rpcstatd,rpcstatd) %dir %{_var}/lib/nfs/statd/sm +%attr(700,rpcstatd,rpcstatd) %dir %{_var}/lib/nfs/statd/sm.bak +%attr(600,rpcstatd,rpcstatd) %config(noreplace) %verify(not md5 mtime size) %{_var}/lib/nfs/statd/state %{_mandir}/man5/nfs.5* %{_mandir}/man8/idmapd.8* %{_mandir}/man8/nfsidmap.8* %{_mandir}/man8/rpc.idmapd.8* +%{_mandir}/man8/rpc.sm-notify.8* +%{_mandir}/man8/rpc.statd.8* +%{_mandir}/man8/sm-notify.8* +%{_mandir}/man8/statd.8* %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -434,6 +406,11 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.213 2011/10/07 12:20:23 baggins +- merge -lock into -common +- package blkmapd in -clients subpackage +- drop very old triggers (it was getting messy here) + Revision 1.212 2011/10/07 11:41:43 sls - in fact BRequired libnfsidmap-0.24 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/nfs-utils/nfs-utils.spec?r1=1.212&r2=1.213&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
