X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sliver-openvswitch.spec;h=3a9216f8b3573bb378c2787d5d800330683d8445;hb=e23ff9e46ca89fe48a6cdbafd5cd545fc21dc9ef;hp=e61aedd1660d055633647122ae34ebaf34f43e9d;hpb=edd00aea8c9fe544683cf6edd844a0b589db9162;p=sliver-openvswitch.git

diff --git a/sliver-openvswitch.spec b/sliver-openvswitch.spec
index e61aedd16..3a9216f8b 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.9.90
-%define taglevel 3
+%define version 2.1.90
+%define taglevel 1
 
 %define debug_package %{nil}
 
@@ -12,7 +12,12 @@ Vendor: OneLab
 Packager: OneLab <support@planet-lab.eu>
 Distribution: PlanetLab %{plrelease}
 URL: %{SCMURL}
-#Requires: 
+# Dependencies
+# mar 2013 - because of the move to f18 I have to turn off auto requires
+# this is because rpm would otherwise find deps to /bin/python and /bin/perl
+# In other modules I was able to solve this by referring to /usr/bin/python 
+# instead of just python in the builds scripts, but here it looks too complex
+AutoReq: no
 
 Summary: Openvswitch modified for running from a PlanetLab sliver
 Name: %{name}
@@ -42,13 +47,39 @@ make install DESTDIR=$RPM_BUILD_ROOT
 rm -rf $RPM_BUILD_ROOT
 
 %files
-/usr
+/usr/bin/*
+/usr/sbin/*
+/usr/share/openvswitch
+/usr/share/man
 
 %post
 
 %postun
 
 %changelog
+* 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
+- simple connectivity test - run with 'make test'
+
+* Sat Jul 06 2013 Giuseppe Lettieri <g.lettieri@iet.unipi.it> - sliver-openvswitch-1.11.90-1
+- merge with mainstream
+
+* 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
+
+* Mon Apr 22 2013 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - sliver-openvswitch-1.10.90-1
+- merged with upstream (develoment version 1.10.90)
+- integrated ALLEGRA contributions for the termination of virtual cables in external nodes.
+
 * Fri Feb 22 2013 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - sliver-openvswitch-1.9.90-3
 - pulled mainstream - amazingly this is still known as 1.9.90 despite the size of changes