From: Thierry Parmentelat <thierry.parmentelat@inria.fr>
Date: Thu, 22 Feb 2018 07:56:44 +0000 (+0100)
Subject: better handling of the php-fpm dependency
X-Git-Tag: myplc-5.3-5~14
X-Git-Url: http://git.onelab.eu/?p=myplc.git;a=commitdiff_plain;h=59a075fbdc02c0d77e94c55100eecaba0cb561ef

better handling of the php-fpm dependency
---

diff --git a/myplc.spec b/myplc.spec
index c2b696d..2806623 100644
--- a/myplc.spec
+++ b/myplc.spec
@@ -57,6 +57,10 @@ Requires: cronie
 %if "%{distro}" == "Fedora" && %{distrorelease} >= 16
 Requires: rpm-sign
 %endif
+# starting with f27 we depend on this new rpm
+%if "%{distro}" == "Fedora" && %{distrorelease} >= 27
+Requires: php-fpm
+%endif
 
 # planetlab stuff
 Requires: bootmanager
@@ -201,7 +205,11 @@ if [ -x /sbin/chkconfig ] ; then
     /sbin/chkconfig --add plc
     /sbin/chkconfig plc on
 fi
-rpm -q php-fpm >& /dev/null && { systemctl enable php-fpm; systemctl start php-fpm; }
+
+%if "%{distro}" == "Fedora" && %{distrorelease} >= 27
+systemctl enable php-fpm
+systemctl start  php-fpm
+%endif
 
 %triggerpostun -- %{name}
 # 0 = erase, 1 = upgrade