SPECS: sqwebmail.spec - use %service to respect skip auto restarts...

[glen]

Author: glen                         Date: Wed Jan  4 16:19:25 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- use %service to respect skip auto restarts of services; rel 2

---- Files affected:
SPECS:
   sqwebmail.spec (1.87 -> 1.88) 

---- Diffs:

================================================================
Index: SPECS/sqwebmail.spec
diff -u SPECS/sqwebmail.spec:1.87 SPECS/sqwebmail.spec:1.88
--- SPECS/sqwebmail.spec:1.87	Sun Jan  1 19:38:08 2006
+++ SPECS/sqwebmail.spec	Wed Jan  4 17:19:20 2006
@@ -10,7 +10,7 @@
 Summary(pl):	SqWebMail - Klient pocztowy CGI dla skrzynek Maildir
 Name:		sqwebmail
 Version:	5.0.4
-Release:	1.6
+Release:	2
 License:	GPL
 Group:		Applications/Mail
 Source0:	http://dl.sourceforge.net/courier/%{name}-%{version}.tar.bz2
@@ -37,7 +37,7 @@
 BuildRequires:	libtool
 BuildRequires:	procps
 BuildRequires:	rpm-perlprov
-BuildRequires:	rpmbuild(macros) >= 1.264
+BuildRequires:	rpmbuild(macros) >= 1.268
 BuildRequires:	sysconftool
 Requires(post,preun):	/sbin/chkconfig
 Requires:	FHS >= 2.3-12
@@ -190,11 +190,7 @@
 %post
 [ -L %{_datadir}/sqwebmail/html/en ] || ln -fs en-us %{_datadir}/sqwebmail/html/en
 /sbin/chkconfig --add sqwebmail
-if [ -f /var/lock/subsys/sqwebmail ]; then
-	/etc/rc.d/init.d/sqwebmail restart 1>&2
-else
-	echo "Run \"/etc/rc.d/init.d/sqwebmail start\" to start sqwebmail daemon."
-fi
+%service sqwebmail restart
 
 %preun
 if [ "$1" = "0" ]; then
@@ -283,15 +279,11 @@
 
 if [ "$httpd_reload" ]; then
 	/usr/sbin/webapp register httpd %{_webapp}
-	if [ -f /var/lock/subsys/httpd ]; then
-		/etc/rc.d/init.d/httpd reload 1>&2
-	fi
+	%service httpd reload
 fi
 if [ "$apache_reload" ]; then
 	/usr/sbin/webapp register apache %{_webapp}
-	if [ -f /var/lock/subsys/apache ]; then
-		/etc/rc.d/init.d/apache reload 1>&2
-	fi
+	%service apache reload
 fi
 
 %files
@@ -374,6 +366,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.88  2006/01/04 16:19:20  glen
+- use %service to respect skip auto restarts of services; rel 2
+
 Revision 1.87  2006/01/01 18:38:08  glen
 - move cgi program to /usr/lib/cgi-bin
 - cgi program permissions changed to 755 root:root (i see no point having them 755 root:mail)
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/sqwebmail.spec?r1=1.87&r2=1.88&f=u