X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=myplc.spec;h=c2b696d2842c0be4f36db3fe0f2bd35924efa689;hb=0e65d7c550fc011e4cd99cc2f87beba721413ab7;hp=52bf0560caa6ccadb33a347d85917a277597f763;hpb=883d0c0f0f017e3a6cfd40fd801bedc31bf4c117;p=myplc.git

diff --git a/myplc.spec b/myplc.spec
index 52bf056..c2b696d 100644
--- a/myplc.spec
+++ b/myplc.spec
@@ -1,6 +1,6 @@
 %define name myplc
-%define version 5.2
-%define taglevel 1
+%define version 5.3
+%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)" )
@@ -38,7 +38,7 @@ Requires: curl
 Requires: rsync
 Requires: python-devel
 Requires: yum
-Requires: PyXML
+#Requires: PyXML
 Requires: createrepo
 Requires: cpio
 Requires: wget
@@ -52,11 +52,12 @@ Requires: findutils
 Requires: xmlsec1
 Requires: xmlsec1-openssl
 Requires: ed
-%if "%{distro}" == "Fedora" && %{distrorelease} >= 10
 Requires: cronie
-%else
-Requires: vixie-cron
+# starting with f16 we depend on this new rpm
+%if "%{distro}" == "Fedora" && %{distrorelease} >= 16
+Requires: rpm-sign
 %endif
+
 # planetlab stuff
 Requires: bootmanager
 Requires: bootcd-%{nodefamily}
@@ -200,6 +201,7 @@ 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; }
 
 %triggerpostun -- %{name}
 # 0 = erase, 1 = upgrade
@@ -260,6 +262,34 @@ 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
+
+* Tue Apr 23 2013 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - myplc-5.2-3
+- plc.d/gpg now does not rm /dev/random but preserves it
+- this is because libvirt won't let us run mknod
+
+* Wed Apr 10 2013 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - myplc-5.2-2
+- fix typo in check-hrns - used to print 'host' while dealing with persons
+
 * Thu Mar 07 2013 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - myplc-5.2-1
 - supports httpd config for either mod_python (preferred) or mod_wsgi
 - requires mod_wsgi on f18 only, otherwise mod_python