SPECS: mysqlstat.spec - use %service; rel 7

[glen]

Author: glen                         Date: Sat Apr 15 13:04:11 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- use %service; rel 7

---- Files affected:
SPECS:
   mysqlstat.spec (1.41 -> 1.42) 

---- Diffs:

================================================================
Index: SPECS/mysqlstat.spec
diff -u SPECS/mysqlstat.spec:1.41 SPECS/mysqlstat.spec:1.42
--- SPECS/mysqlstat.spec:1.41	Fri Feb  3 17:10:58 2006
+++ SPECS/mysqlstat.spec	Sat Apr 15 15:04:06 2006
@@ -4,7 +4,7 @@
 Summary(pl):	MYSQLSTAT - narzędzia do monitorowania, zapisywania i wyświetlania statystyk MySQL
 Name:		mysqlstat
 Version:	0.0.0.4
-Release:	6
+Release:	7
 Epoch:		0
 License:	GPL
 Group:		Applications/Databases
@@ -20,26 +20,26 @@
 Patch4:		%{name}-emptypass.patch
 Patch5:		%{name}-ndebug.patch
 URL:		http://www.mysqlstat.org/en/
+BuildRequires:	perl(Fcntl) >= 1.03
 BuildRequires:	perl-AppConfig >= 1.52
 BuildRequires:	perl-CGI >= 2.752
+BuildRequires:	perl-DBD-mysql >= 1.221
 BuildRequires:	perl-DBI >= 1.19
 BuildRequires:	perl-Digest-MD5 >= 1.19
-BuildRequires:	perl(Fcntl) >= 1.03
 BuildRequires:	perl-HTML-Template >= 2.5
-BuildRequires:	perl-DBD-mysql >= 1.221
 BuildRequires:	perl-Storable >= 2.04
 BuildRequires:	perl-rrdtool >= 1.00
 BuildRequires:	rpmbuild(macros) >= 1.264
+Requires(postun):	/usr/sbin/userdel
+Requires(pre):	/bin/id
+Requires(pre):	/usr/sbin/useradd
 Requires:	crondaemon
-Requires:	perl-AppConfig >= 1.52
-Requires:	perl-DBI >= 1.19
 Requires:	perl(Fcntl) >= 1.03
+Requires:	perl-AppConfig >= 1.52
 Requires:	perl-DBD-mysql >= 1.221
+Requires:	perl-DBI >= 1.19
 Requires:	perl-Storable >= 2.04
 Requires:	perl-rrdtool >= 1.00
-Requires(pre):	/bin/id
-Requires(pre):	/usr/sbin/useradd
-Requires(postun):	/usr/sbin/userdel
 Provides:	user(mysqlstat)
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -83,8 +83,6 @@
 Summary(pl):	MYSQLSTAT - skrypt CGI
 Group:		Applications/WWW
 Requires:	%{name} = %{epoch}:%{version}-%{release}
-Requires:	webserver = apache
-Requires:	webapps
 Requires:	apache(mod_access)
 Requires:	apache(mod_alias)
 Requires:	apache(mod_auth)
@@ -92,6 +90,8 @@
 Requires:	perl-CGI >= 2.752
 Requires:	perl-Digest-MD5 >= 1.19
 Requires:	perl-HTML-Template >= 2.5
+Requires:	webapps
+Requires:	webserver = apache
 
 %description cgi
 This package contains the cgi-script for MYSQLSTAT.
@@ -213,14 +213,10 @@
 fi
 
 if [ "$httpd_reload" ]; then
-	if [ -f /var/lock/subsys/httpd ]; then
-		/etc/rc.d/init.d/httpd reload 1>&2
-	fi
+	%service -q httpd reload
 fi
 if [ "$apache_reload" ]; then
-	if [ -f /var/lock/subsys/apache ]; then
-		/etc/rc.d/init.d/apache reload 1>&2
-	fi
+	%service -q apache reload
 fi
 
 %files
@@ -251,6 +247,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.42  2006/04/15 13:04:06  glen
+- use %service; rel 7
+
 Revision 1.41  2006/02/03 16:10:58  baggins
 - release 6
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/mysqlstat.spec?r1=1.41&r2=1.42&f=u