From: Thierry Parmentelat <thierry.parmentelat@inria.fr>
Date: Thu, 7 Mar 2013 07:45:17 +0000 (+0100)
Subject: Setting tag myplc-5.2-1
X-Git-Tag: myplc-5.2-1^0
X-Git-Url: http://git.onelab.eu/?p=myplc.git;a=commitdiff_plain;h=619bb00d324ffc0cdc6fe1c9d985c423192aeb4e

Setting tag 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
---

diff --git a/myplc-docs.spec b/myplc-docs.spec
index be1d082..f5341f2 100644
--- a/myplc-docs.spec
+++ b/myplc-docs.spec
@@ -1,6 +1,6 @@
 %define name myplc-docs
-%define version 5.1
-%define taglevel 6
+%define version 5.2
+%define taglevel 1
 
 %define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
 
@@ -96,6 +96,12 @@ rm -rf $RPM_BUILD_ROOT
 /var/www/html/planetlab/doc/
 
 %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
 
diff --git a/myplc-release.spec b/myplc-release.spec
index 3670514..d8db2ff 100644
--- a/myplc-release.spec
+++ b/myplc-release.spec
@@ -1,6 +1,6 @@
 %define name myplc-release
-%define version 5.1
-%define taglevel 6
+%define version 5.2
+%define taglevel 1
 
 %define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
 
@@ -52,6 +52,12 @@ rm -rf $RPM_BUILD_ROOT
 /etc/myplc-release
 
 %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
 
diff --git a/myplc.spec b/myplc.spec
index c2962cc..52bf056 100644
--- a/myplc.spec
+++ b/myplc.spec
@@ -1,6 +1,6 @@
 %define name myplc
 %define version 5.2
-%define taglevel 0
+%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)" )
@@ -260,6 +260,12 @@ 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