Merge branch 'master' of ssh://git.onelab.eu/git/sliver-openvswitch

diff --git a/sliver-openvswitch.spec b/sliver-openvswitch.spec
index 0c94daf..056ab16 100644 (file)
--- a/sliver-openvswitch.spec
+++ b/sliver-openvswitch.spec
@@ -2,7 +2,7 @@
 # to check for any change:
 # grep AC_INIT configure.ac 
 %define version 2.1.90
-%define taglevel 0
+%define taglevel 2
 
 %define debug_package %{nil}
 
@@ -47,6 +47,7 @@ make install DESTDIR=$RPM_BUILD_ROOT
 rm -rf $RPM_BUILD_ROOT
 
 %files
+/usr/lib/*
 /usr/bin/*
 /usr/sbin/*
 /usr/share/openvswitch
@@ -57,6 +58,13 @@ rm -rf $RPM_BUILD_ROOT
 %postun
 
 %changelog
+* Tue Mar 25 2014 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - sliver-openvswitch-2.1.90-2
+- fix packaging
+
+* Fri Mar 21 2014 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - sliver-openvswitch-2.1.90-1
+- merged in mainstream 2.1.90
+- more robust server startup on the slivers
+
 * Tue Dec 10 2013 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - sliver-openvswitch-2.0.90-1
 - merge with upstream
 - switch to version 2, multi-threaded - specifically 2.0.90