X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=myplc.spec;h=66dbe0858c4ed6507db5fbfac9a5df28dd6cd38f;hb=aab7636f16f072802f91f20b8f2307570d290e04;hp=674fe868ac9c54f3e7895f7165bd9522a29a3708;hpb=b1305ba311dae6ed0c79e600dad80efb7794f4ed;p=myplc.git diff --git a/myplc.spec b/myplc.spec index 674fe86..66dbe08 100644 --- a/myplc.spec +++ b/myplc.spec @@ -1,6 +1,6 @@ %define name myplc %define version 5.3 -%define taglevel 2 +%define taglevel 4 %define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}} %global python_sitearch %( python -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)" ) @@ -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 @@ -68,6 +72,9 @@ Requires: nodeconfig Requires: nodeyum Requires: plcapi >= 5.2 # this technically is a plcapi dependency but it's simpler here for chosing which +%if "%{distro}" == "Fedora" && %{distrorelease} >= 29 +Requires: python2-mod_wsgi +%else %if "%{distro}" == "Fedora" && %{distrorelease} >= 18 Requires: mod_wsgi %else @@ -202,6 +209,11 @@ if [ -x /sbin/chkconfig ] ; then /sbin/chkconfig plc on fi +%if "%{distro}" == "Fedora" && %{distrorelease} >= 27 +systemctl enable php-fpm +systemctl start php-fpm +%endif + %triggerpostun -- %{name} # 0 = erase, 1 = upgrade if [ $1 -gt 0 ] ; then @@ -261,6 +273,12 @@ fi %changelog +* Sun Jul 16 2017 Thierry Parmentelat - myplc-5.3-4 +- takes care of creating plcapi log file + +* Wed Feb 18 2015 Thierry Parmentelat - myplc-5.3-3 +- tweaked renew_reminder for federation + * Fri Mar 21 2014 Thierry Parmentelat - myplc-5.3-2 - tweaks in check-hrns.py - do not require PyXML any more