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
commitc6d8131094231f24e4554499bc6f65f22ec03d3f (patch)
treef205cdf44e48c587a93eb4ac82ed970f8764e378
parentd77d376b90b7ff514016b763cda74a8fe083b17d (diff)
php 7: cleanup systemd conditions (more)
-rw-r--r--php70.spec10
1 files changed, 1 insertions, 9 deletions
diff --git a/php70.spec b/php70.spec
index 6f9cf7c..98ae71a 100644
--- a/php70.spec
+++ b/php70.spec
@@ -1767,21 +1767,13 @@ fi
%endif
%postun fpm
-%if 0%{?systemd_postun_with_restart:1}
+%if %{with_systemd}
%systemd_postun_with_restart php-fpm.service
%else
-%if 0%{?fedora} >= 15
-/bin/systemctl daemon-reload >/dev/null 2>&1 || :
-if [ $1 -ge 1 ]; then
- # Package upgrade, not uninstall
- /bin/systemctl try-restart php-fpm.service >/dev/null 2>&1 || :
-fi
-%else
if [ $1 -ge 1 ]; then
/sbin/service 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