SPECS: camserv.spec - using %service

[glen]

Author: glen                         Date: Sun Mar 19 17:11:54 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- using %service

---- Files affected:
SPECS:
   camserv.spec (1.16 -> 1.17) 

---- Diffs:

================================================================
Index: SPECS/camserv.spec
diff -u SPECS/camserv.spec:1.16 SPECS/camserv.spec:1.17
--- SPECS/camserv.spec:1.16	Fri Feb 24 16:20:04 2006
+++ SPECS/camserv.spec	Sun Mar 19 18:11:49 2006
@@ -98,8 +98,8 @@
 mv -f $RPM_BUILD_ROOT%{_datadir}/%{name}/%{name}.cfg $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/%{name}.cfg
 mv -f $RPM_BUILD_ROOT%{_datadir}/%{name}/defpage.html $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/defpage.html
 
-ln -s /etc/%{name}/%{name}.cfg $RPM_BUILD_ROOT%{_datadir}/%{name}/%{name}.cfg
-ln -s /etc/%{name}/defpage.html $RPM_BUILD_ROOT%{_datadir}/%{name}/defpage.html
+ln -s %{_sysconfdir}/%{name}/%{name}.cfg $RPM_BUILD_ROOT%{_datadir}/%{name}/%{name}.cfg
+ln -s %{_sysconfdir}/%{name}/defpage.html $RPM_BUILD_ROOT%{_datadir}/%{name}/defpage.html
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -116,17 +116,11 @@
 
 %post relay
 /sbin/chkconfig --add %{name}-relay
-if [ -f /var/lock/subsys/%{name}-relay ]; then
-	/etc/rc.d/init.d/%{name}-relay restart 1>&2
-else
-	echo "Run \"/etc/rc.d/init.d/%{name}-relay start\" to start %{name}-relay service."
-fi
+%service %{name}-relay restart
 
 %preun relay
 if [ "$1" = "0" ]; then
-	if [ -f /var/lock/subsys/%{name}-relay ]; then
-		/etc/rc.d/init.d/%{name}-relay stop 1>&2
-	fi
+	%service %{name}-relay stop
 	/sbin/chkconfig --del %{name}-relay
 fi
 
@@ -157,6 +151,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.17  2006/03/19 17:11:49  glen
+- using %service
+
 Revision 1.16  2006/02/24 15:20:04  glen
 - use %service
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/camserv.spec?r1=1.16&r2=1.17&f=u