Accepting request 106537 from home:onielsen:branches:network

Updated to 1.4.0 (supports up to kernel 3.3) - builds on 11.4, 12.1 and Factory

OBS-URL: https://build.opensuse.org/request/show/106537
OBS-URL: https://build.opensuse.org/package/show/network/openvswitch?expand=0&rev=6

_service

@@ -0,0 +1,10 @@
+<services>
+  <service name="download_url">
+    <param name="path">/releases/openvswitch-1.4.0.tar.gz</param>
+    <param name="host">openvswitch.org</param>
+  </service>
+  <service name="recompress">
+    <param name="file">_service:download_url:openvswitch-1.4.0.tar.gz</param>
+    <param name="compression">bz2</param>
+  </service>
+</services>

_service:recompress:download_url:openvswitch-1.4.0.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4f60cd79dcf62cd5a768be0ae5374696dd27e4f481c8dc54d44b3ea4f47d0af0
+size 1553285

openvswitch-1.2.0-suse.patch

@@ -1,23 +0,0 @@
-diff -uNr old-openvswitch-1.2.0//xenserver/automake.mk openvswitch-1.2.0/xenserver/automake.mk
---- old-openvswitch-1.2.0//xenserver/automake.mk	2011-08-03 02:04:24.000000000 +0200
-+++ openvswitch-1.2.0/xenserver/automake.mk	2011-08-08 20:01:37.491373238 +0200
-@@ -24,4 +24,5 @@
- 	xenserver/usr_lib_xsconsole_plugins-base_XSFeatureVSwitch.py \
- 	xenserver/usr_share_openvswitch_scripts_ovs-xapi-sync \
- 	xenserver/usr_share_openvswitch_scripts_sysconfig.template \
-+	xenserver/etc_sysconfig_openvswitch \
- 	xenserver/uuid.py
-diff -uNr old-openvswitch-1.2.0//xenserver/etc_sysconfig_openvswitch openvswitch-1.2.0/xenserver/etc_sysconfig_openvswitch
---- old-openvswitch-1.2.0//xenserver/etc_sysconfig_openvswitch	1970-01-01 01:00:00.000000000 +0100
-+++ openvswitch-1.2.0/xenserver/etc_sysconfig_openvswitch	2011-08-08 20:02:05.474373249 +0200
-@@ -0,0 +1,10 @@
-+### Configuration options for openvswitch
-+
-+# Copyright (C) 2009, 2010 Nicira Networks, Inc.
-+#
-+# Copying and distribution of this file, with or without modification,
-+# are permitted in any medium without royalty provided the copyright
-+# notice and this notice are preserved.  This file is offered as-is,
-+# without warranty of any kind.
-+
-+NETWORK_MODE=openvswitch

openvswitch-1.2.1.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5e072f2c387f9ec59441c82718f152a54da3e28b602aac178909d6a4201385d8
-size 1771175

openvswitch-1.3.0-suse.patch

@@ -0,0 +1,25 @@
+diff -ruN openvswitch-1.3.0/xenserver/automake.mk openvswitch-1.3.0/xenserver/automake.mk
+--- openvswitch-1.3.0/xenserver/automake.mk	2011-11-14 19:41:33.000000000 +0100
++++ openvswitch-1.3.0/xenserver/automake.mk	2011-12-26 02:00:39.809040879 +0100
+@@ -16,6 +16,7 @@
+ 	xenserver/etc_profile.d_openvswitch.sh \
+ 	xenserver/etc_xapi.d_plugins_openvswitch-cfg-update \
+ 	xenserver/etc_xensource_scripts_vif \
++	xenserver/etc_sysconfig_openvswitch \
+ 	xenserver/openvswitch-xen.spec \
+ 	xenserver/opt_xensource_libexec_InterfaceReconfigure.py \
+ 	xenserver/opt_xensource_libexec_InterfaceReconfigureBridge.py \
+diff -ruN openvswitch-1.3.0/xenserver/etc_sysconfig_openvswitch openvswitch-1.3.0/xenserver/etc_sysconfig_openvswitch
+--- openvswitch-1.3.0/xenserver/etc_sysconfig_openvswitch	1970-01-01 01:00:00.000000000 +0100
++++ openvswitch-1.3.0/xenserver/etc_sysconfig_openvswitch	2011-12-26 01:57:23.778834435 +0100
+@@ -0,0 +1,10 @@
++### Configuration options for openvswitch
++
++# Copyright (C) 2009, 2010 Nicira Networks, Inc.
++#
++# Copying and distribution of this file, with or without modification,
++# are permitted in any medium without royalty provided the copyright
++# notice and this notice are preserved.  This file is offered as-is,
++# without warranty of any kind.
++
++NETWORK_MODE=openvswitch

openvswitch.changes

@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Mon Feb 20 23:39:50 UTC 2012 - on@morlock.nu
+
+- New upstream version 1.4.0
+  * Compatible with Open vSwitch kernel module included in Linux 3.3.
+  * Don't require the "normal" action to use mirrors.
+  * New "VLAN splinters" feature to work around buggy device driver in old Linux versions.
+  * Added ability to match ECN and TTL in IPv4 and IPv6 headers.
+  * Added ability to match IPv6 flow label.
+  * Added ability to modify ECN bits and TTL in IPv4 headers.
+  * And many others. See the full change log here:
+	 http://openvswitch.org/releases/NEWS-1.4.0
+
 -------------------------------------------------------------------
 Fri Sep  2 09:11:21 UTC 2011 - andrea@opensuse.org
 

openvswitch.spec

@@ -22,15 +22,19 @@
 %bcond_with pyside
 
 Name:           openvswitch
-Version:	1.2.1
+Version:	1.4.0
 Release:	1
 License:	Apache
 Summary:	An open source, production quality, multilayer virtual switch 
-Url:		http://openswitch.org
+Url:		http://openswitch.org/
 Group:		Productivity/Networking/System
-Source0:	http://openvswitch.org/releases/%name-%version.tar.gz
-Patch0:		%name-1.2.0-suse.patch
+Source0:	%name-%version.tar.bz2
+Source1:	preamble
+# PATCH-FEATURE-OPENSUSE openvswitch-1.3.0-suse.patch -- /etc/sysconfig configuration options for openvswitch
+Patch0:		%name-1.3.0-suse.patch
+# PATCH-FEATURE-UPSTREAM openvswitch-1.1.0-stp-fwd-delay.patch -- Set STP bridge forward delay
 Patch1:		%name-1.1.0-stp-fwd-delay.patch
+BuildRequires:	autoconf automake libtool
 BuildRequires:	gcc
 BuildRequires:	make
 BuildRequires:	pkg-config
@@ -68,12 +72,14 @@ VMware’s vNetwork distributed vswitch or Cisco’s Nexus 1000V.
 
 %if 0%{?build_kmp}
 %package -n %{name}-KMP
-Group: Productivity/Networking/System
-License: GPL v2 or later
-Summary: Kernel module
-Requires: kernel-default kernel-desktop
-BuildRequires: perl-base autoconf automake libtool kernel-source kernel-syms module-init-tools
-%suse_kernel_module_package ec2 xen xenpae vmi um
+Group: System/Kernel
+License: GPLv2
+Summary: Open vSwitch kernel modules
+BuildRequires:	%kernel_module_package_buildreqs
+# Requires: kernel-default kernel-desktop
+# BuildRequires: perl-base autoconf automake libtool kernel-source kernel-syms module-init-tools
+# suse_kernel_module_package ec2 xen xenpae vmi um
+%suse_kernel_module_package -p %_sourcedir/preamble ec2 xen xenpae vmi um
 
 %description -n %{name}-KMP
 Kernel modules supporting the openvswitch datapath
@@ -165,7 +171,7 @@ install -d -m 755 %{buildroot}/%{_libdir}/xsconsole/plugins-base
 install -m 644 \
         xenserver/usr_lib_xsconsole_plugins-base_XSFeatureVSwitch.py \
                %{buildroot}/%{_libdir}/xsconsole/plugins-base/XSFeatureVSwitch.py
-install -m 644 xenserver/uuid.py %{buildroot}/%{_datadir}/%{name}/python
+# install -m 644 xenserver/uuid.py %{buildroot}/%{_datadir}/%{name}/python
 popd
 
 %clean
@@ -180,7 +186,7 @@ popd
 %files
 %defattr(-,root,root)
 %doc source/AUTHORS source/DESIGN source/INSTALL.* source/NOTICE
-%doc source/REPORTING-BUGS source/ChangeLog source/PORTING
+%doc source/REPORTING-BUGS source/PORTING
 %doc source/SubmittingPatches source/CodingStyle source/README
 %doc source/WHY-OVS source/COPYING source/README-gcov
 %_bindir/ovs*
@@ -202,7 +208,7 @@ popd
 %dir %_libdir/xsconsole/
 %dir %_libdir/xsconsole/plugins-base/
 %_sysconfdir/xapi.d/plugins/openvswitch-cfg-update
-%_sysconfdir/openvswitch
+#_sysconfdir/openvswitch
 %_libdir/xsconsole/plugins-base/XSFeatureVSwitch.py
 /var/adm/fillup-templates/sysconfig.openvswitch
 

preamble

@@ -0,0 +1,3 @@
+Requires: kernel-%1
+Enhances: kernel-%1
+Supplements: packageand(kernel-%1:%{-n*})