X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sliver-openvswitch.spec;h=360f60d1afbb102429c4af181a3bb7ab20c09b92;hb=34290dbfe54a930258d4c1d00e82e7c3f51cea5f;hp=eb0ffb712cc6af26120bca6678b0ca318dfea503;hpb=04024badd2cf7d26b224d26ad20111262cc90ab1;p=sliver-openvswitch.git

diff --git a/sliver-openvswitch.spec b/sliver-openvswitch.spec
index eb0ffb712..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.8.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}
@@ -32,7 +37,7 @@ Openvswitch tuned for running within a PlanetLab sliver
 %build
 ./boot.sh
 # let's be as close as the regular linux/fedora layout
-./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
+./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --with-logdir=/var/log
 make
 
 %install
@@ -42,13 +47,55 @@ 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
+- 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
+- related, more functions in sliver-ovs as well, like exposing
+- detailed info (mac, dpids..) relevant to the OF controller
+- retrieving rx_bytes/tx_bytes (fixed) accessible through ovs-appctl
+
+* Fri Sep 28 2012 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - sliver-openvswitch-1.8.90-4
+- fix file descriptor leaks
+
+* Fri Sep 28 2012 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - sliver-openvswitch-1.8.90-3
+- can specify OpenFlow controller ip/port for each ovs instance
+- through $(CONTROLLER_<id>), or $(CONTROLLER) by default
+
 * Thu Sep 27 2012 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - sliver-openvswitch-1.8.90-2
 - add/skip packet information on tap send/recv