SPECS: subversion.spec - use %service, add missing chkconfig

[glen]

Author: glen                         Date: Mon Mar 13 22:37:43 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- use %service, add missing chkconfig

---- Files affected:
SPECS:
   subversion.spec (1.155 -> 1.156) 

---- Diffs:

================================================================
Index: SPECS/subversion.spec
diff -u SPECS/subversion.spec:1.155 SPECS/subversion.spec:1.156
--- SPECS/subversion.spec:1.155	Sun Mar 12 00:43:22 2006
+++ SPECS/subversion.spec	Mon Mar 13 23:37:38 2006
@@ -34,7 +34,7 @@
 %{?with_apache:BuildRequires:	apache-devel >= 2.2.0-8}
 BuildRequires:	automake
 BuildRequires:	db-devel >= 4.1.25
-BuildRequires:	rpmbuild(macros) >= 1.120
+BuildRequires:	rpmbuild(macros) >= 1.268
 %if %{with perl}
 BuildRequires:	perl-devel >= 1:5.8.0
 BuildRequires:	rpm-perlprov >= 4.1-13
@@ -392,31 +392,21 @@
 %postun -n perl-subversion -p /sbin/ldconfig
 
 %post svnserve
-if [ -f /var/lock/subsys/svnserve ]; then
-	/etc/rc.d/init.d/svnserve restart 1>&2
-else
-	echo "Run \"/etc/rc.d/init.d/svnserve start\" to start subversion svnserve daemon."
-fi
+/sbin/chkconfig --add svnserve
+%service svnserve restart "svnserve daemon"
+
 %preun svnserve
 if [ "$1" = "0" ]; then
-	if [ -f /var/lock/subsys/svnserve ]; then
-		/etc/rc.d/init.d/svnserve restart 1>&2
-	fi
+	%service svnserve stop
+	/sbin/chkconfig --del svnserve
 fi
 
-
 %post -n apache-mod_dav_svn
-if [ -f /var/lock/subsys/httpd ]; then
-	/etc/rc.d/init.d/httpd restart 1>&2
-else
-	echo "Run \"/etc/rc.d/init.d/httpd start\" to start apache HTTP daemon."
-fi
+%service -q httpd restart
 
 %preun -n apache-mod_dav_svn
 if [ "$1" = "0" ]; then
-	if [ -f /var/lock/subsys/httpd ]; then
-		/etc/rc.d/init.d/httpd restart 1>&2
-	fi
+	%service -q httpd restart
 fi
 
 %files
@@ -526,6 +516,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.156  2006/03/13 22:37:38  glen
+- use %service, add missing chkconfig
+
 Revision 1.155  2006/03/11 23:43:22  pluto
 - more swig fixes.
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/subversion.spec?r1=1.155&r2=1.156&f=u