SPECS: cvsd.spec - use %service

[glen]

Author: glen                         Date: Thu Apr 20 18:18:33 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- use %service

---- Files affected:
SPECS:
   cvsd.spec (1.23 -> 1.24) 

---- Diffs:

================================================================
Index: SPECS/cvsd.spec
diff -u SPECS/cvsd.spec:1.23 SPECS/cvsd.spec:1.24
--- SPECS/cvsd.spec:1.23	Thu Sep  8 08:50:41 2005
+++ SPECS/cvsd.spec	Thu Apr 20 20:18:27 2006
@@ -15,7 +15,7 @@
 #Source1:	%{name}.conf
 #Source2:	%{name}-passwd
 URL:		http://ch.tudelft.nl/~arthur/cvsd/
-BuildRequires:	rpmbuild(macros) >= 1.202
+BuildRequires:	rpmbuild(macros) >= 1.268
 Requires(post,preun):	/sbin/chkconfig
 Requires(postun):	/usr/sbin/groupdel
 Requires(postun):	/usr/sbin/userdel
@@ -64,7 +64,7 @@
 	DESTDIR=$RPM_BUILD_ROOT
 
 install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}
-#install %{SOURCE2} $RPM_BUILD_ROOT%{rootdir}/etc/passwd
+#install %{SOURCE2} $RPM_BUILD_ROOT%{rootdir}%{_sysconfdir}/passwd
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -83,22 +83,21 @@
 
 %post
 /sbin/chkconfig --add cvsd
-if [ -f /var/lock/subsys/cvsd ]; then
-	/etc/rc.d/init.d/cvsd restart 1>&2
-else
-	echo "Type \"/etc/rc.d/init.d/cvsd start\" to start cvsd." 1>&2
-fi
+%service cvsd restart "cvsd"
 
-echo "Now check out /etc/cvsd.conf and initialise the repository using: "
-echo "\"cvs -d :pserver:cvsadmin at localhost:/cvsroot init\" "
-echo "Also edit/modify/whatever the /home/cvsowner/cvsd-root/etc/passwd file."
-echo "Default user/passwds are cvs/cvs (for ro anon), user/pass. Change these!"
+if [ "$1" = 1 ]; then
+%banner -e %{name} <<EOF
+Now check out %{_sysconfdir}/cvsd.conf and initialise the repository using:
+cvs -d :pserver:cvsadmin at localhost:/cvsroot init
+
+Also edit/modify/whatever the /home/cvsowner/cvsd-root%{_sysconfdir}/passwd file.
+Default user/passwds are cvs/cvs (for ro anon), user/pass. Change these!
+EOF
+fi
 
 %preun
 if [ "$1" = "0" ]; then
-	if [ -f /var/lock/subsys/cvsd ]; then
-		/etc/rc.d/init.d/cvsd stop 1>&2
-	fi
+	%service cvsd stop
 	/sbin/chkconfig --del cvsd
 fi
 
@@ -126,7 +125,7 @@
 %dev(c,1,3) %{rootdir}/dev/null
 %dir %{rootdir}/lib
 %dir %{rootdir}/tmp
-#%config(noreplace) %verify(not size mtime md5) %{rootdir}/etc/passwd
+#%config(noreplace) %verify(not size mtime md5) %{rootdir}%{_sysconfdir}/passwd
 
 %define	date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -134,6 +133,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.24  2006/04/20 18:18:27  glen
+- use %service
+
 Revision 1.23  2005/09/08 06:50:41  paszczus
 - updated to 1.0.9
 - updated URL
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/cvsd.spec?r1=1.23&r2=1.24&f=u