summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <fedora@famillecollet.com>2015-12-11 12:43:50 +0100
committerRemi Collet <fedora@famillecollet.com>2015-12-11 12:43:50 +0100
commit8836aa1a7fcc3631768bc7a94615c1bcdf2dbd62 (patch)
tree1e01d42ed86f2724ea95382d9db6de053643e4a8
parent9129b6255f426983c0e54afd4eaca265824472b4 (diff)
php 7: cleanup systemd conditions (more)
-rw-r--r--php.spec10
1 files changed, 1 insertions, 9 deletions
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