SPECS: oki4linux.spec - kill PreReq, use %service

[darekr]

Author: darekr                       Date: Sun Jul  8 17:00:03 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- kill PreReq, use %service

---- Files affected:
SPECS:
   oki4linux.spec (1.9 -> 1.10) 

---- Diffs:

================================================================
Index: SPECS/oki4linux.spec
diff -u SPECS/oki4linux.spec:1.9 SPECS/oki4linux.spec:1.10
--- SPECS/oki4linux.spec:1.9	Tue Feb 13 08:16:50 2007
+++ SPECS/oki4linux.spec	Sun Jul  8 18:59:58 2007
@@ -13,7 +13,8 @@
 Patch0:		%{name}-daemon.patch
 Patch1:		%{name}-a4.patch
 URL:		http://www.linuxprinting.org/
-PreReq:		rc-scripts
+BuildRequires:	rpmbuild(macros) >= 1.268
+Requires:	rc-scripts
 Requires(post,preun):	/sbin/chkconfig
 Requires:	ghostscript
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -53,17 +54,11 @@
 
 %post
 /sbin/chkconfig --add oki4daemon
-if [ -f /var/lock/subsys/oki4daemon ]; then
-	/etc/rc.d/init.d/oki4daemon restart 1>&2
-else
-	echo "Run \"/etc/rc.d/init.d/oki4daemon start\" to start oki4daemon daemon."
-fi
+%service oki4daemon restart
 
 %preun
 if [ "$1" = "0" ]; then
-	if [ -f /var/lock/subsys/oki4daemon ]; then
-		/etc/rc.d/init.d/oki4daemon stop 1>&2
-	fi
+	%service oki4daemon stop
 	/sbin/chkconfig --del oki4daemon
 fi
 
@@ -81,6 +76,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.10  2007/07/08 16:59:58  darekr
+- kill PreReq, use %service
+
 Revision 1.9  2007/02/13 07:16:50  glen
 - tabs in preamble
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/oki4linux.spec?r1=1.9&r2=1.10&f=u