X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sliver-openvswitch.spec;h=8337c220d335f302f535e01f155c474768232d35;hb=45b1b2d22ed8728702c61ec78ef935077b054772;hp=819f8f2c09478a037c33be0bd844a20e7caaff37;hpb=b3dffe576c4cbbfe2367c2f566ace140b330801d;p=sliver-openvswitch.git

diff --git a/sliver-openvswitch.spec b/sliver-openvswitch.spec
index 819f8f2c0..8337c220d 100644
--- a/sliver-openvswitch.spec
+++ b/sliver-openvswitch.spec
@@ -1,8 +1,8 @@
 %define name sliver-openvswitch
 # to check for any change:
 # grep AC_INIT configure.ac 
-%define version 1.8.90
-%define taglevel 5
+%define version 1.9.90
+%define taglevel 2
 
 %define debug_package %{nil}
 
@@ -49,6 +49,14 @@ rm -rf $RPM_BUILD_ROOT
 %postun
 
 %changelog
+* Fri Dec 21 2012 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - sliver-openvswitch-1.9.90-2
+- merged with upstream
+- handling of promisc &up/down flags for tap devices
+- small improvements to the Makefile
+
+* Fri Nov 23 2012 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - sliver-openvswitch-1.8.90-6
+- fixes in the exp-tool makefile (bash redirections, scp with key..)
+
 * Tue Oct 16 2012 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - sliver-openvswitch-1.8.90-5
 - numerous additional make targets for finer control (use make help)
 - including gprobe for reporting traffic to an ndnmap instance