Merge branch 'master' of git.onelab.eu:/git/nodeconfig

[nodeconfig.git] / nodeconfig.spec

diff --git a/nodeconfig.spec b/nodeconfig.spec
index df59b10..1fe850d 100644 (file)
--- a/nodeconfig.spec
+++ b/nodeconfig.spec
@@ -1,11 +1,8 @@
 #
-# $Id$
-#
-%define url $URL: svn+ssh://thierry@svn.planet-lab.org/svn/WWW/trunk/PLCWWW.spec $
 
 %define name nodeconfig
-%define version 5.0
-%define taglevel 3
+%define version 5.2
+%define taglevel 5
 
 %define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
 
@@ -23,11 +20,11 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Vendor: PlanetLab
 Packager: PlanetLab Central <support@planet-lab.org>
 Distribution: PlanetLab %{plrelease}
-URL: %(echo %{url} | cut -d ' ' -f 2)
+URL: %{SCMURL}
 
 # We use set everywhere
 Requires: php >= 5.0
-Requires: PLCAPI >= 4.3
+Requires: plcapi >= 5.2
 
 %description
 
@@ -70,6 +67,33 @@ rm -rf $RPM_BUILD_ROOT
 /etc/planetlab/db-config.d
 
 %changelog
+* Fri Nov 13 2015 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - nodeconfig-5.2-5
+- do not try to add root_ssh_key.pub to authorized_keys in nodes
+
+* Fri Mar 21 2014 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - nodeconfig-5.2-4
+- tweaks in node's ntp.conf
+
+* Tue Dec 10 2013 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - nodeconfig-5.2-3
+- ntp.conf.php uses POST[node_id] instead of finding out caller's IP
+
+* Tue Apr 23 2013 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - nodeconfig-5.2-2
+- pruned sfa_cofig.php
+
+* Thu Mar 07 2013 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - nodeconfig-5.2-1
+- no-op, just bump to 5.2 to be in line with the rest of the system
+
+* Mon Apr 16 2012 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - nodeconfig-5.0-7
+- no change, just reworked make sync to cope with lxc-hosted tests
+
+* Fri Feb 24 2012 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - nodeconfig-5.0-6
+- support for hotfixes
+
+* Tue Feb 01 2011 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - nodeconfig-5.0-5
+- remove backward compat to GetNodeNetworks and the like
+
+* Sun Jan 23 2011 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - nodeconfig-5.0-4
+- trashed sfa_component_setup job & conf file
+
 * Wed Sep 01 2010 Baris Metin <Talip-Baris.Metin@sophia.inria.fr> - nodeconfig-5.0-3
 - check file before reading the configuration.