SPECS: vpnd.spec - use %service

darekr darekr at pld-linux.org
Thu Oct 4 19:46:09 CEST 2007


Author: darekr                       Date: Thu Oct  4 17:46:09 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- use %service

---- Files affected:
SPECS:
   vpnd.spec (1.14 -> 1.15) 

---- Diffs:

================================================================
Index: SPECS/vpnd.spec
diff -u SPECS/vpnd.spec:1.14 SPECS/vpnd.spec:1.15
--- SPECS/vpnd.spec:1.14	Mon Feb 12 23:09:19 2007
+++ SPECS/vpnd.spec	Thu Oct  4 19:46:03 2007
@@ -11,6 +11,7 @@
 Source1:	%{name}.init
 Source2:	%{name}.sysconfig
 URL:		http://sunsite.dk/vpnd/
+BuildRequires:	rpmbuild(macros) >= 1.268
 BuildRequires:	sed >= 4.0
 BuildRequires:	zlib-devel
 Requires(post,preun):	/sbin/chkconfig
@@ -58,17 +59,11 @@
 
 %post
 /sbin/chkconfig --add vpnd
-if [ -f %{_var}/lock/subsys/vpnd ]; then
-	/etc/rc.d/init.d/vpnd restart >&2
-else
-	echo "Run \"/etc/rc.d/init.d/vpnd start\" to start vtun daemons."
-fi
+%service vpnd restart
 
 %preun
 if [ "$1" = "0" ]; then
-	if [ -f %{_var}/lock/subsys/vpnd ]; then
-		/etc/rc.d/init.d/vpnd stop >&2
-	fi
+	%service vpnd stop
 	/sbin/chkconfig --del vpnd
 fi
 
@@ -87,6 +82,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.15  2007/10/04 17:46:03  darekr
+- use %service
+
 Revision 1.14  2007/02/12 22:09:19  glen
 - tabs in preamble
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/vpnd.spec?r1=1.14&r2=1.15&f=u



More information about the pld-cvs-commit mailing list