X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=myplc.spec;h=3246860555714a6a2c37bc68c8a309ae637b6916;hb=b2db49cde783225866fc509b1ecbd0cf1f2a7eb4;hp=6af39d892783e4d6883ea044bac28db45d891d85;hpb=f6b6f27990865d9edbc3aecc819abb0f0cbb12ec;p=myplc.git diff --git a/myplc.spec b/myplc.spec index 6af39d8..3246860 100644 --- a/myplc.spec +++ b/myplc.spec @@ -1,6 +1,6 @@ %define name myplc -%define version 5.1 -%define taglevel 4 +%define version 5.2 +%define taglevel 2 %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,24 @@ fi %changelog +* Wed Apr 10 2013 Thierry Parmentelat - myplc-5.2-2 +- fix typo in check-hrns - used to print 'host' while dealing with persons + +* Thu Mar 07 2013 Thierry Parmentelat - 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 - myplc-5.1-6 +- bugfix in check-vsys-defaults.py + +* Wed Dec 19 2012 Thierry Parmentelat - 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) +- new config setting PLC_VSYS_DEFAULTS for vsys tags granted to all +- new utilities check-hrns.py and check-vsys-defaults.py + * Fri Aug 31 2012 Thierry Parmentelat - myplc-5.1-4 - set TimeoutSec to 300 in plc.service - remove ref to deprecated svn $URL$ in db-config usage