SPECS (AC-branch): nfs-utils.spec - sorted requires - sorted verif...
baggins
baggins at pld-linux.org
Mon May 8 17:48:11 CEST 2006
Author: baggins Date: Mon May 8 15:48:11 2006 GMT
Module: SPECS Tag: AC-branch
---- Log message:
- sorted requires
- sorted verify flags
- use service
---- Files affected:
SPECS:
nfs-utils.spec (1.87.2.8 -> 1.87.2.9)
---- Diffs:
================================================================
Index: SPECS/nfs-utils.spec
diff -u SPECS/nfs-utils.spec:1.87.2.8 SPECS/nfs-utils.spec:1.87.2.9
--- SPECS/nfs-utils.spec:1.87.2.8 Mon May 8 17:15:33 2006
+++ SPECS/nfs-utils.spec Mon May 8 17:48:06 2006
@@ -40,17 +40,18 @@
BuildRequires: libnfsidmap-devel
BuildRequires: librpcsecgss-devel >= 0.10
%endif
+BuildRequires: libwrap-devel
+BuildRequires: sed >= 4.0
+Requires(post): fileutils
+Requires(post,preun): /sbin/chkconfig
Requires: %{name}-common = %{version}-%{release}
+Requires: portmap >= 4.0
Requires: rc-scripts >= 0.4.0
Requires: setup >= 2.4.6-7
-Requires(post,preun): /sbin/chkconfig
-Requires(post): fileutils
-Requires(post): sed
-Requires: portmap >= 4.0
Provides: nfsdaemon
-Obsoletes: nfsdaemon
Obsoletes: knfsd
Obsoletes: nfs-server
+Obsoletes: nfsdaemon
Conflicts: kernel < 2.2.5
ExcludeArch: armv4l
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -84,15 +85,15 @@
Summary: Clients for connecting to a remote NFS server
Summary(pl): Klienci do łączenia się ze zdalnym serwerem NFS
Group: Networking
-Requires: rc-scripts
Requires(post,preun): /sbin/chkconfig
Requires: %{name}-common = %{version}-%{release}
Requires: psmisc
-Provides: nfsclient
+Requires: rc-scripts
Provides: nfs-server-clients
-Obsoletes: nfsclient
-Obsoletes: nfs-server-clients
+Provides: nfsclient
Obsoletes: knfsd-clients
+Obsoletes: nfs-server-clients
+Obsoletes: nfsclient
%description clients
The nfs-server-clients package contains the showmount program.
@@ -112,13 +113,13 @@
Summary: Programs for NFS file locking
Summary(pl): Programy do obsługi blokowania plików poprzez NFS (lock)
Group: Networking
-Requires: rc-scripts
Requires(post,preun): /sbin/chkconfig
#Requires: kernel >= 2.2.5
Requires: portmap >= 4.0
+Requires: rc-scripts
Provides: nfslockd
-Obsoletes: nfslockd
Obsoletes: knfsd-lock
+Obsoletes: nfslockd
%description lock
The nfs-lock pacage contains programs which support the NFS file lock.
@@ -132,8 +133,8 @@
Summary: Remote quota server
Summary(pl): Zdalny serwer quota
Group: Networking/Daemons
-Requires: rc-scripts
Requires(post,preun): /sbin/chkconfig
+Requires: rc-scripts
Obsoletes: quota-rquotad
%description rquotad
@@ -148,7 +149,7 @@
poprzez NFS. Rezultaty są używane przez quota(1), aby wyświetlić quotę
dla zdalnego systemu plików.
-%package common
+%package common
Summary: Common programs for NFS
Summary(pl): Wspólne programy do obsługi NFS
Group: Networking
@@ -240,66 +241,41 @@
%post
/sbin/chkconfig --add nfs
-if [ -r /var/lock/subsys/nfs ]; then
- /etc/rc.d/init.d/nfs restart >&2
-else
- echo "Run \"/etc/rc.d/init.d/nfs start\" to start NFS daemon."
-fi
-umask 022
+%service nfs restart "NFS daemon"
%preun
if [ "$1" = "0" ]; then
- if [ -r /var/lock/subsys/nfs ]; then
- /etc/rc.d/init.d/nfs stop >&2
- fi
+ %service nfs stop
/sbin/chkconfig --del nfs
fi
%post clients
/sbin/chkconfig --add nfsfs
-if [ -r /var/lock/subsys/nfsfs ]; then
- /etc/rc.d/init.d/nfsfs restart >&2
-else
- echo "Run \"/etc/rc.d/init.d/nfsfs start\" to mount all NFS volumes."
-fi
+%service nfsfs restart
%preun clients
if [ "$1" = "0" ]; then
- if [ -r /var/lock/subsys/nfsfs ]; then
- /etc/rc.d/init.d/nfsfs stop >&2
- fi
+ %service nfsfs stop
/sbin/chkconfig --del nfsfs
fi
%post lock
/sbin/chkconfig --add nfslock
-if [ -r /var/lock/subsys/nfslock ]; then
- /etc/rc.d/init.d/nfslock restart >&2
-else
- echo "Run \"/etc/rc.d/init.d/nfslock start\" to start nfslock daemon."
-fi
+%service nfslock restart "nfslock daemon"
%preun lock
if [ "$1" = "0" ]; then
- if [ -r /var/lock/subsys/nfslock ]; then
- /etc/rc.d/init.d/nfslock stop >&2
- fi
+ %service nfslock stop
/sbin/chkconfig --del nfslock
fi
%post rquotad
/sbin/chkconfig --add rquotad
-if [ -r /var/lock/subsys/rquotad ]; then
- /etc/rc.d/init.d/rquotad restart >&2
-else
- echo "Run \"/etc/rc.d/init.d/rquotad start\" to start NFS quota daemon."
-fi
+%service rquotad restart "NFS quota daemon"
%preun rquotad
if [ "$1" = "0" ]; then
- if [ -r /var/lock/subsys/rquotad ]; then
- /etc/rc.d/init.d/rquotad stop >&2
- fi
+ %service rquotad stop
/sbin/chkconfig --del rquotad
fi
@@ -319,15 +295,11 @@
%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
-%config(noreplace) %verify(not size mtime md5) %{_var}/lib/nfs/xtab
-%config(noreplace) %verify(not size mtime md5) %{_var}/lib/nfs/etab
-%config(noreplace) %verify(not size mtime md5) %{_var}/lib/nfs/rmtab
+%attr(664,root,fileshare) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/exports
+%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/nfsd
+%config(noreplace) %verify(not md5 mtime size) %{_var}/lib/nfs/xtab
+%config(noreplace) %verify(not md5 mtime size) %{_var}/lib/nfs/etab
+%config(noreplace) %verify(not md5 mtime size) %{_var}/lib/nfs/rmtab
%{_mandir}/man5/exports.5*
%{_mandir}/man7/nfsd.7*
@@ -351,17 +323,17 @@
%attr(755,root,root) %{_sbindir}/rpc.lockd
%attr(755,root,root) %{_sbindir}/rpc.statd
%attr(754,root,root) /etc/rc.d/init.d/nfslock
-%config(noreplace) %verify(not size mtime md5) /etc/sysconfig/nfslock
+%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/nfslock
%{_mandir}/man8/rpc.lockd.8*
%{_mandir}/man8/lockd.8*
%{_mandir}/man8/rpc.statd.8*
%{_mandir}/man8/statd.8*
-%config(noreplace) %verify(not size mtime md5) %{_var}/lib/nfs/state
+%config(noreplace) %verify(not md5 mtime size) %{_var}/lib/nfs/state
%files clients
%defattr(644,root,root,755)
%attr(754,root,root) /etc/rc.d/init.d/nfsfs
-%config(noreplace) %verify(not size mtime md5) /etc/sysconfig/nfsclient
+%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/nfsclient
%attr(755,root,root) %{_sbindir}/showmount
%{_mandir}/man8/showmount.8*
@@ -375,7 +347,7 @@
#%defattr(644,root,root,755)
#%attr(755,root,root) %{_sbindir}/rpc.rquotad
#%attr(754,root,root) /etc/rc.d/init.d/rquotad
-#%config(noreplace) %verify(not size mtime md5) /etc/sysconfig/rquotad
+#%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/rquotad
#%%{_mandir}/man8/rpc.rquotad.8*
%files common
@@ -396,6 +368,11 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.87.2.9 2006/05/08 15:48:06 baggins
+- sorted requires
+- sorted verify flags
+- use service
+
Revision 1.87.2.8 2006/05/08 15:15:33 baggins
- removed NFSDTYPE play in post
- release 1
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/nfs-utils.spec?r1=1.87.2.8&r2=1.87.2.9&f=u
More information about the pld-cvs-commit
mailing list