From 8836aa1a7fcc3631768bc7a94615c1bcdf2dbd62 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 11 Dec 2015 12:43:50 +0100 Subject: php 7: cleanup systemd conditions (more) --- php.spec | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) (limited to 'php.spec') diff --git a/php.spec b/php.spec index 9769a8c..425349d 100644 --- a/php.spec +++ b/php.spec @@ -1595,21 +1595,13 @@ fi %endif %postun fpm -%if 0%{?systemd_postun_with_restart:1} -%systemd_postun_with_restart %{?scl:%{scl}-}php-fpm.service -%else %if %{with_systemd} -/bin/systemctl daemon-reload >/dev/null 2>&1 || : -if [ $1 -ge 1 ]; then - # Package upgrade, not uninstall - /bin/systemctl try-restart %{?scl_prefix}php-fpm.service >/dev/null 2>&1 || : -fi +%systemd_postun_with_restart %{?scl:%{scl}-}php-fpm.service %else if [ $1 -ge 1 ]; then /sbin/service %{?scl_prefix}php-fpm condrestart >/dev/null 2>&1 || : fi %endif -%endif # Handle upgrading from SysV initscript to native systemd unit. # We can tell if a SysV version of php-fpm was previously installed by -- cgit