X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=myplc.spec;h=52bf0560caa6ccadb33a347d85917a277597f763;hb=facac6604dd7a4dd781fff92ebf6f9cc3315ac33;hp=8151677feaccf77f70d890c90ba63491b662a027;hpb=cf713cae0012e3758a1a8ed003b0cb7f1527837a;p=myplc.git

diff --git a/myplc.spec b/myplc.spec
index 8151677..52bf056 100644
--- a/myplc.spec
+++ b/myplc.spec
@@ -1,6 +1,6 @@
 %define name myplc
-%define version 5.1
-%define taglevel 5
+%define version 5.2
+%define taglevel 1
 
 %define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
 %global python_sitearch	%( python -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)" )
@@ -65,7 +65,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 +260,15 @@ fi
 
 
 %changelog
+* 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)