Accepting request 158008 from home:tpaszkowski:ovsv3

- always build in openvswitch kernel module (gre tunelling not present
  within the standard kernel module)
- removed unnedded build rquirements (move to appropriate subpackage)
- moved common stuff to main pkg
- added group filed to packages and sub packages
- switch pkg suggest kernel module pkg
- moved python test stuff to python-openvswitch-test sub pkg
- moved ui interface requirements to ovsdbmonitor sub pkg
- ovsdbmonitor will not be build on sles (for now)
- sub pkg test require python-twisted (ovs-test)
- don't call boot.sh on sles11 (old autoconf). Shipped configuration stuff
  is ok (we don't patch plenty of stuff)
- ovs-parse-backtrace now part of main pkg
- addes ovs-l3ping,ovs-vlan-test to test sub pkg

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

openvswitch.changes

@@ -1,3 +1,22 @@
+-------------------------------------------------------------------
+Thu Mar  7 21:49:09 UTC 2013 - tpaszkowski@suse.com
+
+- always build in openvswitch kernel module (gre tunelling not present
+  within the standard kernel module)
+- removed unnedded build rquirements (move to appropriate subpackage)
+- moved common stuff to main pkg
+- added group filed to packages and sub packages
+- switch pkg suggest kernel module pkg
+- moved python test stuff to python-openvswitch-test sub pkg
+- moved ui interface requirements to ovsdbmonitor sub pkg
+- ovsdbmonitor will not be build on sles (for now)
+- sub pkg test require python-twisted (ovs-test)
+- don't call boot.sh on sles11 (old autoconf). Shipped configuration stuff
+  is ok (we don't patch plenty of stuff)
+- ovs-parse-backtrace now part of main pkg
+- addes ovs-l3ping,ovs-vlan-test to test sub pkg
+
+
 -------------------------------------------------------------------
 Thu Feb 28 22:17:11 UTC 2013 - e.istomin@edss.ee
 

openvswitch.spec

@@ -1,7 +1,4 @@
-#
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
-# spec file for package 
-#
-# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -18,31 +15,25 @@
 # norootforbuild
 
 %define build_kmp 1
+# never build in kernel module, as openvswitch shipped one is more feature
+# rich
 %define build_in_kernel_kmp 0
 
-# openSuSE versions above 12.1
-# Do not build kernel module - Open vSwitch is now shipping as part of Linux 3.3
-%if 0%{?suse_version} > 1210
-%define build_in_kernel_kmp 1
-%endif
-
-%bcond_with pyside
-
 Name:           openvswitch
 Version:	1.9.0
-Release:	1
+Release:	2
 License:	Apache-2.0
 Summary:	An open source, production quality, multilayer virtual switch 
 Url:		http://openswitch.org/
 Group:		Productivity/Networking/System
-Source0:	http://openvswitch.org/releases/openvswitch-1.9.0.tar.gz
+Source0:	http://openvswitch.org/releases/%{name}-%{version}.tar.gz
 Source1:	preamble
-
 Source2:        openvswitch-switch.init
 Source3:        openvswitch-switch.template
 Source4:        openvswitch-switch.logrotate
 
 Source5:        openvswitch-controller.init
+# brcompat is going to be deprecated soon
 # PATCH-FEATURE-UPSTREAM openvswitch-1.7.0-stp-fwd-delay.patch -- Set STP bridge forward delay
 Patch1:		%name-1.7.0-stp-fwd-delay.patch
 BuildRequires:	autoconf automake libtool
@@ -55,20 +46,8 @@ BuildRequires:	openssl libopenssl-devel
 BuildRequires:	valgrind-devel
 BuildRequires:	graphviz
 BuildRequires:	python-devel
-BuildRequires:	python-qt4-devel
+Requires:	python
-BuildRequires:  python-twisted
-BuildRequires:	python-simplejson
-BuildRequires:	python-zopeinterface
-%if %{with pyside}
-BuildRequires:	python-pyside
-Requires:	python-pyside
-%endif
-Requires:	python-qt4
-Requires:	python-twisted
-Requires:	python-simplejson
-Requires:	python-zopeinterface
 Requires:	openssl
-Requires:	graphviz
 Requires:	logrotate
 %py_requires
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -82,7 +61,7 @@ it is designed to support distribution across multiple physical servers similar
 VMware’s vNetwork distributed vswitch or Cisco’s Nexus 1000V.
 
 %if 0%{?build_kmp}
-%package -n %{name}-KMP
+%package -n %{name}-kmp
 Group: System/Kernel
 License: GPLv2
 Summary: Open vSwitch kernel modules
@@ -90,33 +69,23 @@ BuildRequires:	%kernel_module_package_buildreqs
 %if 0%{?build_in_kernel_kmp}
 BuildRequires:	kernel-source
 %endif
-# 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
+%description -n %{name}-kmp
 Kernel modules supporting the openvswitch datapath
 %endif
 
-%package common
-Requires:  python-argparse
-Suggests:  ethtool
-Summary:   Open vSwitch common components
-%description common
-openvswitch-common provides components required by both openvswitch-switch
-and openvswitch-controller.
-
-Open vSwitch is a full-featured software-based Ethernet switch.
-
 %package ipsec
 Summary:  Open vSwitch GRE-over-IPsec support
+Group:	   Productivity/Networking/System
 Requires: python
+Requires: python-argparse
 Requires: ipsec-tools >= 0.8
 Requires: racoon >= 0.8
-Requires: openvswitch-common = %{version}
+Requires: openvswitch = %{version}
 Requires: openvswitch-switch = %{version}
 Requires: python-openvswitch = %{version}
+
 %description ipsec
 The ovs-monitor-ipsec script provides support for encrypting GRE
 tunnels with IPsec.
@@ -124,14 +93,16 @@ tunnels with IPsec.
 Open vSwitch is a full-featured software-based Ethernet switch.
 
 %package switch
-#Suggests: openvswitch-datapath-module
+Suggests: openvswitch-kmp
 PreReq: %insserv_prereq  %fillup_prereq
-Requires: openvswitch-common = %{version}
+Requires: openvswitch = %{version}
 Requires: module-init-tools
 Requires: procps
 Requires: uuid-runtime
 Requires: python
 Summary: Open vSwitch switch implementations
+Group:	   Productivity/Networking/System
+
 %description switch
 openvswitch-switch provides the userspace components and utilities for
 he Open vSwitch kernel-based switch.  
@@ -139,8 +110,10 @@ he Open vSwitch kernel-based switch.
 Open vSwitch is a full-featured software-based Ethernet switch.
 
 %package pki
-Requires: openvswitch-common = %{version}
+Requires: openvswitch = %{version}
 Summary:  Open vSwitch public key infrastructure dependency package
+Group:	   Productivity/Networking/System
+
 %description pki
 openvswitch-pki provides PKI (public key infrastructure) support for
 Open vSwitch switches and controllers, reducing the risk of
@@ -149,8 +122,10 @@ man-in-the-middle attacks on the Open vSwitch network infrastructure.
 Open vSwitch is a full-featured software-based Ethernet switch.
 
 %package controller
-Requires: openvswitch-common = %{version}
+Requires: openvswitch = %{version}
 Summary: Open vSwitch controller implementation
+Group:	   Productivity/Networking/System
+
 %description controller
 The Open vSwitch controller enables OpenFlow switches that connect to it
 to act as MAC-learning Ethernet switches.
@@ -160,12 +135,15 @@ Open vSwitch is a full-featured software-based Ethernet switch.
 %package brcompat
 Requires:   openvswitch-switch = %{version}
 Recommends: bridge-utils
-Summary:    Open vSwitch bridge compatibility support
+Summary:    Open vSwitch bridge compatibility support (deprecated)
+Group:	   Productivity/Networking/System
+
 %description brcompat
 openvswitch-brcompat provides a way for applications that use the
 Linux bridge to gradually migrate to Open vSwitch.  Programs that
 ordinarily control the Linux bridge module, such as "brctl", instead
-control the Open vSwitch kernel-based switch.
+control the Open vSwitch kernel-based switch. Please note that this
+feature is deprecated and will ve removed soon.
 
 Once this package is installed, adding BRCOMPAT=yes in
 /etc/default/openvswitch-switch enables bridge compatibility.
@@ -175,14 +153,35 @@ Open vSwitch is a full-featured software-based Ethernet switch.
 %package -n python-openvswitch
 Requires: python
 Summary:  Python bindings for Open vSwitch
+Group:	   Productivity/Networking/System
+
 %description -n python-openvswitch
 This package contains the full Python bindings for Open vSwitch database.
 
-%package -n ovsdbmonitor
+%package -n python-openvswitch-test
-Requires: python-openvswitch
+Requires:  python
-Requires: python-pyasn1
+Summary:   Python bindings for Open vSwitch
-Summary:  Open vSwitch graphical monitoring tool
+Group:	   Productivity/Networking/System
-%description -n ovsdbmonitor
+
+%description -n python-openvswitch-test
+This package contains the full Python bindings for Open vSwitch database.
+
+%if ! 0%{?sles_version}
+%package ovsdbmonitor
+BuildRequires:	python-qt4-devel
+BuildRequires:  python-twisted
+BuildRequires:	python-zopeinterface
+BuildRequires:	python-pyside
+Requires:	python-pyside
+Requires:	python-qt4
+Requires:	python-twisted
+Requires:	python-zopeinterface
+Requires:       python-openvswitch
+Requires:       python-pyasn1
+Summary:        Open vSwitch graphical monitoring tool
+Group:	        Productivity/Networking/System
+
+%description ovsdbmonitor
 This package is a GUI tool for monitoring and troubleshooting local
 or remote Open vSwitch installations.  It presents GUI tables that
 graphically represent an Open vSwitch kernel flow table (similar to
@@ -190,12 +189,16 @@ graphically represent an Open vSwitch kernel flow table (similar to
 to "ovs-vsctl list <table>").
 
 Open vSwitch is a full-featured software-based Ethernet switch.
+%endif
 
 %package test
-Requires: python-twisted-web
+Requires: python-twisted
 Requires: python
 Requires: python-argparse
-Summary: Open vSwitch test package
+Requires: python-openvswitch-test = %{version}
+Summary:  Open vSwitch test package
+Group:	  Productivity/Networking/System
+
 %description test
 This package contains utilities that are useful to diagnose
 performance and connectivity issues in Open vSwitch setup.
@@ -206,7 +209,6 @@ Open vSwitch is a full-featured software-based Ethernet switch.
 %setup -q
 %patch1 -p1
 
-
 set -- *
 mkdir source
 mv "$@" source/
@@ -214,7 +216,10 @@ mkdir obj
 
 %build
 pushd source
+# don't call boot.sh, we don't have appropriate autoconf there
+%if ! 0%{?sles_version}
     bash -x boot.sh
+%endif
 popd
 %if 0%{?build_kmp}
 %if 0%{?build_in_kernel_kmp}
@@ -273,8 +278,10 @@ install -m 644 %SOURCE3  \
          %{buildroot}/var/adm/fillup-templates/sysconfig.%{name}-switch
 install -m 755 %SOURCE2 \
          %{buildroot}/%_sysconfdir/init.d/%{name}-switch
+         ln -s %_sysconfdir/init.d/%{name}-switch %{buildroot}%{_sbindir}/rc%{name}-switch
 install -m 755 %SOURCE5 \
          %{buildroot}/%_sysconfdir/init.d/%{name}-controller
+         ln -s %_sysconfdir/init.d/%{name}-controller %{buildroot}%{_sbindir}/rc%{name}-controller
 
 
 install -d -m 755 %{buildroot}/%_sysconfdir/sysconfig
@@ -287,6 +294,8 @@ install -d -m 755 %{buildroot}/%_sysconfdir/profile.d
 install -d -m 755 %{buildroot}/%{_datadir}/%{name}/scripts
 install -m 644 vswitchd/vswitch.ovsschema \
          %{buildroot}/%{_datadir}/%{name}/vswitch.ovsschema
+install -m 755 debian/ovs-monitor-ipsec \
+	%{buildroot}/%{_datadir}/%{name}/ovs-monitor-ipsec
 
 popd
 
@@ -308,7 +317,7 @@ rmdir %{buildroot}%{_datadir}/%{name}/python
 %{_sbindir}/ovs-brcompatd
 %{_mandir}/man8/ovs-brcompatd.8.gz
 
-%files common
+%files
 %defattr(-,root,root)
 %dir %{_datadir}/openvswitch
 %doc source/AUTHORS source/DESIGN source/INSTALL.* source/NOTICE
@@ -320,6 +329,7 @@ rmdir %{buildroot}%{_datadir}/%{name}/python
 %{_bindir}/ovs-ofctl
 %{_bindir}/ovs-parse-leaks
 %{_bindir}/ovsdb-client
+%{_bindir}/ovs-parse-backtrace
 %{_sbindir}/ovs-bugtool
 %{_sbindir}/ovs-vlan-bug-workaround
 %dir %{_datadir}/openvswitch/scripts
@@ -333,7 +343,6 @@ rmdir %{buildroot}%{_datadir}/%{name}/python
 %{_datadir}/openvswitch/scripts/ovs-bugtool-daemons-ver
 %{_datadir}/openvswitch/scripts/ovs-bugtool-vsctl-show
 %{_datadir}/openvswitch/scripts/ovs-bugtool-memory-show
-%{_datadir}/openvswitch/scripts/ovs-check-dead-ifs
 %{_mandir}/man1/ovs-benchmark.1.gz
 %{_mandir}/man1/ovsdb-client.1.gz
 %{_mandir}/man8/ovs-appctl.8.gz
@@ -341,6 +350,8 @@ rmdir %{buildroot}%{_datadir}/%{name}/python
 %{_mandir}/man8/ovs-ofctl.8.gz
 %{_mandir}/man8/ovs-parse-leaks.8.gz
 %{_mandir}/man8/ovs-vlan-bug-workaround.8.gz
+%{_mandir}/man8/ovs-parse-backtrace.8.gz
+
 
 %files pki
 %defattr(-,root,root)
@@ -351,6 +362,7 @@ rmdir %{buildroot}%{_datadir}/%{name}/python
 %defattr(-,root,root)
 %{_bindir}/ovs-controller
 %{_sysconfdir}/init.d/openvswitch-controller
+%{_sbindir}/rc%{name}-controller
 %{_mandir}/man8/ovs-controller.8.gz
 
 %files -n python-openvswitch
@@ -358,32 +370,37 @@ rmdir %{buildroot}%{_datadir}/%{name}/python
 %dir %{py_sitedir}/ovs
 %{py_sitedir}/ovs/*
 
+%files -n python-openvswitch-test
+%defattr(-,root,root)
+%dir %{py_sitedir}/ovstest
+%{py_sitedir}/ovstest/*
+
+%files ipsec
+%defattr(-,root,root)
+%{_datadir}/openvswitch/ovs-monitor-ipsec
+
 %files switch
 %defattr(-,root,root)
 %{_bindir}/ovs-dpctl
-%{_bindir}/ovs-pcap
 %{_bindir}/ovs-tcpundump
-%{_bindir}/ovs-vlan-test
+%{_bindir}/ovs-pcap
 %{_bindir}/ovs-vsctl
 %{_bindir}/ovsdb-tool
-%{_bindir}/ovs-l3ping
-%{_bindir}/ovs-parse-backtrace
 %{_sbindir}/ovs-vswitchd
 %{_sbindir}/ovsdb-server
+%{_datadir}/openvswitch/scripts/ovs-check-dead-ifs
 %{_datadir}/openvswitch/scripts/ovs-ctl
 %{_datadir}/openvswitch/scripts/ovs-lib
 %{_datadir}/openvswitch/scripts/ovs-save
 %{_datadir}/openvswitch/vswitch.ovsschema
 /var/adm/fillup-templates/sysconfig.openvswitch-switch
 %{_sysconfdir}/init.d/openvswitch-switch
-%{_sysconfdir}/logrotate.d/openvswitch-switch
+%{_sbindir}/rc%{name}-switch
+%config(noreplace) %{_sysconfdir}/logrotate.d/openvswitch-switch
 %{_mandir}/man8/ovs-dpctl.8.gz
-%{_mandir}/man1/ovs-pcap.1.gz
 %{_mandir}/man1/ovs-tcpundump.1.gz
-%{_mandir}/man8/ovs-vlan-test.8.gz
+%{_mandir}/man1/ovs-pcap.1.gz
 %{_mandir}/man8/ovs-vsctl.8.gz
-%{_mandir}/man8/ovs-l3ping.8.gz
-%{_mandir}/man8/ovs-parse-backtrace.8.gz
 %{_mandir}/man1/ovsdb-tool.1.gz
 %{_mandir}/man8/ovs-vswitchd.8.gz
 %{_mandir}/man1/ovsdb-server.1.gz
@@ -393,17 +410,20 @@ rmdir %{buildroot}%{_datadir}/%{name}/python
 %files test
 %defattr(-,root,root)
 %{_bindir}/ovs-test
-
+%{_bindir}/ovs-l3ping
-%dir %{py_sitedir}/ovstest
+%{_bindir}/ovs-vlan-test
-%{py_sitedir}/ovstest/*
 %{_mandir}/man8/ovs-test.8.gz
+%{_mandir}/man8/ovs-l3ping.8.gz
+%{_mandir}/man8/ovs-vlan-test.8.gz
 
-%files -n ovsdbmonitor
+%if ! 0%{?sles_version}
+%files ovsdbmonitor
 %defattr(-,root,root)
 %{_bindir}/ovsdbmonitor
 %dir %{_datadir}/ovsdbmonitor
 %{_datadir}/applications/ovsdbmonitor.desktop
 %{_datadir}/ovsdbmonitor/*
 %{_mandir}/man1/ovsdbmonitor.1.gz
+%endif
 
 %changelog