packages: rpm-build-macros/rpm.macros - restart php-fpm if installed

[glen]

Author: glen                         Date: Fri Jun 12 07:33:46 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- restart php-fpm if installed

---- Files affected:
packages/rpm-build-macros:
   rpm.macros (1.517 -> 1.518) 

---- Diffs:

================================================================
Index: packages/rpm-build-macros/rpm.macros
diff -u packages/rpm-build-macros/rpm.macros:1.517 packages/rpm-build-macros/rpm.macros:1.518
--- packages/rpm-build-macros/rpm.macros:1.517	Mon May 11 20:45:41 2009
+++ packages/rpm-build-macros/rpm.macros	Fri Jun 12 09:33:41 2009
@@ -740,19 +740,22 @@
 %php_webserver_restart \
 [ ! -f /etc/apache/conf.d/??_mod_php.conf ] || %service -q apache restart \
 [ ! -f /etc/httpd/conf.d/??_mod_php.conf ] || %service -q httpd restart \
-if [ -f /etc/rc.d/init.d/php-fcgi ]; then \
+if [ -x /etc/rc.d/init.d/php-fcgi ]; then \
 	PHP_FCGI_BINARY=; . /etc/sysconfig/php-fcgi 2>/dev/null \
 	if [[ ${PHP_FCGI_BINARY:-php.fcgi} = *php.fcgi* ]]; then \
 		%service -q php-fcgi restart \
 	fi \
 fi \
+if [ -x /etc/rc.d/init.d/php-fpm ]; then \
+	%service -q php-fpm restart \
+fi \
 %{nil}
 
 # for using php post scripts. for PHP >= 4.0 && PHP < 5.0
 %php4_webserver_restart \
 [ ! -f /etc/apache/conf.d/??_mod_php4.conf ] || %service -q apache restart \
 [ ! -f /etc/httpd/conf.d/??_mod_php4.conf ] || %service -q httpd restart \
-if [ -f /etc/rc.d/init.d/php-fcgi ]; then \
+if [ -x /etc/rc.d/init.d/php-fcgi ]; then \
 	PHP_FCGI_BINARY=; . /etc/sysconfig/php-fcgi 2>/dev/null \
 	if [[ ${PHP_FCGI_BINARY:-php.fcgi} = *php4.fcgi* ]]; then \
 		%service -q php-fcgi restart \
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/rpm-build-macros/rpm.macros?r1=1.517&r2=1.518&f=u