rpms/cachefilesd/devel cachefilesd-0.4-initscript.patch, NONE, 1.1 cachefilesd.spec, 1.12, 1.13

[fedora-cvs-commits at redhat.com]

Author: steved

Update of /cvs/dist/rpms/cachefilesd/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv753

Modified Files:
	cachefilesd.spec 
Added Files:
	cachefilesd-0.4-initscript.patch 
Log Message:
- Updated init.d script to look for cachefilesd in /sbin
- Added postun and preun rules so cachefilesd is stopped
  and started when the rpm is updated or removed.


cachefilesd-0.4-initscript.patch:
 cachefilesd.initd |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE cachefilesd-0.4-initscript.patch ---
--- cachefilesd-0.4/cachefilesd.initd.orig	2006-08-01 11:52:50.000000000 -0400
+++ cachefilesd-0.4/cachefilesd.initd	2006-08-08 17:25:39.513713000 -0400
@@ -26,7 +26,7 @@
 MODPROBE_ARGS=""
 PROG="cachefilesd"
 
-[ ! -x /usr/sbin/$PROG ] && exit 0
+[ ! -x /sbin/$PROG ] && exit 0
 
 # Check for and source configuration file otherwise set defaults
 [ -f /etc/sysconfig/$PROG ] && . /etc/sysconfig/$PROG


Index: cachefilesd.spec
===================================================================
RCS file: /cvs/dist/rpms/cachefilesd/devel/cachefilesd.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- cachefilesd.spec	7 Aug 2006 22:05:37 -0000	1.12
+++ cachefilesd.spec	8 Aug 2006 21:43:24 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           cachefilesd
 Version:        0.4
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        CacheFiles userspace management daemon
 Group:          System Environment/Daemons
 License:        GPL
@@ -12,6 +12,8 @@
 Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/chkconfig
 
+Patch1: cachefilesd-0.4-initscript.patch
+
 %description
 The cachefilesd daemon manages the caching files and directory that are
 that are used by network filesystems such a AFS and NFS to  
@@ -20,6 +22,8 @@
 %prep
 %setup -q
 
+%patch1 -p1
+
 %build
 %ifarch s390 s390x
 PIE="-fPIE"
@@ -50,9 +54,15 @@
 
 %preun
 if [ $1 -eq 0 ]; then
+	/sbin/service cachefilesd stop
 	/sbin/chkconfig --del %{name}
 fi
 
+%postun
+if [ "$1" -ge 1 ]; then
+	/sbin/service cachefilesd condrestart > /dev/null
+fi
+
 
 %files
 %defattr(-,root,root)
@@ -63,6 +73,11 @@
 %{_mandir}/*/*
 
 %changelog
+* Tue Aug  8 2006 Steve Dickson <steved at redhat.com> 0.4-3
+- Updated init.d script to look for cachefilesd in /sbin
+- Added postun and preun rules so cachefilesd is stopped
+  and started when the rpm is updated or removed.
+
 * Tue Aug  7 2006 Jesse Keating <jkeating at redhat.com> 0.4-2
 - require /sbin/chkconfig not /usr/bin/chkconfig