X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=myplc.spec;h=57438ee4dd3a93371dec3454f224c040fff2e7a8;hb=96fdd23864b959c06ecec267b65eede59ea48e07;hp=8151677feaccf77f70d890c90ba63491b662a027;hpb=cf713cae0012e3758a1a8ed003b0cb7f1527837a;p=myplc.git

diff --git a/myplc.spec b/myplc.spec
index 8151677..57438ee 100644
--- a/myplc.spec
+++ b/myplc.spec
@@ -1,5 +1,5 @@
 %define name myplc
-%define version 5.1
+%define version 5.2
 %define taglevel 5
 
 %define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
@@ -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}
@@ -65,7 +66,13 @@ Requires: PLCWWW
 Requires: www-register-wizard
 Requires: nodeconfig
 Requires: nodeyum
-Requires: PLCAPI
+Requires: plcapi >= 5.2
+# this technically is a plcapi dependency but it's simpler here for chosing which
+%if "%{distro}" == "Fedora" && %{distrorelease} >= 18
+Requires: mod_wsgi
+%else
+Requires: mod_python
+%endif
 Requires: nodeimage-%{nodefamily}
 Requires: myplc-docs
 Requires: myplc-release
@@ -254,6 +261,29 @@ fi
 
 
 %changelog
+* 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
+- supports httpd config for apache 2.4 (f18)
+- new config variable PLC_FLAVOUR_VIRT_MAP to set 'virt' from fcdistro
+
+* Wed Dec 19 2012 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - myplc-5.1-6
+- bugfix in check-vsys-defaults.py
+
 * Wed Dec 19 2012 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - myplc-5.1-5
 - define open_basedir in php.ini to stop confidentiality leak
 - new utility slice_ssh_keys.py for showing sliver keys (OMF interop)