X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=myplc.spec;h=66dbe0858c4ed6507db5fbfac9a5df28dd6cd38f;hb=aab7636f16f072802f91f20b8f2307570d290e04;hp=f2436b4367067655a99848f3c336ef887d2144ba;hpb=0b285eb863942c9c127543175dc379f71f7556c8;p=myplc.git

diff --git a/myplc.spec b/myplc.spec
index f2436b4..66dbe08 100644
--- a/myplc.spec
+++ b/myplc.spec
@@ -1,5 +1,5 @@
 %define name myplc
-%define version 5.2
+%define version 5.3
 %define taglevel 4
 
 %define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
@@ -38,7 +38,7 @@ Requires: curl
 Requires: rsync
 Requires: python-devel
 Requires: yum
-Requires: PyXML
+#Requires: PyXML
 Requires: createrepo
 Requires: cpio
 Requires: wget
@@ -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,24 @@ fi
 
 
 %changelog
+* Sun Jul 16 2017 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - myplc-5.3-4
+- takes care of creating plcapi log file
+
+* Wed Feb 18 2015 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - myplc-5.3-3
+- tweaked renew_reminder for federation
+
+* Fri Mar 21 2014 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - myplc-5.3-2
+- tweaks in check-hrns.py
+- do not require PyXML any more
+
+* Tue Dec 10 2013 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - myplc-5.3-1
+- review check-hrns for plcapi-5.3
+- add PLC_HRN_ROOT in usual plc-config-tty's settings
+
+* Thu Oct 10 2013 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - myplc-5.2-5
+- reduce the scope of check-hrns.py script, now that the SFA layer handles this natively
+- add an rpm-sign dependency on feedora>=16
+
 * Fri Jun 28 2013 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - myplc-5.2-4
 - drop PLC_OMF_XMPP_{USER,PASSWORD} from config