Merge commit 'origin/master'

[myplc.git] / myplc-release.spec

diff --git a/myplc-release.spec b/myplc-release.spec
index 24b2c42..78a9af7 100644 (file)
--- a/myplc-release.spec
+++ b/myplc-release.spec
@@ -1,6 +1,6 @@
 %define name myplc-release
 %define version 5.0
-%define taglevel 14
+%define taglevel 16
 
 %define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
 
@@ -52,6 +52,13 @@ rm -rf $RPM_BUILD_ROOT
 /etc/myplc-release
 
 %changelog
+* Mon Mar 21 2011 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - myplc-5.0-16
+- requires ed for the plc.d/packages step
+- sirius initscript to handle stop and restart
+
+* Fri Feb 04 2011 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - myplc-5.0-15
+- ignore steps in db-config.d if they have a '.' or '~' in their name
+
 * Wed Jan 26 2011 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - myplc-5.0-14
 - can redo myplc-docs without the doc for monitor