SPECS: perl-CGI-SpeedyCGI.spec - use %service; fix apache deps

[glen]

Author: glen                         Date: Tue Jun  6 11:32:16 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- use %service; fix apache deps

---- Files affected:
SPECS:
   perl-CGI-SpeedyCGI.spec (1.57 -> 1.58) 

---- Diffs:

================================================================
Index: SPECS/perl-CGI-SpeedyCGI.spec
diff -u SPECS/perl-CGI-SpeedyCGI.spec:1.57 SPECS/perl-CGI-SpeedyCGI.spec:1.58
--- SPECS/perl-CGI-SpeedyCGI.spec:1.57	Tue Jun  6 13:03:44 2006
+++ SPECS/perl-CGI-SpeedyCGI.spec	Tue Jun  6 13:32:10 2006
@@ -28,6 +28,7 @@
 %{?with_apache1:BuildRequires:	apache1-devel}
 BuildRequires:	perl-devel >= 1:5.8.0
 BuildRequires:	rpm-perlprov >= 3.0.3-16
+BuildRequires:	rpmbuild(macros) >= 1.268
 Requires:	perl(DynaLoader) = %(%{__perl} -MDynaLoader -e 'print DynaLoader->VERSION')
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -64,7 +65,6 @@
 Group:		Networking/Daemons
 Requires:	%{name} = %{version}-%{release}
 Requires:	apache(modules-api) = %apache_modules_api
-Requires:	apache >= 2.0.36
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description -n apache-mod_speedycgi
@@ -78,6 +78,7 @@
 Summary(pl):	Moduł apache SpeedyCGI
 Group:		Networking/Daemons
 Requires:	%{name} = %{version}-%{release}
+Requires:	apache1 >= 1.3.33-2
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description -n apache1-mod_speedycgi
@@ -136,27 +137,19 @@
 rm -rf $RPM_BUILD_ROOT
 
 %post -n apache-mod_speedycgi
-if [ -f /var/lock/subsys/httpd ]; then
-	/etc/rc.d/init.d/httpd restart 1>&2
-fi
+%service -q httpd restart
 
 %post -n apache1-mod_speedycgi
-if [ -f /var/lock/subsys/apache ]; then
-	/etc/rc.d/init.d/apache restart 1>&2
-fi
+%service -q apache restart
 
 %preun -n apache-mod_speedycgi
 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
 
 %preun -n apache1-mod_speedycgi
 if [ "$1" = "0" ]; then
-	if [ -f /var/lock/subsys/apache ]; then
-		/etc/rc.d/init.d/apache restart 1>&2
-	fi
+	%service -q apache restart
 fi
 
 %files
@@ -187,6 +180,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.58  2006/06/06 11:32:10  glen
+- use %service; fix apache deps
+
 Revision 1.57  2006/06/06 11:03:44  qboosh
 - updated bcond desc
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/perl-CGI-SpeedyCGI.spec?r1=1.57&r2=1.58&f=u