From dd4d5b470e6cf58cfc27b08b97cb8b87a6e9a37453f7883f93525ac83687cae8 Mon Sep 17 00:00:00 2001 From: OBS User mrdocs Date: Sun, 9 Jul 2017 18:23:59 +0000 Subject: [PATCH] Accepting request 508974 from home:jengelh:branches:network - Implement shared library packaging guideline. OBS-URL: https://build.opensuse.org/request/show/508974 OBS-URL: https://build.opensuse.org/package/show/network/openvswitch?expand=0&rev=117 --- openvswitch.changes | 8 +++++ openvswitch.spec | 72 ++++++++++++++++++++++++++------------------- 2 files changed, 50 insertions(+), 30 deletions(-) diff --git a/openvswitch.changes b/openvswitch.changes index b0b1995..2952887 100644 --- a/openvswitch.changes +++ b/openvswitch.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Sat Jul 8 20:42:27 UTC 2017 - jengelh@inai.de + +- Remove irrelevant wording from summaries/description. + Diversify summaries. +- Get rid of an empty if block by inverting the condition. +- Implement shared library packaging guideline. + ------------------------------------------------------------------- Thu Jul 6 07:59:30 UTC 2017 - mchandras@suse.de diff --git a/openvswitch.spec b/openvswitch.spec index 2769dad..cb30ed9 100644 --- a/openvswitch.spec +++ b/openvswitch.spec @@ -29,10 +29,12 @@ # The testsuite is somewhat fragile for continuous testing in OBS # but keep it here as an option %bcond_with check +%define lname libopenvswitch-2_7-1 + Name: openvswitch Version: 2.7.1 Release: 0 -Summary: An open source, production quality, multilayer virtual switch +Summary: A multilayer virtual network switch # All code is Apache-2.0 except # - lib/sflow* which is SISSL # - utilities/bugtool which is LGPL-2.1 @@ -96,12 +98,12 @@ BuildRequires: libpcap-devel %endif %description -Open vSwitch is a production quality, multilayer virtual switch licensed under -the open source Apache 2.0 license. It is designed to enable massive network automation -through programmatic extension, while still supporting standard management interfaces -and protocols (e.g. NetFlow, sFlow, RSPAN, ERSPAN, CLI, LACP, 802.1ag). In addition, -it is designed to support distribution across multiple physical servers similar to -VMware’s vNetwork distributed vswitch or Cisco’s Nexus 1000V. +Open vSwitch is a multilayer virtual network Ethernet switch. It is +enables network automation through programmatic extension, and +supports standard management interfaces and protocols (e.g. NetFlow, +sFlow, RSPAN, ERSPAN, CLI, LACP, 802.1ag). In addition, it supports +distribution across multiple physical servers similar to VMware’s +vNetwork distributed vswitch or Cisco’s Nexus 1000V. %if %{with kmp} %package kmp @@ -115,11 +117,19 @@ BuildRequires: %{kernel_module_package_buildreqs} Kernel modules supporting the openvswitch datapath. %endif +%package -n %{lname} +Summary: Open vSwitch core libraries +License: Apache-2.0 +Group: System/Libraries + +%description -n %{lname} +Contains the shared libraries used by Open vSwitch and any eventual extensions. + %package devel -Summary: Open vSwitch Devel Libraries +Summary: Development files for Open vSwitch License: Apache-2.0 Group: Development/Libraries/C and C++ -Requires: %{name} = %{version} +Requires: %{lname} = %{version} Provides: %{name}-dpdk-devel = %{version} Obsoletes: %{name}-dpdk-devel < %{version} @@ -127,7 +137,7 @@ Obsoletes: %{name}-dpdk-devel < %{version} Devel libraries and headers for Open vSwitch. %package ovn-central -Summary: Open vSwitch - Open Virtual Network support +Summary: Open Virtual Network support for Open vSwitch License: Apache-2.0 Group: Productivity/Networking/System Requires: %{name} = %{version} @@ -143,7 +153,7 @@ native support for virtual network abstractions, such as virtual L2 and L3 overlays and security groups. %package ovn-host -Summary: Open vSwitch - Open Virtual Network support +Summary: Open Virtual Network support for Open vSwitch License: Apache-2.0 Group: Productivity/Networking/System Requires: %{name} = %{version} @@ -153,13 +163,10 @@ Provides: %{name}-dpdk-ovn:%{_bindir}/ovn-controller Provides: %{name}-ovn:%{_bindir}/ovn-controller %description ovn-host -OVN, the Open Virtual Network, is a system to support virtual network -abstraction. OVN complements the existing capabilities of OVS to add -native support for virtual network abstractions, such as virtual L2 and L3 -overlays and security groups. +This subpackage contains the OVN host controller. %package ovn-vtep -Summary: Open vSwitch - Open Virtual Network support +Summary: Open Virtual Network VTEP controller for Open vSwitch License: Apache-2.0 Group: Productivity/Networking/System Requires: %{name} = %{version} @@ -169,10 +176,10 @@ Provides: %{name}-dpdk-ovn:%{_bindir}/ovn-controller-vtep Provides: %{name}-ovn:%{_bindir}/ovn-controller-vtep %description ovn-vtep -OVN vtep controller +This subpackage contains the OVN VTEP (VXLAN Tunnel Endpoint) controller. %package ovn-common -Summary: Open vSwitch - Open Virtual Network support +Summary: Open Virtual Network diagnostic utilities License: Apache-2.0 Group: Productivity/Networking/System Requires: %{name} = %{version} @@ -186,7 +193,7 @@ Obsoletes: %{name}-ovn < %{version} Utilities that are used to diagnose and manage the OVN components. %package ovn-docker -Summary: Open vSwitch - Open Virtual Network support +Summary: Docker network plugins for OVN License: Apache-2.0 Group: Productivity/Networking/System Requires: %{name} = %{version} @@ -240,7 +247,7 @@ Requires: python Requires: python-six %description -n python-openvswitch -This package contains the full Python bindings for Open vSwitch database. +This package contains the Python bindings for Open vSwitch database. %package -n python-openvswitch-test Summary: Python bindings for Open vSwitch @@ -252,7 +259,7 @@ Requires: python-openvswitch = %{version} Requires: python-twisted %description -n python-openvswitch-test -This package contains the full Python bindings for Open vSwitch database. +This package contains the Python bindings for Open vSwitch database. %package test Summary: Open vSwitch test package @@ -267,11 +274,11 @@ Provides: %{name}-dpdk-test = %{version} Obsoletes: %{name}-dpdk-test < %{version} %description test +Open vSwitch is a software-based Ethernet switch. + This package contains utilities that are useful to diagnose performance and connectivity issues in Open vSwitch setup. -Open vSwitch is a full-featured software-based Ethernet switch. - %prep %setup -q -n openvswitch-%{version} %patch99 -p1 @@ -325,9 +332,8 @@ pushd source # Recheck tests before we declare them broken. If that fails, dump # the log and exit. >2.5.0 uses the RECHECK env variable so this # needs to be taken into consideration for future releases. -if make check TESTSUITEFLAGS="%{?_smp_mflags}" || - make check TESTSUITEFLAGS='--recheck'; then :; -else +if ! make check TESTSUITEFLAGS="%{?_smp_mflags}" && + ! make check TESTSUITEFLAGS='--recheck'; then cat tests/testsuite.log exit 1 fi @@ -444,6 +450,9 @@ export DISABLE_RESTART_ON_UPDATE=yes %service_del_preun ovs-vswitchd.service %service_del_preun openvswitch.service +%post -n %{lname} -p /sbin/ldconfig +%postun -n %{lname} -p /sbin/ldconfig + %pre ovn-central %service_add_pre ovn-northd.service @@ -530,10 +539,6 @@ export DISABLE_RESTART_ON_UPDATE=yes %{_datadir}/openvswitch/scripts/ovs-save %{_datadir}/openvswitch/scripts/ovs-dpdk-migrate-2.6.sh %{_datadir}/openvswitch/vswitch.ovsschema -%{_libdir}/libofproto-2*.so.* -%{_libdir}/libopenvswitch-2*.so.* -%{_libdir}/libovsdb-2*.so.* -%{_libdir}/libsflow-2*.so.* %{_mandir}/man1/ovsdb-client.1%{ext_man} %{_mandir}/man1/ovsdb-server.1%{ext_man} %{_mandir}/man1/ovsdb-tool.1%{ext_man} @@ -564,6 +569,13 @@ export DISABLE_RESTART_ON_UPDATE=yes %{_localstatedir}/adm/fillup-templates/sysconfig.openvswitch %dir %{_localstatedir}/log/openvswitch +%files -n %{lname} +%defattr(-,root,root) +%{_libdir}/libofproto-2*.so.* +%{_libdir}/libopenvswitch-2*.so.* +%{_libdir}/libovsdb-2*.so.* +%{_libdir}/libsflow-2*.so.* + %files pki %defattr(-,root,root) %{_mandir}/man8/ovs-pki.8%{ext_man}