X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sliver-openvswitch.spec;h=7daf4956c98626866ce743a0f7ed9d83320ba6b0;hb=a17fcaaf580b6d8d26f4906237ddec837358708c;hp=b4a2c7d74bc5a6acc732c3834b1a747cc1927851;hpb=e40686f3016dbd25a85143a4dcc2777f75f95b87;p=sliver-openvswitch.git

diff --git a/sliver-openvswitch.spec b/sliver-openvswitch.spec
index b4a2c7d74..7daf4956c 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.10.90
-%define taglevel 2
+%define version 1.11.90
+%define taglevel 0
 
 %define debug_package %{nil}
 
@@ -57,6 +57,9 @@ rm -rf $RPM_BUILD_ROOT
 %postun
 
 %changelog
+* Sat Jul 06 2013 Giuseppe Lettieri <g.lettieri@iet.unipi.it> - sliver-openvswitch-1.10.90-3
+- merge with mainstream
+
 * Wed May 01 2013 Giuseppe Lettieri <g.lettieri@iet.unipi.it> - sliver-openvswitch-1.10.90-2
 - - fixed several bugs in the external-nodes support in exp-tool/Makefile
 - - let sliver-ovs return an error if tap device configuration failed