Accepting request 78337 from home:anubisg1:networking

new upstream version 1.2.0 : added support to linux 3.0

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

openvswitch-1.1.0-suse.patch

@@ -1,23 +0,0 @@
-diff -uNr old-openvswitch-1.1.0//xenserver/automake.mk openvswitch-1.1.0/xenserver/automake.mk
---- old-openvswitch-1.1.0//xenserver/automake.mk	2011-05-17 13:36:17.041407719 +0200
-+++ openvswitch-1.1.0/xenserver/automake.mk	2011-05-17 13:37:30.827407720 +0200
-@@ -27,4 +27,5 @@
- 	xenserver/usr_share_openvswitch_scripts_ovs-xapi-sync \
- 	xenserver/usr_share_openvswitch_scripts_sysconfig.template \
- 	xenserver/usr_share_openvswitch_scripts_xen-bugtool-tc-class-show \
-+	xenserver/etc_sysconfig_openvswitch \
- 	xenserver/uuid.py
-diff -uNr old-openvswitch-1.1.0//xenserver/etc_sysconfig_openvswitch openvswitch-1.1.0/xenserver/etc_sysconfig_openvswitch
---- old-openvswitch-1.1.0//xenserver/etc_sysconfig_openvswitch	1970-01-01 01:00:00.000000000 +0100
-+++ openvswitch-1.1.0/xenserver/etc_sysconfig_openvswitch	2011-05-17 13:40:26.280407720 +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.1.0.tar.bz2

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

openvswitch-1.2.0-suse.patch

@@ -0,0 +1,23 @@
+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.0.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:06a2e333d570218e6afe325a3becafc1cc307c45b2cdc2e9099a679a2fc3e093
+size 1382144

openvswitch.changes

@@ -1,7 +1,24 @@
+-------------------------------------------------------------------
+Mon Aug  8 17:47:58 UTC 2011 - andrea@opensuse.org
+
+- new upstream version 1.2.0
+   * New abstraction layer to make better use of switching ASICs
+   * Packaging for Red Hat (RHEL) 5.6 and 6.0
+   * Datapath support for Linux kernels up to 3.0
+   * And many others.  See the full change log here:
+         http://openvswitch.org/releases/ChangeLog-1.2.0 
+- rebased openvswitch-1.1.0-suse.patch as 
+  openvswitch-1.2.0-suse.patch to apply to the files
+-------------------------------------------------------------------
+Thu Jun 23 06:49:16 UTC 2011 - andrea@opensuse.org
+
+- new upstream version 1.1.1
+  * bug fix release 
+
 -------------------------------------------------------------------
 Wed May 18 10:09:45 UTC 2011 - andrea@opensuse.org
-
+ 
-- re-enabled kmp package since openvswitch_mod.ko and 
+- re-enabled kmp package since openvswitch_mod.ko and
   brcompat_mod.ko are not available on suse kernel rpms
 
 -------------------------------------------------------------------

openvswitch.spec

@@ -17,22 +17,19 @@
 
 # norootforbuild
 
-# build the kmp for opensuse 11.3 and earlier, openvswitch went upstream after
-#%if 0%{?suse_version} <= 1130
 %define build_kmp 1
-#%endif
 
 %bcond_with pyside
 
 Name:           openvswitch
-Version:	1.1.0
+Version:	1.2.0
 Release:	1
 License:	Apache
 Summary:	An open source, production quality, multilayer virtual switch 
 Url:		http://openswitch.org
 Group:		Productivity/Networking/System
 Source0:	%name-%version.tar.bz2
-Patch0:		%name-1.1.0-suse.patch
+Patch0:		%name-1.2.0-suse.patch
 Patch1:		%name-1.1.0-stp-fwd-delay.patch
 BuildRequires:	gcc
 BuildRequires:	make
@@ -104,9 +101,9 @@ for flavor in %flavors_to_build; do
     pushd obj/$flavor
     %configure \
 	--with-logdir=/var/log \
-	--with-l26=/usr/src/linux-obj/%_target_cpu/$flavor \
+	--with-linux=/usr/src/linux-obj/%_target_cpu/$flavor \
-	--with-l26-source=/usr/src/linux
+	--with-linux-source=/usr/src/linux
-    cd datapath/linux-2.6
+    cd datapath/linux
     make
     popd
 done
@@ -123,7 +120,7 @@ popd
 export INSTALL_MOD_PATH=%{buildroot}
 export INSTALL_MOD_DIR=updates
 for flavor in %flavors_to_build; do
-    pushd obj/$flavor/datapath/linux-2.6
+    pushd obj/$flavor/datapath/linux
     make -C /usr/src/linux-obj/%_target_cpu/$flavor modules_install M=$PWD
     popd
 done
@@ -191,6 +188,7 @@ popd
 %_sbindir/ovsdb-server
 %_sbindir/ovs-vlan-bug-workaround
 %_sbindir/ovs-vswitchd
+%_sbindir/ovs-bugtool
 %_datadir/%name
 %_mandir/man1/*
 %_mandir/man5/*
@@ -204,6 +202,7 @@ popd
 %dir %_libdir/xsconsole/
 %dir %_libdir/xsconsole/plugins-base/
 %_sysconfdir/xapi.d/plugins/openvswitch-cfg-update
+%_sysconfdir/openvswitch
 %_libdir/xsconsole/plugins-base/XSFeatureVSwitch.py
 /var/adm/fillup-templates/sysconfig.openvswitch