SPECS: php4.spec - %service -q, because only apache package should...

[glen]

Author: glen                         Date: Sun Aug 14 17:10:00 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- %service -q, because only apache package should say to start apache, not php packages

---- Files affected:
SPECS:
   php4.spec (1.467 -> 1.468) 

---- Diffs:

================================================================
Index: SPECS/php4.spec
diff -u SPECS/php4.spec:1.467 SPECS/php4.spec:1.468
--- SPECS/php4.spec:1.467	Sat Aug 13 14:04:24 2005
+++ SPECS/php4.spec	Sun Aug 14 19:09:55 2005
@@ -74,7 +74,7 @@
 Summary(uk):	PHP ÷ĹŇÓŚ§ 4 - ÍĎ×Á ĐŇĹĐŇĎĂĹÓŐ×ÁÎÎŃ HTML-ĆÁĘĚŚ×, ×ÉËĎÎŐ×ÁÎÁ ÎÁ ÓĹŇ×ĹŇŚ
 Name:		php4
 Version:	4.4.0
-Release:	4.44%{?with_hardening:hardened}
+Release:	4.48%{?with_hardening:hardened}
 Epoch:		3
 Group:		Libraries
 License:	PHP
@@ -1920,7 +1920,7 @@
 
 %post -n apache1-mod_php4
 if [ "$1" = "1" ]; then
-	%service apache restart
+	%service -q apache restart
 fi
 
 %postun -n apache1-mod_php4
@@ -1930,7 +1930,7 @@
 
 %post -n apache-mod_php4
 if [ "$1" = "1" ]; then
-	%service httpd restart
+	%service -q httpd restart
 fi
 
 %postun -n apache-mod_php4
@@ -1942,15 +1942,15 @@
 # macro called at extension post scriptlet
 %define	extension_post \
 if [ "$1" = "1" ]; then \
-	[ ! -f /etc/apache/conf.d/??_mod_php4.conf ] || %service apache restart \
-	[ ! -f /etc/httpd/httpd.conf/??_mod_php4.conf ] || %service httpd restart \
+	[ ! -f /etc/apache/conf.d/??_mod_php4.conf ] || %service -q apache restart \
+	[ ! -f /etc/httpd/httpd.conf/??_mod_php4.conf ] || %service -q httpd restart \
 fi
 
 # macro called at extension postun scriptlet
 %define	extension_postun \
 if [ "$1" = "0" ]; then \
-	[ ! -f /etc/apache/conf.d/??_mod_php4.conf ] || %service apache restart \
-	[ ! -f /etc/httpd/httpd.conf/??_mod_php4.conf ] || %service httpd restart \
+	[ ! -f /etc/apache/conf.d/??_mod_php4.conf ] || %service -q apache restart \
+	[ ! -f /etc/httpd/httpd.conf/??_mod_php4.conf ] || %service -q httpd restart \
 fi
 
 %post	common -p /sbin/ldconfig
@@ -1959,9 +1959,10 @@
 # extension_post here is all correct.
 %extension_post
 
+# compensate missing restart of earlier -common package.
 %triggerpostun common -- %{name}-common < 3:4.4.0-4.42
-[ ! -f /etc/apache/conf.d/??_mod_php4.conf ] || %service apache restart
-[ ! -f /etc/httpd/httpd.conf/??_mod_php4.conf ] || %service httpd restart
+[ ! -f /etc/apache/conf.d/??_mod_php4.conf ] || %service -q apache restart
+[ ! -f /etc/httpd/httpd.conf/??_mod_php4.conf ] || %service -q httpd restart
 
 %if %{with apache2}
 %triggerpostun -- php4 < 3:4.3.11-4.16
@@ -1970,6 +1971,7 @@
 	cp -f %{_sysconfdir}/php-apache2handler.ini{,.rpmnew}
 	mv -f %{_sysconfdir}/php-apache.ini.rpmsave %{_sysconfdir}/php-apache2handler.ini
 fi
+# extra trigger, if they did not upgrade to 3:4.4.0-2 but still had old php-apache.ini
 %triggerpostun -n apache-mod_php4 -- apache-mod_php4 < 3:4.4.0-2.16
 # for fixed php-SAPI.ini, the poor php-apache.ini was never read for apache2
 if [ -f %{_sysconfdir}/php-apache.ini.rpmsave ]; then
@@ -3095,6 +3097,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.468  2005/08/14 17:09:55  glen
+- %service -q, because only apache package should say to start apache, not php packages
+
 Revision 1.467  2005/08/13 12:04:24  glen
 - fix trigger common restart
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/php4.spec?r1=1.467&r2=1.468&f=u