SPECS: dhcdbd.spec - use %service

[glen]

Author: glen                         Date: Sun Apr 16 21:33:25 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- use %service

---- Files affected:
SPECS:
   dhcdbd.spec (1.7 -> 1.8) 

---- Diffs:

================================================================
Index: SPECS/dhcdbd.spec
diff -u SPECS/dhcdbd.spec:1.7 SPECS/dhcdbd.spec:1.8
--- SPECS/dhcdbd.spec:1.7	Sat Mar 25 04:43:33 2006
+++ SPECS/dhcdbd.spec	Sun Apr 16 23:33:16 2006
@@ -16,6 +16,7 @@
 Source1:	%{name}.init
 URL:		http://people.redhat.com/~jvdias/dhcdbd/
 BuildRequires:	dbus-devel >= 0.33
+BuildRequires:	rpmbuild(macros) >= 1.268
 Requires:	dbus >= 0.33
 Requires:	dhcp-client >= 3:3.0.3-3
 Requires:	rc-scripts
@@ -54,20 +55,16 @@
 
 %post
 /sbin/chkconfig --add dhcdbd
+%service dhcdbd restart "DHCP D-BUS daemon"
 if [ -f /var/lock/subsys/dhcdbd ]; then
-	/etc/rc.d/init.d/dhcdbd restart 1>&2
-else
-	echo "Run \"/etc/rc.d/init.d/dhcdbd start\" to start DHCP D-BUS daemon."
-	echo "You will probably also need \"/etc/rc.d/init.d/messagebus restart\""
+	echo "You will probably also need \"/sbin/service messagebus restart\""
 	echo "to reload the *.service database."
 fi
 
 %preun
 if [ "$1" = "0" ]; then
-	if [ -f /var/lock/subsys/dhcdbd ]; then
-		/etc/rc.d/init.d/dhcdbd stop 1>&2
-	fi
-	[ ! -x /sbin/chkconfig ] || /sbin/chkconfig --del dhcdbd
+	%service dhcdbd stop
+	/sbin/chkconfig --del dhcdbd
 fi
 
 %files
@@ -84,6 +81,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.8  2006/04/16 21:33:16  glen
+- use %service
+
 Revision 1.7  2006/03/25 03:43:33  aredridel
 - up to 1.12
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/dhcdbd.spec?r1=1.7&r2=1.8&f=u