X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sliver-openvswitch.spec;h=360f60d1afbb102429c4af181a3bb7ab20c09b92;hb=3442636d01d2a73a557952ad9140de07418c28c2;hp=8337c220d335f302f535e01f155c474768232d35;hpb=85b20fd6ee585f462e012fbcc7f966a81edab2ed;p=sliver-openvswitch.git

diff --git a/sliver-openvswitch.spec b/sliver-openvswitch.spec
index 8337c220d..360f60d1a 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 2
+%define version 1.11.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,33 @@ 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
+* 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
+
 * 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