SPECS: nfs-utils.spec - unify nfsfs service syconfig file for %ser...

[glen]

Author: glen                         Date: Wed Aug 30 11:58:49 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- unify nfsfs service syconfig file for %service usage
- fix install re-entrancy
- rel 2

---- Files affected:
SPECS:
   nfs-utils.spec (1.110 -> 1.111) 

---- Diffs:

================================================================
Index: SPECS/nfs-utils.spec
diff -u SPECS/nfs-utils.spec:1.110 SPECS/nfs-utils.spec:1.111
--- SPECS/nfs-utils.spec:1.110	Mon Aug 21 22:52:31 2006
+++ SPECS/nfs-utils.spec	Wed Aug 30 13:58:44 2006
@@ -12,7 +12,7 @@
 Summary(uk):	őÔÉĚŚÔÉ ÄĚŃ NFS ÔÁ ÄĹÍĎÎÉ ĐŚÄÔŇÉÍËÉ ÄĚŃ NFS-ÓĹŇ×ĹŇÁ ŃÄŇÁ
 Name:		nfs-utils
 Version:	1.0.10
-Release:	1
+Release:	2
 License:	GPL
 Group:		Networking/Daemons
 Source0:	http://dl.sourceforge.net/nfs/%{name}-%{version}.tar.gz
@@ -216,7 +216,7 @@
 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
+install %{SOURCE9} $RPM_BUILD_ROOT/etc/sysconfig/nfsfs
 
 > $RPM_BUILD_ROOT%{_var}/lib/nfs/rmtab
 > $RPM_BUILD_ROOT%{_sysconfdir}/exports
@@ -239,7 +239,8 @@
 
 ln -sf /bin/true $RPM_BUILD_ROOT/sbin/fsck.nfs
 
-mv -f nfs html
+rm -rf html
+cp -a nfs html
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -284,6 +285,12 @@
 	/sbin/chkconfig --del rquotad
 fi
 
+%triggerpostun clients -- %{name}-clients < 1.0.10-1.2
+if [ -f /etc/sysconfig/nfsclient.rpmsave ]; then
+	mv -f /etc/sysconfig/nfsfs{,.rpmnew}
+	mv -f /etc/sysconfig/nfsclient.rpmsave /etc/sysconfig/nfsfs
+fi
+
 %files
 %defattr(644,root,root,755)
 %doc ChangeLog README html
@@ -338,7 +345,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
+%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/nfsfs
 %attr(755,root,root) %{_sbindir}/showmount
 %{_mandir}/man8/showmount.8*
 
@@ -373,6 +380,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.111  2006/08/30 11:58:44  glen
+- unify nfsfs service syconfig file for %service usage
+- fix install re-entrancy
+- rel 2
+
 Revision 1.110  2006/08/21 20:52:31  glen
 - rel 1
 
================================================================

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