2013-03-27 13:25:19 +01:00
|
|
|
|
#
|
2014-05-20 18:03:31 +02:00
|
|
|
|
# spec file for package openvswitch
|
|
|
|
|
#
|
Accepting request 361282 from home:k_mroz:branches:network
- Don't install INSTALL.* files.
- Removed: openvswitch-switch.template
- New upstream version 2.4.0
- Flow table modifications are now atomic, meaning that each packet
now sees a coherent version of the OpenFlow pipeline. For
example, if a controller removes all flows with a single OpenFlow
"flow_mod", no packet sees an intermediate version of the OpenFlow
pipeline where only some of the flows have been deleted.
- Added support for SFQ, FQ_CoDel and CoDel qdiscs.
- Add bash command-line completion support for ovs-vsctl Please check
utilities/ovs-command-compgen.INSTALL.md for how to use.
- The MAC learning feature now includes per-port fairness to mitigate
MAC flooding attacks.
- New support for a "conjunctive match" OpenFlow extension, which
allows constructing OpenFlow matches of the form "field1 in
{a,b,c...} AND field2 in {d,e,f...}" and generalizations. For details,
see documentation for the "conjunction" action in ovs-ofctl(8).
- Add bash command-line completion support for ovs-appctl/ovs-dpctl/
ovs-ofctl/ovsdb-tool commands. Please check
utilities/ovs-command-compgen.INSTALL.md for how to use.
- The "learn" action supports a new flag "delete_learned" that causes
the learned flows to be deleted when the flow with the "learn" action
is deleted.
- Basic support for the Geneve tunneling protocol. It is not yet
possible to generate or match options. This is planned for a future
release. The protocol is documented at
http://tools.ietf.org/html/draft-gross-geneve-00
- The OVS database now reports controller rate limiting statistics.
OBS-URL: https://build.opensuse.org/request/show/361282
OBS-URL: https://build.opensuse.org/package/show/network/openvswitch?expand=0&rev=76
2016-02-26 16:24:36 +01:00
|
|
|
|
# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
|
2011-05-20 21:19:18 +02:00
|
|
|
|
#
|
|
|
|
|
# All modifications and additions to the file contributed by third parties
|
|
|
|
|
# remain the property of their copyright owners, unless otherwise agreed
|
|
|
|
|
# upon. The license for this file, and modifications and additions to the
|
|
|
|
|
# file, is the same license as for the pristine package itself (unless the
|
|
|
|
|
# license for the pristine package is not an Open Source License, in which
|
|
|
|
|
# case the license is the MIT License). An "Open Source License" is a
|
|
|
|
|
# license that conforms to the Open Source Definition (Version 1.9)
|
|
|
|
|
# published by the Open Source Initiative.
|
|
|
|
|
|
|
|
|
|
# Please submit bugfixes or comments via http://bugs.opensuse.org/
|
|
|
|
|
#
|
2014-05-20 18:03:31 +02:00
|
|
|
|
# needssslcertforbuild
|
|
|
|
|
|
Accepting request 408658 from home:markoschandras:network
- Add missing licenses (bsc#988513)
- Misc spec file cleanups highlighted by the spec-cleaner tool.
- Allow aarch64 builds for openvswitch-dpdk
- Add missing bug references to 2.5.0 release.
old: network/openvswitch
new: home:markoschandras:network/openvswitch rev None
Index: openvswitch-dpdk.changes
===================================================================
--- openvswitch-dpdk.changes (revision 98)
+++ openvswitch-dpdk.changes (revision 46)
@@ -1,4 +1,11 @@
-------------------------------------------------------------------
+Tue Jul 12 10:41:14 UTC 2016 - mchandras@suse.de
+
+- Add missing licenses (bsc#988513)
+- Misc spec file cleanups highlighted by the spec-cleaner tool.
+- Allow aarch64 builds for openvswitch-dpdk
+
+-------------------------------------------------------------------
Mon Jul 4 12:08:06 UTC 2016 - mchandras@suse.de
- Allow the OvS daemon to run as non-root (bsc#987545)
@@ -197,6 +204,8 @@
- Added: ovn-northd.service
- TODO: Explicit DPDK support not yet added to spec.
- Spec file work and cleanup.
+- Includes fixes (or obsoletes) the following issues:
+ * bsc#948840, bsc#941466, bsc#936780, bnc#935750, bnc#867964
-------------------------------------------------------------------
Tue Mar 1 08:43:19 UTC 2016 - kmroz@suse.com
Index: openvswitch-dpdk.spec
===================================================================
--- openvswitch-dpdk.spec (revision 98)
+++ openvswitch-dpdk.spec (revision 46)
@@ -14,10 +14,9 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-
-
# needssslcertforbuild
+
# Disable building the external kernel datapath by default
%bcond_with kmp
# DPDK build disabled by default. It's enabled in the
@@ -26,14 +25,16 @@
# The testsuite is somewhat fragile for continuous testing in OBS
# but keep it here as an option
%bcond_with check
-
# Do NOT edit this auto generated file! Edit openvswitch.spec instead
# and run 'pre_checkin.sh' before committing
Name: openvswitch-dpdk
Version: 2.5.0
Release: 0
Summary: An open source, production quality, multilayer virtual switch (DPDK)
-License: Apache-2.0
+# All code is Apache-2.0 except
+# - lib/sflow* which is SISSL
+# - utilities/bugtool which is LGPL-2.1
+License: Apache-2.0 and LGPL-2.1 and SISSL
Group: Productivity/Networking/System
Url: http://openvswitch.org/
Source0: http://openvswitch.org/releases/openvswitch-%{version}.tar.gz
@@ -43,35 +44,26 @@
Source89: Module.supported.updates
# PATCH-FIX-UPSTREAM openvswitch-2.5.0-detect-dpdk-installation.patch
Patch0: openvswitch-%{version}-detect-dpdk-installation.patch
-Patch1: 0001-Remove-broken-pipe-warning-logs-from-ovsdb-server.lo.patch
+Patch1: 0001-Remove-broken-pipe-warning-logs-from-ovsdb-server.lo.patch
BuildRequires: autoconf
BuildRequires: automake
-%if %{with dpdk}
-# We need to be a bit strict with the dpdk version since
-# it's very possible for DPDK to change it's API between
-# releases. OVS currently requires 2.2.0. We may have to
-# provide multiple versions of dpdk if OVS and DPDK get
-# out of sync too often.
-BuildRequires: dpdk-devel = 2.2.0
-ExclusiveArch: x86_64 %ix86
-%endif
BuildRequires: fdupes
BuildRequires: gcc
BuildRequires: glibc-devel
BuildRequires: graphviz
BuildRequires: libcap-ng-devel
-BuildRequires: libopenssl-devel
BuildRequires: libtool
BuildRequires: make
BuildRequires: openssl
BuildRequires: perl
-BuildRequires: pkg-config
+BuildRequires: pkgconfig
# Needed by the testsuite
BuildRequires: procps
BuildRequires: python-devel
BuildRequires: python-xml
+BuildRequires: valgrind-devel
+BuildRequires: pkgconfig(openssl)
Requires: logrotate
-Requires: openssl
Requires: python
Provides: openvswitch-common = %{version}
Obsoletes: openvswitch-common < %{version}
@@ -79,10 +71,16 @@
Obsoletes: openvswitch-controller < %{version}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%py_requires
-BuildRequires: valgrind-devel
-# We can't have openvswitch and openvswitch-dpdk in parallel
%if %{with dpdk}
+# We need to be a bit strict with the dpdk version since
+# it's very possible for DPDK to change it's API between
+# releases. OVS currently requires 2.2.0. We may have to
+# provide multiple versions of dpdk if OVS and DPDK get
+# out of sync too often.
+BuildRequires: dpdk-devel = 2.2.0
+# We can't have openvswitch and openvswitch-dpdk in parallel
Conflicts: openvswitch
+ExclusiveArch: aarch64 x86_64 %{ix86}
%endif
%description
@@ -131,15 +129,15 @@
# ovs-ctl / ovs-pki use /usr/bin/uuidgen:
Requires: util-linux
Requires(post): %fillup_prereq
+Suggests: logrotate
Provides: openvswitch-any-switch = %{version}
+%{?systemd_requires}
%if %{with dpdk}
Conflicts: openvswitch-switch
%endif
-Suggests: logrotate
%if %{with kmp}
Suggests: openvswitch-kmp
%endif
-%{?systemd_requires}
%description switch
openvswitch-switch provides the userspace components and utilities for
@@ -246,7 +244,7 @@
Open vSwitch is a full-featured software-based Ethernet switch.
%prep
-%setup -n openvswitch-%{version} -q
+%setup -q -n openvswitch-%{version}
%patch0 -p1
%patch1 -p1
@@ -290,6 +288,7 @@
--disable-static \
--enable-libcapng \
--enable-shared \
+ --enable-ssl \
${dpdk_opt} \
--with-logdir=%{_localstatedir}/log/openvswitch
make %{?_smp_mflags}
@@ -301,7 +300,7 @@
# 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}" ||
+if make check TESTSUITEFLAGS="%{?_smp_mflags}" ||
make check TESTSUITEFLAGS='--recheck'; then :;
else
cat tests/testsuite.log
@@ -358,7 +357,7 @@
mv %{buildroot}%{_datadir}/openvswitch/python/* %{buildroot}%{py_sitedir}
rmdir %{buildroot}%{_datadir}/openvswitch/python
-rm -f %buildroot/%_libdir/*.la
+find %{buildroot} -type f -name "*.la" -delete -print
# Remove unpackaged files for the dpdk case
%if %{with dpdk}
@@ -438,26 +437,26 @@
%{_libdir}/libopenvswitch.so.*
%{_libdir}/libovsdb.so.*
%{_libdir}/libsflow.so.*
-%{_mandir}/man1/ovs-benchmark.1.gz
-%{_mandir}/man1/ovsdb-client.1.gz
-%{_mandir}/man8/ovs-appctl.8.gz
-%{_mandir}/man8/ovs-bugtool.8.gz
-%{_mandir}/man8/ovs-ofctl.8.gz
-%{_mandir}/man8/ovs-vlan-bug-workaround.8.gz
-%{_mandir}/man8/ovs-parse-backtrace.8.gz
-%{_mandir}/man8/ovs-dpctl-top.8.gz
+%{_mandir}/man1/ovs-benchmark.1%{ext_man}
+%{_mandir}/man1/ovsdb-client.1%{ext_man}
+%{_mandir}/man8/ovs-appctl.8%{ext_man}
+%{_mandir}/man8/ovs-bugtool.8%{ext_man}
+%{_mandir}/man8/ovs-ofctl.8%{ext_man}
+%{_mandir}/man8/ovs-vlan-bug-workaround.8%{ext_man}
+%{_mandir}/man8/ovs-parse-backtrace.8%{ext_man}
+%{_mandir}/man8/ovs-dpctl-top.8%{ext_man}
%{_sysconfdir}/bash_completion.d/ovs-appctl-bashcomp.bash
%files pki
%defattr(-,root,root)
-%{_mandir}/man8/ovs-pki.8.gz
+%{_mandir}/man8/ovs-pki.8%{ext_man}
%{_bindir}/ovs-pki
%files vtep
%defattr(-,root,root)
%{_bindir}/vtep-ctl
-%{_mandir}/man5/vtep.5.gz
-%{_mandir}/man8/vtep-ctl.8.gz
+%{_mandir}/man5/vtep.5%{ext_man}
+%{_mandir}/man8/vtep-ctl.8%{ext_man}
%{_datadir}/openvswitch/scripts/ovs-vtep
%{_datadir}/openvswitch/vtep.ovsschema
%{_libdir}/libvtep.so.*
@@ -489,15 +488,15 @@
%{_datadir}/openvswitch/vswitch.ovsschema
%{_sysconfdir}/bash_completion.d/ovs-vsctl-bashcomp.bash
%config(noreplace) %{_sysconfdir}/logrotate.d/openvswitch-switch
-%{_mandir}/man8/ovs-dpctl.8.gz
-%{_mandir}/man1/ovs-tcpundump.1.gz
-%{_mandir}/man1/ovs-pcap.1.gz
-%{_mandir}/man8/ovs-vsctl.8.gz
-%{_mandir}/man1/ovsdb-tool.1.gz
-%{_mandir}/man8/ovs-vswitchd.8.gz
-%{_mandir}/man1/ovsdb-server.1.gz
-%{_mandir}/man5/ovs-vswitchd.conf.db.5.gz
-%{_mandir}/man8/ovs-ctl.8.gz
+%{_mandir}/man8/ovs-dpctl.8%{ext_man}
+%{_mandir}/man1/ovs-tcpundump.1%{ext_man}
+%{_mandir}/man1/ovs-pcap.1%{ext_man}
+%{_mandir}/man8/ovs-vsctl.8%{ext_man}
+%{_mandir}/man1/ovsdb-tool.1%{ext_man}
+%{_mandir}/man8/ovs-vswitchd.8%{ext_man}
+%{_mandir}/man1/ovsdb-server.1%{ext_man}
+%{_mandir}/man5/ovs-vswitchd.conf.db.5%{ext_man}
+%{_mandir}/man8/ovs-ctl.8%{ext_man}
%{_sbindir}/rcopenvswitch
%{_unitdir}/openvswitch.service
%{_localstatedir}/adm/fillup-templates/sysconfig.openvswitch
@@ -538,10 +537,10 @@
%{_bindir}/ovs-l3ping
%{_bindir}/ovs-vlan-test
%{_bindir}/ovs-testcontroller
-%{_mandir}/man8/ovs-test.8.gz
-%{_mandir}/man8/ovs-l3ping.8.gz
-%{_mandir}/man8/ovs-vlan-test.8.gz
-%{_mandir}/man8/ovs-testcontroller.8.gz
+%{_mandir}/man8/ovs-test.8%{ext_man}
+%{_mandir}/man8/ovs-l3ping.8%{ext_man}
+%{_mandir}/man8/ovs-vlan-test.8%{ext_man}
+%{_mandir}/man8/ovs-testcontroller.8%{ext_man}
%files devel
%defattr(-,root,root)
Index: openvswitch.changes
===================================================================
--- openvswitch.changes (revision 98)
+++ openvswitch.changes (revision 46)
@@ -1,4 +1,11 @@
-------------------------------------------------------------------
+Tue Jul 12 10:41:14 UTC 2016 - mchandras@suse.de
+
+- Add missing licenses (bsc#988513)
+- Misc spec file cleanups highlighted by the spec-cleaner tool.
+- Allow aarch64 builds for openvswitch-dpdk
+
+-------------------------------------------------------------------
Mon Jul 4 12:08:06 UTC 2016 - mchandras@suse.de
- Allow the OvS daemon to run as non-root (bsc#987545)
@@ -197,6 +204,8 @@
- Added: ovn-northd.service
- TODO: Explicit DPDK support not yet added to spec.
- Spec file work and cleanup.
+- Includes fixes (or obsoletes) the following issues:
+ * bsc#948840, bsc#941466, bsc#936780, bnc#935750, bnc#867964
-------------------------------------------------------------------
Tue Mar 1 08:43:19 UTC 2016 - kmroz@suse.com
Index: openvswitch.spec
===================================================================
--- openvswitch.spec (revision 98)
+++ openvswitch.spec (revision 46)
@@ -14,10 +14,9 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-
-
# needssslcertforbuild
+
# Disable building the external kernel datapath by default
%bcond_with kmp
# DPDK build disabled by default. It's enabled in the
@@ -26,12 +25,14 @@
# The testsuite is somewhat fragile for continuous testing in OBS
# but keep it here as an option
%bcond_with check
-
Name: openvswitch
Version: 2.5.0
Release: 0
Summary: An open source, production quality, multilayer virtual switch
-License: Apache-2.0
+# All code is Apache-2.0 except
+# - lib/sflow* which is SISSL
+# - utilities/bugtool which is LGPL-2.1
+License: Apache-2.0 and LGPL-2.1 and SISSL
Group: Productivity/Networking/System
Url: http://openvswitch.org/
Source0: http://openvswitch.org/releases/openvswitch-%{version}.tar.gz
@@ -41,35 +42,26 @@
Source89: Module.supported.updates
# PATCH-FIX-UPSTREAM openvswitch-2.5.0-detect-dpdk-installation.patch
Patch0: openvswitch-%{version}-detect-dpdk-installation.patch
-Patch1: 0001-Remove-broken-pipe-warning-logs-from-ovsdb-server.lo.patch
+Patch1: 0001-Remove-broken-pipe-warning-logs-from-ovsdb-server.lo.patch
BuildRequires: autoconf
BuildRequires: automake
-%if %{with dpdk}
-# We need to be a bit strict with the dpdk version since
-# it's very possible for DPDK to change it's API between
-# releases. OVS currently requires 2.2.0. We may have to
-# provide multiple versions of dpdk if OVS and DPDK get
-# out of sync too often.
-BuildRequires: dpdk-devel = 2.2.0
-ExclusiveArch: x86_64 %ix86
-%endif
BuildRequires: fdupes
BuildRequires: gcc
BuildRequires: glibc-devel
BuildRequires: graphviz
BuildRequires: libcap-ng-devel
-BuildRequires: libopenssl-devel
BuildRequires: libtool
BuildRequires: make
BuildRequires: openssl
BuildRequires: perl
-BuildRequires: pkg-config
+BuildRequires: pkgconfig
# Needed by the testsuite
BuildRequires: procps
BuildRequires: python-devel
BuildRequires: python-xml
+BuildRequires: valgrind-devel
+BuildRequires: pkgconfig(openssl)
Requires: logrotate
-Requires: openssl
Requires: python
Provides: openvswitch-common = %{version}
Obsoletes: openvswitch-common < %{version}
@@ -77,10 +69,16 @@
Obsoletes: openvswitch-controller < %{version}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%py_requires
-BuildRequires: valgrind-devel
-# We can't have openvswitch and openvswitch-dpdk in parallel
%if %{with dpdk}
+# We need to be a bit strict with the dpdk version since
+# it's very possible for DPDK to change it's API between
+# releases. OVS currently requires 2.2.0. We may have to
+# provide multiple versions of dpdk if OVS and DPDK get
+# out of sync too often.
+BuildRequires: dpdk-devel = 2.2.0
+# We can't have openvswitch and openvswitch-dpdk in parallel
Conflicts: openvswitch
+ExclusiveArch: aarch64 x86_64 %{ix86}
%endif
%description
@@ -129,15 +127,15 @@
# ovs-ctl / ovs-pki use /usr/bin/uuidgen:
Requires: util-linux
Requires(post): %fillup_prereq
+Suggests: logrotate
Provides: openvswitch-any-switch = %{version}
+%{?systemd_requires}
%if %{with dpdk}
Conflicts: openvswitch-switch
%endif
-Suggests: logrotate
%if %{with kmp}
Suggests: openvswitch-kmp
%endif
-%{?systemd_requires}
%description switch
openvswitch-switch provides the userspace components and utilities for
@@ -244,7 +242,7 @@
Open vSwitch is a full-featured software-based Ethernet switch.
%prep
-%setup -n openvswitch-%{version} -q
+%setup -q -n openvswitch-%{version}
%patch0 -p1
%patch1 -p1
@@ -288,6 +286,7 @@
--disable-static \
--enable-libcapng \
--enable-shared \
+ --enable-ssl \
${dpdk_opt} \
--with-logdir=%{_localstatedir}/log/openvswitch
make %{?_smp_mflags}
@@ -299,7 +298,7 @@
# 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}" ||
+if make check TESTSUITEFLAGS="%{?_smp_mflags}" ||
make check TESTSUITEFLAGS='--recheck'; then :;
else
cat tests/testsuite.log
@@ -356,7 +355,7 @@
mv %{buildroot}%{_datadir}/openvswitch/python/* %{buildroot}%{py_sitedir}
rmdir %{buildroot}%{_datadir}/openvswitch/python
-rm -f %buildroot/%_libdir/*.la
+find %{buildroot} -type f -name "*.la" -delete -print
# Remove unpackaged files for the dpdk case
%if %{with dpdk}
@@ -436,26 +435,26 @@
%{_libdir}/libopenvswitch.so.*
%{_libdir}/libovsdb.so.*
%{_libdir}/libsflow.so.*
-%{_mandir}/man1/ovs-benchmark.1.gz
-%{_mandir}/man1/ovsdb-client.1.gz
-%{_mandir}/man8/ovs-appctl.8.gz
-%{_mandir}/man8/ovs-bugtool.8.gz
-%{_mandir}/man8/ovs-ofctl.8.gz
-%{_mandir}/man8/ovs-vlan-bug-workaround.8.gz
-%{_mandir}/man8/ovs-parse-backtrace.8.gz
-%{_mandir}/man8/ovs-dpctl-top.8.gz
+%{_mandir}/man1/ovs-benchmark.1%{ext_man}
+%{_mandir}/man1/ovsdb-client.1%{ext_man}
+%{_mandir}/man8/ovs-appctl.8%{ext_man}
+%{_mandir}/man8/ovs-bugtool.8%{ext_man}
+%{_mandir}/man8/ovs-ofctl.8%{ext_man}
+%{_mandir}/man8/ovs-vlan-bug-workaround.8%{ext_man}
+%{_mandir}/man8/ovs-parse-backtrace.8%{ext_man}
+%{_mandir}/man8/ovs-dpctl-top.8%{ext_man}
%{_sysconfdir}/bash_completion.d/ovs-appctl-bashcomp.bash
%files pki
%defattr(-,root,root)
-%{_mandir}/man8/ovs-pki.8.gz
+%{_mandir}/man8/ovs-pki.8%{ext_man}
%{_bindir}/ovs-pki
%files vtep
%defattr(-,root,root)
%{_bindir}/vtep-ctl
-%{_mandir}/man5/vtep.5.gz
-%{_mandir}/man8/vtep-ctl.8.gz
+%{_mandir}/man5/vtep.5%{ext_man}
+%{_mandir}/man8/vtep-ctl.8%{ext_man}
%{_datadir}/openvswitch/scripts/ovs-vtep
%{_datadir}/openvswitch/vtep.ovsschema
%{_libdir}/libvtep.so.*
@@ -487,15 +486,15 @@
%{_datadir}/openvswitch/vswitch.ovsschema
%{_sysconfdir}/bash_completion.d/ovs-vsctl-bashcomp.bash
%config(noreplace) %{_sysconfdir}/logrotate.d/openvswitch-switch
-%{_mandir}/man8/ovs-dpctl.8.gz
-%{_mandir}/man1/ovs-tcpundump.1.gz
-%{_mandir}/man1/ovs-pcap.1.gz
-%{_mandir}/man8/ovs-vsctl.8.gz
-%{_mandir}/man1/ovsdb-tool.1.gz
-%{_mandir}/man8/ovs-vswitchd.8.gz
-%{_mandir}/man1/ovsdb-server.1.gz
-%{_mandir}/man5/ovs-vswitchd.conf.db.5.gz
-%{_mandir}/man8/ovs-ctl.8.gz
+%{_mandir}/man8/ovs-dpctl.8%{ext_man}
+%{_mandir}/man1/ovs-tcpundump.1%{ext_man}
+%{_mandir}/man1/ovs-pcap.1%{ext_man}
+%{_mandir}/man8/ovs-vsctl.8%{ext_man}
+%{_mandir}/man1/ovsdb-tool.1%{ext_man}
+%{_mandir}/man8/ovs-vswitchd.8%{ext_man}
+%{_mandir}/man1/ovsdb-server.1%{ext_man}
+%{_mandir}/man5/ovs-vswitchd.conf.db.5%{ext_man}
+%{_mandir}/man8/ovs-ctl.8%{ext_man}
%{_sbindir}/rcopenvswitch
%{_unitdir}/openvswitch.service
%{_localstatedir}/adm/fillup-templates/sysconfig.openvswitch
@@ -536,10 +535,10 @@
%{_bindir}/ovs-l3ping
%{_bindir}/ovs-vlan-test
%{_bindir}/ovs-testcontroller
-%{_mandir}/man8/ovs-test.8.gz
-%{_mandir}/man8/ovs-l3ping.8.gz
-%{_mandir}/man8/ovs-vlan-test.8.gz
-%{_mandir}/man8/ovs-testcontroller.8.gz
+%{_mandir}/man8/ovs-test.8%{ext_man}
+%{_mandir}/man8/ovs-l3ping.8%{ext_man}
+%{_mandir}/man8/ovs-vlan-test.8%{ext_man}
+%{_mandir}/man8/ovs-testcontroller.8%{ext_man}
%files devel
%defattr(-,root,root)
OBS-URL: https://build.opensuse.org/request/show/408658
OBS-URL: https://build.opensuse.org/package/show/network/openvswitch?expand=0&rev=99
2016-07-18 10:19:36 +02:00
|
|
|
|
|
2016-05-19 12:13:17 +02:00
|
|
|
|
# Disable building the external kernel datapath by default
|
|
|
|
|
%bcond_with kmp
|
2016-06-21 14:24:21 +02:00
|
|
|
|
# DPDK build disabled by default. It's enabled in the
|
2016-06-22 11:27:41 +02:00
|
|
|
|
# openvswitch-dpdk.spec file (generated by pre_checkin.sh)
|
2016-06-21 14:24:21 +02:00
|
|
|
|
%bcond_with dpdk
|
|
|
|
|
# The testsuite is somewhat fragile for continuous testing in OBS
|
|
|
|
|
# but keep it here as an option
|
|
|
|
|
%bcond_with check
|
2011-05-20 21:19:18 +02:00
|
|
|
|
Name: openvswitch
|
2016-10-07 15:07:43 +02:00
|
|
|
|
Version: 2.6.0
|
2016-03-09 18:19:55 +01:00
|
|
|
|
Release: 0
|
2013-03-27 13:25:19 +01:00
|
|
|
|
Summary: An open source, production quality, multilayer virtual switch
|
Accepting request 408658 from home:markoschandras:network
- Add missing licenses (bsc#988513)
- Misc spec file cleanups highlighted by the spec-cleaner tool.
- Allow aarch64 builds for openvswitch-dpdk
- Add missing bug references to 2.5.0 release.
old: network/openvswitch
new: home:markoschandras:network/openvswitch rev None
Index: openvswitch-dpdk.changes
===================================================================
--- openvswitch-dpdk.changes (revision 98)
+++ openvswitch-dpdk.changes (revision 46)
@@ -1,4 +1,11 @@
-------------------------------------------------------------------
+Tue Jul 12 10:41:14 UTC 2016 - mchandras@suse.de
+
+- Add missing licenses (bsc#988513)
+- Misc spec file cleanups highlighted by the spec-cleaner tool.
+- Allow aarch64 builds for openvswitch-dpdk
+
+-------------------------------------------------------------------
Mon Jul 4 12:08:06 UTC 2016 - mchandras@suse.de
- Allow the OvS daemon to run as non-root (bsc#987545)
@@ -197,6 +204,8 @@
- Added: ovn-northd.service
- TODO: Explicit DPDK support not yet added to spec.
- Spec file work and cleanup.
+- Includes fixes (or obsoletes) the following issues:
+ * bsc#948840, bsc#941466, bsc#936780, bnc#935750, bnc#867964
-------------------------------------------------------------------
Tue Mar 1 08:43:19 UTC 2016 - kmroz@suse.com
Index: openvswitch-dpdk.spec
===================================================================
--- openvswitch-dpdk.spec (revision 98)
+++ openvswitch-dpdk.spec (revision 46)
@@ -14,10 +14,9 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-
-
# needssslcertforbuild
+
# Disable building the external kernel datapath by default
%bcond_with kmp
# DPDK build disabled by default. It's enabled in the
@@ -26,14 +25,16 @@
# The testsuite is somewhat fragile for continuous testing in OBS
# but keep it here as an option
%bcond_with check
-
# Do NOT edit this auto generated file! Edit openvswitch.spec instead
# and run 'pre_checkin.sh' before committing
Name: openvswitch-dpdk
Version: 2.5.0
Release: 0
Summary: An open source, production quality, multilayer virtual switch (DPDK)
-License: Apache-2.0
+# All code is Apache-2.0 except
+# - lib/sflow* which is SISSL
+# - utilities/bugtool which is LGPL-2.1
+License: Apache-2.0 and LGPL-2.1 and SISSL
Group: Productivity/Networking/System
Url: http://openvswitch.org/
Source0: http://openvswitch.org/releases/openvswitch-%{version}.tar.gz
@@ -43,35 +44,26 @@
Source89: Module.supported.updates
# PATCH-FIX-UPSTREAM openvswitch-2.5.0-detect-dpdk-installation.patch
Patch0: openvswitch-%{version}-detect-dpdk-installation.patch
-Patch1: 0001-Remove-broken-pipe-warning-logs-from-ovsdb-server.lo.patch
+Patch1: 0001-Remove-broken-pipe-warning-logs-from-ovsdb-server.lo.patch
BuildRequires: autoconf
BuildRequires: automake
-%if %{with dpdk}
-# We need to be a bit strict with the dpdk version since
-# it's very possible for DPDK to change it's API between
-# releases. OVS currently requires 2.2.0. We may have to
-# provide multiple versions of dpdk if OVS and DPDK get
-# out of sync too often.
-BuildRequires: dpdk-devel = 2.2.0
-ExclusiveArch: x86_64 %ix86
-%endif
BuildRequires: fdupes
BuildRequires: gcc
BuildRequires: glibc-devel
BuildRequires: graphviz
BuildRequires: libcap-ng-devel
-BuildRequires: libopenssl-devel
BuildRequires: libtool
BuildRequires: make
BuildRequires: openssl
BuildRequires: perl
-BuildRequires: pkg-config
+BuildRequires: pkgconfig
# Needed by the testsuite
BuildRequires: procps
BuildRequires: python-devel
BuildRequires: python-xml
+BuildRequires: valgrind-devel
+BuildRequires: pkgconfig(openssl)
Requires: logrotate
-Requires: openssl
Requires: python
Provides: openvswitch-common = %{version}
Obsoletes: openvswitch-common < %{version}
@@ -79,10 +71,16 @@
Obsoletes: openvswitch-controller < %{version}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%py_requires
-BuildRequires: valgrind-devel
-# We can't have openvswitch and openvswitch-dpdk in parallel
%if %{with dpdk}
+# We need to be a bit strict with the dpdk version since
+# it's very possible for DPDK to change it's API between
+# releases. OVS currently requires 2.2.0. We may have to
+# provide multiple versions of dpdk if OVS and DPDK get
+# out of sync too often.
+BuildRequires: dpdk-devel = 2.2.0
+# We can't have openvswitch and openvswitch-dpdk in parallel
Conflicts: openvswitch
+ExclusiveArch: aarch64 x86_64 %{ix86}
%endif
%description
@@ -131,15 +129,15 @@
# ovs-ctl / ovs-pki use /usr/bin/uuidgen:
Requires: util-linux
Requires(post): %fillup_prereq
+Suggests: logrotate
Provides: openvswitch-any-switch = %{version}
+%{?systemd_requires}
%if %{with dpdk}
Conflicts: openvswitch-switch
%endif
-Suggests: logrotate
%if %{with kmp}
Suggests: openvswitch-kmp
%endif
-%{?systemd_requires}
%description switch
openvswitch-switch provides the userspace components and utilities for
@@ -246,7 +244,7 @@
Open vSwitch is a full-featured software-based Ethernet switch.
%prep
-%setup -n openvswitch-%{version} -q
+%setup -q -n openvswitch-%{version}
%patch0 -p1
%patch1 -p1
@@ -290,6 +288,7 @@
--disable-static \
--enable-libcapng \
--enable-shared \
+ --enable-ssl \
${dpdk_opt} \
--with-logdir=%{_localstatedir}/log/openvswitch
make %{?_smp_mflags}
@@ -301,7 +300,7 @@
# 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}" ||
+if make check TESTSUITEFLAGS="%{?_smp_mflags}" ||
make check TESTSUITEFLAGS='--recheck'; then :;
else
cat tests/testsuite.log
@@ -358,7 +357,7 @@
mv %{buildroot}%{_datadir}/openvswitch/python/* %{buildroot}%{py_sitedir}
rmdir %{buildroot}%{_datadir}/openvswitch/python
-rm -f %buildroot/%_libdir/*.la
+find %{buildroot} -type f -name "*.la" -delete -print
# Remove unpackaged files for the dpdk case
%if %{with dpdk}
@@ -438,26 +437,26 @@
%{_libdir}/libopenvswitch.so.*
%{_libdir}/libovsdb.so.*
%{_libdir}/libsflow.so.*
-%{_mandir}/man1/ovs-benchmark.1.gz
-%{_mandir}/man1/ovsdb-client.1.gz
-%{_mandir}/man8/ovs-appctl.8.gz
-%{_mandir}/man8/ovs-bugtool.8.gz
-%{_mandir}/man8/ovs-ofctl.8.gz
-%{_mandir}/man8/ovs-vlan-bug-workaround.8.gz
-%{_mandir}/man8/ovs-parse-backtrace.8.gz
-%{_mandir}/man8/ovs-dpctl-top.8.gz
+%{_mandir}/man1/ovs-benchmark.1%{ext_man}
+%{_mandir}/man1/ovsdb-client.1%{ext_man}
+%{_mandir}/man8/ovs-appctl.8%{ext_man}
+%{_mandir}/man8/ovs-bugtool.8%{ext_man}
+%{_mandir}/man8/ovs-ofctl.8%{ext_man}
+%{_mandir}/man8/ovs-vlan-bug-workaround.8%{ext_man}
+%{_mandir}/man8/ovs-parse-backtrace.8%{ext_man}
+%{_mandir}/man8/ovs-dpctl-top.8%{ext_man}
%{_sysconfdir}/bash_completion.d/ovs-appctl-bashcomp.bash
%files pki
%defattr(-,root,root)
-%{_mandir}/man8/ovs-pki.8.gz
+%{_mandir}/man8/ovs-pki.8%{ext_man}
%{_bindir}/ovs-pki
%files vtep
%defattr(-,root,root)
%{_bindir}/vtep-ctl
-%{_mandir}/man5/vtep.5.gz
-%{_mandir}/man8/vtep-ctl.8.gz
+%{_mandir}/man5/vtep.5%{ext_man}
+%{_mandir}/man8/vtep-ctl.8%{ext_man}
%{_datadir}/openvswitch/scripts/ovs-vtep
%{_datadir}/openvswitch/vtep.ovsschema
%{_libdir}/libvtep.so.*
@@ -489,15 +488,15 @@
%{_datadir}/openvswitch/vswitch.ovsschema
%{_sysconfdir}/bash_completion.d/ovs-vsctl-bashcomp.bash
%config(noreplace) %{_sysconfdir}/logrotate.d/openvswitch-switch
-%{_mandir}/man8/ovs-dpctl.8.gz
-%{_mandir}/man1/ovs-tcpundump.1.gz
-%{_mandir}/man1/ovs-pcap.1.gz
-%{_mandir}/man8/ovs-vsctl.8.gz
-%{_mandir}/man1/ovsdb-tool.1.gz
-%{_mandir}/man8/ovs-vswitchd.8.gz
-%{_mandir}/man1/ovsdb-server.1.gz
-%{_mandir}/man5/ovs-vswitchd.conf.db.5.gz
-%{_mandir}/man8/ovs-ctl.8.gz
+%{_mandir}/man8/ovs-dpctl.8%{ext_man}
+%{_mandir}/man1/ovs-tcpundump.1%{ext_man}
+%{_mandir}/man1/ovs-pcap.1%{ext_man}
+%{_mandir}/man8/ovs-vsctl.8%{ext_man}
+%{_mandir}/man1/ovsdb-tool.1%{ext_man}
+%{_mandir}/man8/ovs-vswitchd.8%{ext_man}
+%{_mandir}/man1/ovsdb-server.1%{ext_man}
+%{_mandir}/man5/ovs-vswitchd.conf.db.5%{ext_man}
+%{_mandir}/man8/ovs-ctl.8%{ext_man}
%{_sbindir}/rcopenvswitch
%{_unitdir}/openvswitch.service
%{_localstatedir}/adm/fillup-templates/sysconfig.openvswitch
@@ -538,10 +537,10 @@
%{_bindir}/ovs-l3ping
%{_bindir}/ovs-vlan-test
%{_bindir}/ovs-testcontroller
-%{_mandir}/man8/ovs-test.8.gz
-%{_mandir}/man8/ovs-l3ping.8.gz
-%{_mandir}/man8/ovs-vlan-test.8.gz
-%{_mandir}/man8/ovs-testcontroller.8.gz
+%{_mandir}/man8/ovs-test.8%{ext_man}
+%{_mandir}/man8/ovs-l3ping.8%{ext_man}
+%{_mandir}/man8/ovs-vlan-test.8%{ext_man}
+%{_mandir}/man8/ovs-testcontroller.8%{ext_man}
%files devel
%defattr(-,root,root)
Index: openvswitch.changes
===================================================================
--- openvswitch.changes (revision 98)
+++ openvswitch.changes (revision 46)
@@ -1,4 +1,11 @@
-------------------------------------------------------------------
+Tue Jul 12 10:41:14 UTC 2016 - mchandras@suse.de
+
+- Add missing licenses (bsc#988513)
+- Misc spec file cleanups highlighted by the spec-cleaner tool.
+- Allow aarch64 builds for openvswitch-dpdk
+
+-------------------------------------------------------------------
Mon Jul 4 12:08:06 UTC 2016 - mchandras@suse.de
- Allow the OvS daemon to run as non-root (bsc#987545)
@@ -197,6 +204,8 @@
- Added: ovn-northd.service
- TODO: Explicit DPDK support not yet added to spec.
- Spec file work and cleanup.
+- Includes fixes (or obsoletes) the following issues:
+ * bsc#948840, bsc#941466, bsc#936780, bnc#935750, bnc#867964
-------------------------------------------------------------------
Tue Mar 1 08:43:19 UTC 2016 - kmroz@suse.com
Index: openvswitch.spec
===================================================================
--- openvswitch.spec (revision 98)
+++ openvswitch.spec (revision 46)
@@ -14,10 +14,9 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-
-
# needssslcertforbuild
+
# Disable building the external kernel datapath by default
%bcond_with kmp
# DPDK build disabled by default. It's enabled in the
@@ -26,12 +25,14 @@
# The testsuite is somewhat fragile for continuous testing in OBS
# but keep it here as an option
%bcond_with check
-
Name: openvswitch
Version: 2.5.0
Release: 0
Summary: An open source, production quality, multilayer virtual switch
-License: Apache-2.0
+# All code is Apache-2.0 except
+# - lib/sflow* which is SISSL
+# - utilities/bugtool which is LGPL-2.1
+License: Apache-2.0 and LGPL-2.1 and SISSL
Group: Productivity/Networking/System
Url: http://openvswitch.org/
Source0: http://openvswitch.org/releases/openvswitch-%{version}.tar.gz
@@ -41,35 +42,26 @@
Source89: Module.supported.updates
# PATCH-FIX-UPSTREAM openvswitch-2.5.0-detect-dpdk-installation.patch
Patch0: openvswitch-%{version}-detect-dpdk-installation.patch
-Patch1: 0001-Remove-broken-pipe-warning-logs-from-ovsdb-server.lo.patch
+Patch1: 0001-Remove-broken-pipe-warning-logs-from-ovsdb-server.lo.patch
BuildRequires: autoconf
BuildRequires: automake
-%if %{with dpdk}
-# We need to be a bit strict with the dpdk version since
-# it's very possible for DPDK to change it's API between
-# releases. OVS currently requires 2.2.0. We may have to
-# provide multiple versions of dpdk if OVS and DPDK get
-# out of sync too often.
-BuildRequires: dpdk-devel = 2.2.0
-ExclusiveArch: x86_64 %ix86
-%endif
BuildRequires: fdupes
BuildRequires: gcc
BuildRequires: glibc-devel
BuildRequires: graphviz
BuildRequires: libcap-ng-devel
-BuildRequires: libopenssl-devel
BuildRequires: libtool
BuildRequires: make
BuildRequires: openssl
BuildRequires: perl
-BuildRequires: pkg-config
+BuildRequires: pkgconfig
# Needed by the testsuite
BuildRequires: procps
BuildRequires: python-devel
BuildRequires: python-xml
+BuildRequires: valgrind-devel
+BuildRequires: pkgconfig(openssl)
Requires: logrotate
-Requires: openssl
Requires: python
Provides: openvswitch-common = %{version}
Obsoletes: openvswitch-common < %{version}
@@ -77,10 +69,16 @@
Obsoletes: openvswitch-controller < %{version}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%py_requires
-BuildRequires: valgrind-devel
-# We can't have openvswitch and openvswitch-dpdk in parallel
%if %{with dpdk}
+# We need to be a bit strict with the dpdk version since
+# it's very possible for DPDK to change it's API between
+# releases. OVS currently requires 2.2.0. We may have to
+# provide multiple versions of dpdk if OVS and DPDK get
+# out of sync too often.
+BuildRequires: dpdk-devel = 2.2.0
+# We can't have openvswitch and openvswitch-dpdk in parallel
Conflicts: openvswitch
+ExclusiveArch: aarch64 x86_64 %{ix86}
%endif
%description
@@ -129,15 +127,15 @@
# ovs-ctl / ovs-pki use /usr/bin/uuidgen:
Requires: util-linux
Requires(post): %fillup_prereq
+Suggests: logrotate
Provides: openvswitch-any-switch = %{version}
+%{?systemd_requires}
%if %{with dpdk}
Conflicts: openvswitch-switch
%endif
-Suggests: logrotate
%if %{with kmp}
Suggests: openvswitch-kmp
%endif
-%{?systemd_requires}
%description switch
openvswitch-switch provides the userspace components and utilities for
@@ -244,7 +242,7 @@
Open vSwitch is a full-featured software-based Ethernet switch.
%prep
-%setup -n openvswitch-%{version} -q
+%setup -q -n openvswitch-%{version}
%patch0 -p1
%patch1 -p1
@@ -288,6 +286,7 @@
--disable-static \
--enable-libcapng \
--enable-shared \
+ --enable-ssl \
${dpdk_opt} \
--with-logdir=%{_localstatedir}/log/openvswitch
make %{?_smp_mflags}
@@ -299,7 +298,7 @@
# 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}" ||
+if make check TESTSUITEFLAGS="%{?_smp_mflags}" ||
make check TESTSUITEFLAGS='--recheck'; then :;
else
cat tests/testsuite.log
@@ -356,7 +355,7 @@
mv %{buildroot}%{_datadir}/openvswitch/python/* %{buildroot}%{py_sitedir}
rmdir %{buildroot}%{_datadir}/openvswitch/python
-rm -f %buildroot/%_libdir/*.la
+find %{buildroot} -type f -name "*.la" -delete -print
# Remove unpackaged files for the dpdk case
%if %{with dpdk}
@@ -436,26 +435,26 @@
%{_libdir}/libopenvswitch.so.*
%{_libdir}/libovsdb.so.*
%{_libdir}/libsflow.so.*
-%{_mandir}/man1/ovs-benchmark.1.gz
-%{_mandir}/man1/ovsdb-client.1.gz
-%{_mandir}/man8/ovs-appctl.8.gz
-%{_mandir}/man8/ovs-bugtool.8.gz
-%{_mandir}/man8/ovs-ofctl.8.gz
-%{_mandir}/man8/ovs-vlan-bug-workaround.8.gz
-%{_mandir}/man8/ovs-parse-backtrace.8.gz
-%{_mandir}/man8/ovs-dpctl-top.8.gz
+%{_mandir}/man1/ovs-benchmark.1%{ext_man}
+%{_mandir}/man1/ovsdb-client.1%{ext_man}
+%{_mandir}/man8/ovs-appctl.8%{ext_man}
+%{_mandir}/man8/ovs-bugtool.8%{ext_man}
+%{_mandir}/man8/ovs-ofctl.8%{ext_man}
+%{_mandir}/man8/ovs-vlan-bug-workaround.8%{ext_man}
+%{_mandir}/man8/ovs-parse-backtrace.8%{ext_man}
+%{_mandir}/man8/ovs-dpctl-top.8%{ext_man}
%{_sysconfdir}/bash_completion.d/ovs-appctl-bashcomp.bash
%files pki
%defattr(-,root,root)
-%{_mandir}/man8/ovs-pki.8.gz
+%{_mandir}/man8/ovs-pki.8%{ext_man}
%{_bindir}/ovs-pki
%files vtep
%defattr(-,root,root)
%{_bindir}/vtep-ctl
-%{_mandir}/man5/vtep.5.gz
-%{_mandir}/man8/vtep-ctl.8.gz
+%{_mandir}/man5/vtep.5%{ext_man}
+%{_mandir}/man8/vtep-ctl.8%{ext_man}
%{_datadir}/openvswitch/scripts/ovs-vtep
%{_datadir}/openvswitch/vtep.ovsschema
%{_libdir}/libvtep.so.*
@@ -487,15 +486,15 @@
%{_datadir}/openvswitch/vswitch.ovsschema
%{_sysconfdir}/bash_completion.d/ovs-vsctl-bashcomp.bash
%config(noreplace) %{_sysconfdir}/logrotate.d/openvswitch-switch
-%{_mandir}/man8/ovs-dpctl.8.gz
-%{_mandir}/man1/ovs-tcpundump.1.gz
-%{_mandir}/man1/ovs-pcap.1.gz
-%{_mandir}/man8/ovs-vsctl.8.gz
-%{_mandir}/man1/ovsdb-tool.1.gz
-%{_mandir}/man8/ovs-vswitchd.8.gz
-%{_mandir}/man1/ovsdb-server.1.gz
-%{_mandir}/man5/ovs-vswitchd.conf.db.5.gz
-%{_mandir}/man8/ovs-ctl.8.gz
+%{_mandir}/man8/ovs-dpctl.8%{ext_man}
+%{_mandir}/man1/ovs-tcpundump.1%{ext_man}
+%{_mandir}/man1/ovs-pcap.1%{ext_man}
+%{_mandir}/man8/ovs-vsctl.8%{ext_man}
+%{_mandir}/man1/ovsdb-tool.1%{ext_man}
+%{_mandir}/man8/ovs-vswitchd.8%{ext_man}
+%{_mandir}/man1/ovsdb-server.1%{ext_man}
+%{_mandir}/man5/ovs-vswitchd.conf.db.5%{ext_man}
+%{_mandir}/man8/ovs-ctl.8%{ext_man}
%{_sbindir}/rcopenvswitch
%{_unitdir}/openvswitch.service
%{_localstatedir}/adm/fillup-templates/sysconfig.openvswitch
@@ -536,10 +535,10 @@
%{_bindir}/ovs-l3ping
%{_bindir}/ovs-vlan-test
%{_bindir}/ovs-testcontroller
-%{_mandir}/man8/ovs-test.8.gz
-%{_mandir}/man8/ovs-l3ping.8.gz
-%{_mandir}/man8/ovs-vlan-test.8.gz
-%{_mandir}/man8/ovs-testcontroller.8.gz
+%{_mandir}/man8/ovs-test.8%{ext_man}
+%{_mandir}/man8/ovs-l3ping.8%{ext_man}
+%{_mandir}/man8/ovs-vlan-test.8%{ext_man}
+%{_mandir}/man8/ovs-testcontroller.8%{ext_man}
%files devel
%defattr(-,root,root)
OBS-URL: https://build.opensuse.org/request/show/408658
OBS-URL: https://build.opensuse.org/package/show/network/openvswitch?expand=0&rev=99
2016-07-18 10:19:36 +02:00
|
|
|
|
# All code is Apache-2.0 except
|
|
|
|
|
# - lib/sflow* which is SISSL
|
|
|
|
|
# - utilities/bugtool which is LGPL-2.1
|
|
|
|
|
License: Apache-2.0 and LGPL-2.1 and SISSL
|
2013-03-27 13:25:19 +01:00
|
|
|
|
Group: Productivity/Networking/System
|
2016-01-13 19:17:58 +01:00
|
|
|
|
Url: http://openvswitch.org/
|
2016-06-21 14:24:21 +02:00
|
|
|
|
Source0: http://openvswitch.org/releases/openvswitch-%{version}.tar.gz
|
2013-03-27 13:25:19 +01:00
|
|
|
|
Source1: preamble
|
2016-05-19 12:13:17 +02:00
|
|
|
|
Source89: Module.supported.updates
|
2013-03-27 13:25:19 +01:00
|
|
|
|
BuildRequires: autoconf
|
|
|
|
|
BuildRequires: automake
|
2014-05-20 18:03:31 +02:00
|
|
|
|
BuildRequires: fdupes
|
2013-03-27 13:25:19 +01:00
|
|
|
|
BuildRequires: gcc
|
|
|
|
|
BuildRequires: glibc-devel
|
|
|
|
|
BuildRequires: graphviz
|
2016-07-04 23:42:42 +02:00
|
|
|
|
BuildRequires: libcap-ng-devel
|
2013-03-27 13:25:19 +01:00
|
|
|
|
BuildRequires: libtool
|
|
|
|
|
BuildRequires: make
|
|
|
|
|
BuildRequires: openssl
|
|
|
|
|
BuildRequires: perl
|
Accepting request 408658 from home:markoschandras:network
- Add missing licenses (bsc#988513)
- Misc spec file cleanups highlighted by the spec-cleaner tool.
- Allow aarch64 builds for openvswitch-dpdk
- Add missing bug references to 2.5.0 release.
old: network/openvswitch
new: home:markoschandras:network/openvswitch rev None
Index: openvswitch-dpdk.changes
===================================================================
--- openvswitch-dpdk.changes (revision 98)
+++ openvswitch-dpdk.changes (revision 46)
@@ -1,4 +1,11 @@
-------------------------------------------------------------------
+Tue Jul 12 10:41:14 UTC 2016 - mchandras@suse.de
+
+- Add missing licenses (bsc#988513)
+- Misc spec file cleanups highlighted by the spec-cleaner tool.
+- Allow aarch64 builds for openvswitch-dpdk
+
+-------------------------------------------------------------------
Mon Jul 4 12:08:06 UTC 2016 - mchandras@suse.de
- Allow the OvS daemon to run as non-root (bsc#987545)
@@ -197,6 +204,8 @@
- Added: ovn-northd.service
- TODO: Explicit DPDK support not yet added to spec.
- Spec file work and cleanup.
+- Includes fixes (or obsoletes) the following issues:
+ * bsc#948840, bsc#941466, bsc#936780, bnc#935750, bnc#867964
-------------------------------------------------------------------
Tue Mar 1 08:43:19 UTC 2016 - kmroz@suse.com
Index: openvswitch-dpdk.spec
===================================================================
--- openvswitch-dpdk.spec (revision 98)
+++ openvswitch-dpdk.spec (revision 46)
@@ -14,10 +14,9 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-
-
# needssslcertforbuild
+
# Disable building the external kernel datapath by default
%bcond_with kmp
# DPDK build disabled by default. It's enabled in the
@@ -26,14 +25,16 @@
# The testsuite is somewhat fragile for continuous testing in OBS
# but keep it here as an option
%bcond_with check
-
# Do NOT edit this auto generated file! Edit openvswitch.spec instead
# and run 'pre_checkin.sh' before committing
Name: openvswitch-dpdk
Version: 2.5.0
Release: 0
Summary: An open source, production quality, multilayer virtual switch (DPDK)
-License: Apache-2.0
+# All code is Apache-2.0 except
+# - lib/sflow* which is SISSL
+# - utilities/bugtool which is LGPL-2.1
+License: Apache-2.0 and LGPL-2.1 and SISSL
Group: Productivity/Networking/System
Url: http://openvswitch.org/
Source0: http://openvswitch.org/releases/openvswitch-%{version}.tar.gz
@@ -43,35 +44,26 @@
Source89: Module.supported.updates
# PATCH-FIX-UPSTREAM openvswitch-2.5.0-detect-dpdk-installation.patch
Patch0: openvswitch-%{version}-detect-dpdk-installation.patch
-Patch1: 0001-Remove-broken-pipe-warning-logs-from-ovsdb-server.lo.patch
+Patch1: 0001-Remove-broken-pipe-warning-logs-from-ovsdb-server.lo.patch
BuildRequires: autoconf
BuildRequires: automake
-%if %{with dpdk}
-# We need to be a bit strict with the dpdk version since
-# it's very possible for DPDK to change it's API between
-# releases. OVS currently requires 2.2.0. We may have to
-# provide multiple versions of dpdk if OVS and DPDK get
-# out of sync too often.
-BuildRequires: dpdk-devel = 2.2.0
-ExclusiveArch: x86_64 %ix86
-%endif
BuildRequires: fdupes
BuildRequires: gcc
BuildRequires: glibc-devel
BuildRequires: graphviz
BuildRequires: libcap-ng-devel
-BuildRequires: libopenssl-devel
BuildRequires: libtool
BuildRequires: make
BuildRequires: openssl
BuildRequires: perl
-BuildRequires: pkg-config
+BuildRequires: pkgconfig
# Needed by the testsuite
BuildRequires: procps
BuildRequires: python-devel
BuildRequires: python-xml
+BuildRequires: valgrind-devel
+BuildRequires: pkgconfig(openssl)
Requires: logrotate
-Requires: openssl
Requires: python
Provides: openvswitch-common = %{version}
Obsoletes: openvswitch-common < %{version}
@@ -79,10 +71,16 @@
Obsoletes: openvswitch-controller < %{version}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%py_requires
-BuildRequires: valgrind-devel
-# We can't have openvswitch and openvswitch-dpdk in parallel
%if %{with dpdk}
+# We need to be a bit strict with the dpdk version since
+# it's very possible for DPDK to change it's API between
+# releases. OVS currently requires 2.2.0. We may have to
+# provide multiple versions of dpdk if OVS and DPDK get
+# out of sync too often.
+BuildRequires: dpdk-devel = 2.2.0
+# We can't have openvswitch and openvswitch-dpdk in parallel
Conflicts: openvswitch
+ExclusiveArch: aarch64 x86_64 %{ix86}
%endif
%description
@@ -131,15 +129,15 @@
# ovs-ctl / ovs-pki use /usr/bin/uuidgen:
Requires: util-linux
Requires(post): %fillup_prereq
+Suggests: logrotate
Provides: openvswitch-any-switch = %{version}
+%{?systemd_requires}
%if %{with dpdk}
Conflicts: openvswitch-switch
%endif
-Suggests: logrotate
%if %{with kmp}
Suggests: openvswitch-kmp
%endif
-%{?systemd_requires}
%description switch
openvswitch-switch provides the userspace components and utilities for
@@ -246,7 +244,7 @@
Open vSwitch is a full-featured software-based Ethernet switch.
%prep
-%setup -n openvswitch-%{version} -q
+%setup -q -n openvswitch-%{version}
%patch0 -p1
%patch1 -p1
@@ -290,6 +288,7 @@
--disable-static \
--enable-libcapng \
--enable-shared \
+ --enable-ssl \
${dpdk_opt} \
--with-logdir=%{_localstatedir}/log/openvswitch
make %{?_smp_mflags}
@@ -301,7 +300,7 @@
# 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}" ||
+if make check TESTSUITEFLAGS="%{?_smp_mflags}" ||
make check TESTSUITEFLAGS='--recheck'; then :;
else
cat tests/testsuite.log
@@ -358,7 +357,7 @@
mv %{buildroot}%{_datadir}/openvswitch/python/* %{buildroot}%{py_sitedir}
rmdir %{buildroot}%{_datadir}/openvswitch/python
-rm -f %buildroot/%_libdir/*.la
+find %{buildroot} -type f -name "*.la" -delete -print
# Remove unpackaged files for the dpdk case
%if %{with dpdk}
@@ -438,26 +437,26 @@
%{_libdir}/libopenvswitch.so.*
%{_libdir}/libovsdb.so.*
%{_libdir}/libsflow.so.*
-%{_mandir}/man1/ovs-benchmark.1.gz
-%{_mandir}/man1/ovsdb-client.1.gz
-%{_mandir}/man8/ovs-appctl.8.gz
-%{_mandir}/man8/ovs-bugtool.8.gz
-%{_mandir}/man8/ovs-ofctl.8.gz
-%{_mandir}/man8/ovs-vlan-bug-workaround.8.gz
-%{_mandir}/man8/ovs-parse-backtrace.8.gz
-%{_mandir}/man8/ovs-dpctl-top.8.gz
+%{_mandir}/man1/ovs-benchmark.1%{ext_man}
+%{_mandir}/man1/ovsdb-client.1%{ext_man}
+%{_mandir}/man8/ovs-appctl.8%{ext_man}
+%{_mandir}/man8/ovs-bugtool.8%{ext_man}
+%{_mandir}/man8/ovs-ofctl.8%{ext_man}
+%{_mandir}/man8/ovs-vlan-bug-workaround.8%{ext_man}
+%{_mandir}/man8/ovs-parse-backtrace.8%{ext_man}
+%{_mandir}/man8/ovs-dpctl-top.8%{ext_man}
%{_sysconfdir}/bash_completion.d/ovs-appctl-bashcomp.bash
%files pki
%defattr(-,root,root)
-%{_mandir}/man8/ovs-pki.8.gz
+%{_mandir}/man8/ovs-pki.8%{ext_man}
%{_bindir}/ovs-pki
%files vtep
%defattr(-,root,root)
%{_bindir}/vtep-ctl
-%{_mandir}/man5/vtep.5.gz
-%{_mandir}/man8/vtep-ctl.8.gz
+%{_mandir}/man5/vtep.5%{ext_man}
+%{_mandir}/man8/vtep-ctl.8%{ext_man}
%{_datadir}/openvswitch/scripts/ovs-vtep
%{_datadir}/openvswitch/vtep.ovsschema
%{_libdir}/libvtep.so.*
@@ -489,15 +488,15 @@
%{_datadir}/openvswitch/vswitch.ovsschema
%{_sysconfdir}/bash_completion.d/ovs-vsctl-bashcomp.bash
%config(noreplace) %{_sysconfdir}/logrotate.d/openvswitch-switch
-%{_mandir}/man8/ovs-dpctl.8.gz
-%{_mandir}/man1/ovs-tcpundump.1.gz
-%{_mandir}/man1/ovs-pcap.1.gz
-%{_mandir}/man8/ovs-vsctl.8.gz
-%{_mandir}/man1/ovsdb-tool.1.gz
-%{_mandir}/man8/ovs-vswitchd.8.gz
-%{_mandir}/man1/ovsdb-server.1.gz
-%{_mandir}/man5/ovs-vswitchd.conf.db.5.gz
-%{_mandir}/man8/ovs-ctl.8.gz
+%{_mandir}/man8/ovs-dpctl.8%{ext_man}
+%{_mandir}/man1/ovs-tcpundump.1%{ext_man}
+%{_mandir}/man1/ovs-pcap.1%{ext_man}
+%{_mandir}/man8/ovs-vsctl.8%{ext_man}
+%{_mandir}/man1/ovsdb-tool.1%{ext_man}
+%{_mandir}/man8/ovs-vswitchd.8%{ext_man}
+%{_mandir}/man1/ovsdb-server.1%{ext_man}
+%{_mandir}/man5/ovs-vswitchd.conf.db.5%{ext_man}
+%{_mandir}/man8/ovs-ctl.8%{ext_man}
%{_sbindir}/rcopenvswitch
%{_unitdir}/openvswitch.service
%{_localstatedir}/adm/fillup-templates/sysconfig.openvswitch
@@ -538,10 +537,10 @@
%{_bindir}/ovs-l3ping
%{_bindir}/ovs-vlan-test
%{_bindir}/ovs-testcontroller
-%{_mandir}/man8/ovs-test.8.gz
-%{_mandir}/man8/ovs-l3ping.8.gz
-%{_mandir}/man8/ovs-vlan-test.8.gz
-%{_mandir}/man8/ovs-testcontroller.8.gz
+%{_mandir}/man8/ovs-test.8%{ext_man}
+%{_mandir}/man8/ovs-l3ping.8%{ext_man}
+%{_mandir}/man8/ovs-vlan-test.8%{ext_man}
+%{_mandir}/man8/ovs-testcontroller.8%{ext_man}
%files devel
%defattr(-,root,root)
Index: openvswitch.changes
===================================================================
--- openvswitch.changes (revision 98)
+++ openvswitch.changes (revision 46)
@@ -1,4 +1,11 @@
-------------------------------------------------------------------
+Tue Jul 12 10:41:14 UTC 2016 - mchandras@suse.de
+
+- Add missing licenses (bsc#988513)
+- Misc spec file cleanups highlighted by the spec-cleaner tool.
+- Allow aarch64 builds for openvswitch-dpdk
+
+-------------------------------------------------------------------
Mon Jul 4 12:08:06 UTC 2016 - mchandras@suse.de
- Allow the OvS daemon to run as non-root (bsc#987545)
@@ -197,6 +204,8 @@
- Added: ovn-northd.service
- TODO: Explicit DPDK support not yet added to spec.
- Spec file work and cleanup.
+- Includes fixes (or obsoletes) the following issues:
+ * bsc#948840, bsc#941466, bsc#936780, bnc#935750, bnc#867964
-------------------------------------------------------------------
Tue Mar 1 08:43:19 UTC 2016 - kmroz@suse.com
Index: openvswitch.spec
===================================================================
--- openvswitch.spec (revision 98)
+++ openvswitch.spec (revision 46)
@@ -14,10 +14,9 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-
-
# needssslcertforbuild
+
# Disable building the external kernel datapath by default
%bcond_with kmp
# DPDK build disabled by default. It's enabled in the
@@ -26,12 +25,14 @@
# The testsuite is somewhat fragile for continuous testing in OBS
# but keep it here as an option
%bcond_with check
-
Name: openvswitch
Version: 2.5.0
Release: 0
Summary: An open source, production quality, multilayer virtual switch
-License: Apache-2.0
+# All code is Apache-2.0 except
+# - lib/sflow* which is SISSL
+# - utilities/bugtool which is LGPL-2.1
+License: Apache-2.0 and LGPL-2.1 and SISSL
Group: Productivity/Networking/System
Url: http://openvswitch.org/
Source0: http://openvswitch.org/releases/openvswitch-%{version}.tar.gz
@@ -41,35 +42,26 @@
Source89: Module.supported.updates
# PATCH-FIX-UPSTREAM openvswitch-2.5.0-detect-dpdk-installation.patch
Patch0: openvswitch-%{version}-detect-dpdk-installation.patch
-Patch1: 0001-Remove-broken-pipe-warning-logs-from-ovsdb-server.lo.patch
+Patch1: 0001-Remove-broken-pipe-warning-logs-from-ovsdb-server.lo.patch
BuildRequires: autoconf
BuildRequires: automake
-%if %{with dpdk}
-# We need to be a bit strict with the dpdk version since
-# it's very possible for DPDK to change it's API between
-# releases. OVS currently requires 2.2.0. We may have to
-# provide multiple versions of dpdk if OVS and DPDK get
-# out of sync too often.
-BuildRequires: dpdk-devel = 2.2.0
-ExclusiveArch: x86_64 %ix86
-%endif
BuildRequires: fdupes
BuildRequires: gcc
BuildRequires: glibc-devel
BuildRequires: graphviz
BuildRequires: libcap-ng-devel
-BuildRequires: libopenssl-devel
BuildRequires: libtool
BuildRequires: make
BuildRequires: openssl
BuildRequires: perl
-BuildRequires: pkg-config
+BuildRequires: pkgconfig
# Needed by the testsuite
BuildRequires: procps
BuildRequires: python-devel
BuildRequires: python-xml
+BuildRequires: valgrind-devel
+BuildRequires: pkgconfig(openssl)
Requires: logrotate
-Requires: openssl
Requires: python
Provides: openvswitch-common = %{version}
Obsoletes: openvswitch-common < %{version}
@@ -77,10 +69,16 @@
Obsoletes: openvswitch-controller < %{version}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%py_requires
-BuildRequires: valgrind-devel
-# We can't have openvswitch and openvswitch-dpdk in parallel
%if %{with dpdk}
+# We need to be a bit strict with the dpdk version since
+# it's very possible for DPDK to change it's API between
+# releases. OVS currently requires 2.2.0. We may have to
+# provide multiple versions of dpdk if OVS and DPDK get
+# out of sync too often.
+BuildRequires: dpdk-devel = 2.2.0
+# We can't have openvswitch and openvswitch-dpdk in parallel
Conflicts: openvswitch
+ExclusiveArch: aarch64 x86_64 %{ix86}
%endif
%description
@@ -129,15 +127,15 @@
# ovs-ctl / ovs-pki use /usr/bin/uuidgen:
Requires: util-linux
Requires(post): %fillup_prereq
+Suggests: logrotate
Provides: openvswitch-any-switch = %{version}
+%{?systemd_requires}
%if %{with dpdk}
Conflicts: openvswitch-switch
%endif
-Suggests: logrotate
%if %{with kmp}
Suggests: openvswitch-kmp
%endif
-%{?systemd_requires}
%description switch
openvswitch-switch provides the userspace components and utilities for
@@ -244,7 +242,7 @@
Open vSwitch is a full-featured software-based Ethernet switch.
%prep
-%setup -n openvswitch-%{version} -q
+%setup -q -n openvswitch-%{version}
%patch0 -p1
%patch1 -p1
@@ -288,6 +286,7 @@
--disable-static \
--enable-libcapng \
--enable-shared \
+ --enable-ssl \
${dpdk_opt} \
--with-logdir=%{_localstatedir}/log/openvswitch
make %{?_smp_mflags}
@@ -299,7 +298,7 @@
# 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}" ||
+if make check TESTSUITEFLAGS="%{?_smp_mflags}" ||
make check TESTSUITEFLAGS='--recheck'; then :;
else
cat tests/testsuite.log
@@ -356,7 +355,7 @@
mv %{buildroot}%{_datadir}/openvswitch/python/* %{buildroot}%{py_sitedir}
rmdir %{buildroot}%{_datadir}/openvswitch/python
-rm -f %buildroot/%_libdir/*.la
+find %{buildroot} -type f -name "*.la" -delete -print
# Remove unpackaged files for the dpdk case
%if %{with dpdk}
@@ -436,26 +435,26 @@
%{_libdir}/libopenvswitch.so.*
%{_libdir}/libovsdb.so.*
%{_libdir}/libsflow.so.*
-%{_mandir}/man1/ovs-benchmark.1.gz
-%{_mandir}/man1/ovsdb-client.1.gz
-%{_mandir}/man8/ovs-appctl.8.gz
-%{_mandir}/man8/ovs-bugtool.8.gz
-%{_mandir}/man8/ovs-ofctl.8.gz
-%{_mandir}/man8/ovs-vlan-bug-workaround.8.gz
-%{_mandir}/man8/ovs-parse-backtrace.8.gz
-%{_mandir}/man8/ovs-dpctl-top.8.gz
+%{_mandir}/man1/ovs-benchmark.1%{ext_man}
+%{_mandir}/man1/ovsdb-client.1%{ext_man}
+%{_mandir}/man8/ovs-appctl.8%{ext_man}
+%{_mandir}/man8/ovs-bugtool.8%{ext_man}
+%{_mandir}/man8/ovs-ofctl.8%{ext_man}
+%{_mandir}/man8/ovs-vlan-bug-workaround.8%{ext_man}
+%{_mandir}/man8/ovs-parse-backtrace.8%{ext_man}
+%{_mandir}/man8/ovs-dpctl-top.8%{ext_man}
%{_sysconfdir}/bash_completion.d/ovs-appctl-bashcomp.bash
%files pki
%defattr(-,root,root)
-%{_mandir}/man8/ovs-pki.8.gz
+%{_mandir}/man8/ovs-pki.8%{ext_man}
%{_bindir}/ovs-pki
%files vtep
%defattr(-,root,root)
%{_bindir}/vtep-ctl
-%{_mandir}/man5/vtep.5.gz
-%{_mandir}/man8/vtep-ctl.8.gz
+%{_mandir}/man5/vtep.5%{ext_man}
+%{_mandir}/man8/vtep-ctl.8%{ext_man}
%{_datadir}/openvswitch/scripts/ovs-vtep
%{_datadir}/openvswitch/vtep.ovsschema
%{_libdir}/libvtep.so.*
@@ -487,15 +486,15 @@
%{_datadir}/openvswitch/vswitch.ovsschema
%{_sysconfdir}/bash_completion.d/ovs-vsctl-bashcomp.bash
%config(noreplace) %{_sysconfdir}/logrotate.d/openvswitch-switch
-%{_mandir}/man8/ovs-dpctl.8.gz
-%{_mandir}/man1/ovs-tcpundump.1.gz
-%{_mandir}/man1/ovs-pcap.1.gz
-%{_mandir}/man8/ovs-vsctl.8.gz
-%{_mandir}/man1/ovsdb-tool.1.gz
-%{_mandir}/man8/ovs-vswitchd.8.gz
-%{_mandir}/man1/ovsdb-server.1.gz
-%{_mandir}/man5/ovs-vswitchd.conf.db.5.gz
-%{_mandir}/man8/ovs-ctl.8.gz
+%{_mandir}/man8/ovs-dpctl.8%{ext_man}
+%{_mandir}/man1/ovs-tcpundump.1%{ext_man}
+%{_mandir}/man1/ovs-pcap.1%{ext_man}
+%{_mandir}/man8/ovs-vsctl.8%{ext_man}
+%{_mandir}/man1/ovsdb-tool.1%{ext_man}
+%{_mandir}/man8/ovs-vswitchd.8%{ext_man}
+%{_mandir}/man1/ovsdb-server.1%{ext_man}
+%{_mandir}/man5/ovs-vswitchd.conf.db.5%{ext_man}
+%{_mandir}/man8/ovs-ctl.8%{ext_man}
%{_sbindir}/rcopenvswitch
%{_unitdir}/openvswitch.service
%{_localstatedir}/adm/fillup-templates/sysconfig.openvswitch
@@ -536,10 +535,10 @@
%{_bindir}/ovs-l3ping
%{_bindir}/ovs-vlan-test
%{_bindir}/ovs-testcontroller
-%{_mandir}/man8/ovs-test.8.gz
-%{_mandir}/man8/ovs-l3ping.8.gz
-%{_mandir}/man8/ovs-vlan-test.8.gz
-%{_mandir}/man8/ovs-testcontroller.8.gz
+%{_mandir}/man8/ovs-test.8%{ext_man}
+%{_mandir}/man8/ovs-l3ping.8%{ext_man}
+%{_mandir}/man8/ovs-vlan-test.8%{ext_man}
+%{_mandir}/man8/ovs-testcontroller.8%{ext_man}
%files devel
%defattr(-,root,root)
OBS-URL: https://build.opensuse.org/request/show/408658
OBS-URL: https://build.opensuse.org/package/show/network/openvswitch?expand=0&rev=99
2016-07-18 10:19:36 +02:00
|
|
|
|
BuildRequires: pkgconfig
|
2016-06-21 14:24:21 +02:00
|
|
|
|
# Needed by the testsuite
|
|
|
|
|
BuildRequires: procps
|
2013-03-27 13:25:19 +01:00
|
|
|
|
BuildRequires: python-devel
|
2016-10-07 15:07:43 +02:00
|
|
|
|
BuildRequires: python-six
|
2014-05-20 18:03:31 +02:00
|
|
|
|
BuildRequires: python-xml
|
Accepting request 408658 from home:markoschandras:network
- Add missing licenses (bsc#988513)
- Misc spec file cleanups highlighted by the spec-cleaner tool.
- Allow aarch64 builds for openvswitch-dpdk
- Add missing bug references to 2.5.0 release.
old: network/openvswitch
new: home:markoschandras:network/openvswitch rev None
Index: openvswitch-dpdk.changes
===================================================================
--- openvswitch-dpdk.changes (revision 98)
+++ openvswitch-dpdk.changes (revision 46)
@@ -1,4 +1,11 @@
-------------------------------------------------------------------
+Tue Jul 12 10:41:14 UTC 2016 - mchandras@suse.de
+
+- Add missing licenses (bsc#988513)
+- Misc spec file cleanups highlighted by the spec-cleaner tool.
+- Allow aarch64 builds for openvswitch-dpdk
+
+-------------------------------------------------------------------
Mon Jul 4 12:08:06 UTC 2016 - mchandras@suse.de
- Allow the OvS daemon to run as non-root (bsc#987545)
@@ -197,6 +204,8 @@
- Added: ovn-northd.service
- TODO: Explicit DPDK support not yet added to spec.
- Spec file work and cleanup.
+- Includes fixes (or obsoletes) the following issues:
+ * bsc#948840, bsc#941466, bsc#936780, bnc#935750, bnc#867964
-------------------------------------------------------------------
Tue Mar 1 08:43:19 UTC 2016 - kmroz@suse.com
Index: openvswitch-dpdk.spec
===================================================================
--- openvswitch-dpdk.spec (revision 98)
+++ openvswitch-dpdk.spec (revision 46)
@@ -14,10 +14,9 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-
-
# needssslcertforbuild
+
# Disable building the external kernel datapath by default
%bcond_with kmp
# DPDK build disabled by default. It's enabled in the
@@ -26,14 +25,16 @@
# The testsuite is somewhat fragile for continuous testing in OBS
# but keep it here as an option
%bcond_with check
-
# Do NOT edit this auto generated file! Edit openvswitch.spec instead
# and run 'pre_checkin.sh' before committing
Name: openvswitch-dpdk
Version: 2.5.0
Release: 0
Summary: An open source, production quality, multilayer virtual switch (DPDK)
-License: Apache-2.0
+# All code is Apache-2.0 except
+# - lib/sflow* which is SISSL
+# - utilities/bugtool which is LGPL-2.1
+License: Apache-2.0 and LGPL-2.1 and SISSL
Group: Productivity/Networking/System
Url: http://openvswitch.org/
Source0: http://openvswitch.org/releases/openvswitch-%{version}.tar.gz
@@ -43,35 +44,26 @@
Source89: Module.supported.updates
# PATCH-FIX-UPSTREAM openvswitch-2.5.0-detect-dpdk-installation.patch
Patch0: openvswitch-%{version}-detect-dpdk-installation.patch
-Patch1: 0001-Remove-broken-pipe-warning-logs-from-ovsdb-server.lo.patch
+Patch1: 0001-Remove-broken-pipe-warning-logs-from-ovsdb-server.lo.patch
BuildRequires: autoconf
BuildRequires: automake
-%if %{with dpdk}
-# We need to be a bit strict with the dpdk version since
-# it's very possible for DPDK to change it's API between
-# releases. OVS currently requires 2.2.0. We may have to
-# provide multiple versions of dpdk if OVS and DPDK get
-# out of sync too often.
-BuildRequires: dpdk-devel = 2.2.0
-ExclusiveArch: x86_64 %ix86
-%endif
BuildRequires: fdupes
BuildRequires: gcc
BuildRequires: glibc-devel
BuildRequires: graphviz
BuildRequires: libcap-ng-devel
-BuildRequires: libopenssl-devel
BuildRequires: libtool
BuildRequires: make
BuildRequires: openssl
BuildRequires: perl
-BuildRequires: pkg-config
+BuildRequires: pkgconfig
# Needed by the testsuite
BuildRequires: procps
BuildRequires: python-devel
BuildRequires: python-xml
+BuildRequires: valgrind-devel
+BuildRequires: pkgconfig(openssl)
Requires: logrotate
-Requires: openssl
Requires: python
Provides: openvswitch-common = %{version}
Obsoletes: openvswitch-common < %{version}
@@ -79,10 +71,16 @@
Obsoletes: openvswitch-controller < %{version}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%py_requires
-BuildRequires: valgrind-devel
-# We can't have openvswitch and openvswitch-dpdk in parallel
%if %{with dpdk}
+# We need to be a bit strict with the dpdk version since
+# it's very possible for DPDK to change it's API between
+# releases. OVS currently requires 2.2.0. We may have to
+# provide multiple versions of dpdk if OVS and DPDK get
+# out of sync too often.
+BuildRequires: dpdk-devel = 2.2.0
+# We can't have openvswitch and openvswitch-dpdk in parallel
Conflicts: openvswitch
+ExclusiveArch: aarch64 x86_64 %{ix86}
%endif
%description
@@ -131,15 +129,15 @@
# ovs-ctl / ovs-pki use /usr/bin/uuidgen:
Requires: util-linux
Requires(post): %fillup_prereq
+Suggests: logrotate
Provides: openvswitch-any-switch = %{version}
+%{?systemd_requires}
%if %{with dpdk}
Conflicts: openvswitch-switch
%endif
-Suggests: logrotate
%if %{with kmp}
Suggests: openvswitch-kmp
%endif
-%{?systemd_requires}
%description switch
openvswitch-switch provides the userspace components and utilities for
@@ -246,7 +244,7 @@
Open vSwitch is a full-featured software-based Ethernet switch.
%prep
-%setup -n openvswitch-%{version} -q
+%setup -q -n openvswitch-%{version}
%patch0 -p1
%patch1 -p1
@@ -290,6 +288,7 @@
--disable-static \
--enable-libcapng \
--enable-shared \
+ --enable-ssl \
${dpdk_opt} \
--with-logdir=%{_localstatedir}/log/openvswitch
make %{?_smp_mflags}
@@ -301,7 +300,7 @@
# 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}" ||
+if make check TESTSUITEFLAGS="%{?_smp_mflags}" ||
make check TESTSUITEFLAGS='--recheck'; then :;
else
cat tests/testsuite.log
@@ -358,7 +357,7 @@
mv %{buildroot}%{_datadir}/openvswitch/python/* %{buildroot}%{py_sitedir}
rmdir %{buildroot}%{_datadir}/openvswitch/python
-rm -f %buildroot/%_libdir/*.la
+find %{buildroot} -type f -name "*.la" -delete -print
# Remove unpackaged files for the dpdk case
%if %{with dpdk}
@@ -438,26 +437,26 @@
%{_libdir}/libopenvswitch.so.*
%{_libdir}/libovsdb.so.*
%{_libdir}/libsflow.so.*
-%{_mandir}/man1/ovs-benchmark.1.gz
-%{_mandir}/man1/ovsdb-client.1.gz
-%{_mandir}/man8/ovs-appctl.8.gz
-%{_mandir}/man8/ovs-bugtool.8.gz
-%{_mandir}/man8/ovs-ofctl.8.gz
-%{_mandir}/man8/ovs-vlan-bug-workaround.8.gz
-%{_mandir}/man8/ovs-parse-backtrace.8.gz
-%{_mandir}/man8/ovs-dpctl-top.8.gz
+%{_mandir}/man1/ovs-benchmark.1%{ext_man}
+%{_mandir}/man1/ovsdb-client.1%{ext_man}
+%{_mandir}/man8/ovs-appctl.8%{ext_man}
+%{_mandir}/man8/ovs-bugtool.8%{ext_man}
+%{_mandir}/man8/ovs-ofctl.8%{ext_man}
+%{_mandir}/man8/ovs-vlan-bug-workaround.8%{ext_man}
+%{_mandir}/man8/ovs-parse-backtrace.8%{ext_man}
+%{_mandir}/man8/ovs-dpctl-top.8%{ext_man}
%{_sysconfdir}/bash_completion.d/ovs-appctl-bashcomp.bash
%files pki
%defattr(-,root,root)
-%{_mandir}/man8/ovs-pki.8.gz
+%{_mandir}/man8/ovs-pki.8%{ext_man}
%{_bindir}/ovs-pki
%files vtep
%defattr(-,root,root)
%{_bindir}/vtep-ctl
-%{_mandir}/man5/vtep.5.gz
-%{_mandir}/man8/vtep-ctl.8.gz
+%{_mandir}/man5/vtep.5%{ext_man}
+%{_mandir}/man8/vtep-ctl.8%{ext_man}
%{_datadir}/openvswitch/scripts/ovs-vtep
%{_datadir}/openvswitch/vtep.ovsschema
%{_libdir}/libvtep.so.*
@@ -489,15 +488,15 @@
%{_datadir}/openvswitch/vswitch.ovsschema
%{_sysconfdir}/bash_completion.d/ovs-vsctl-bashcomp.bash
%config(noreplace) %{_sysconfdir}/logrotate.d/openvswitch-switch
-%{_mandir}/man8/ovs-dpctl.8.gz
-%{_mandir}/man1/ovs-tcpundump.1.gz
-%{_mandir}/man1/ovs-pcap.1.gz
-%{_mandir}/man8/ovs-vsctl.8.gz
-%{_mandir}/man1/ovsdb-tool.1.gz
-%{_mandir}/man8/ovs-vswitchd.8.gz
-%{_mandir}/man1/ovsdb-server.1.gz
-%{_mandir}/man5/ovs-vswitchd.conf.db.5.gz
-%{_mandir}/man8/ovs-ctl.8.gz
+%{_mandir}/man8/ovs-dpctl.8%{ext_man}
+%{_mandir}/man1/ovs-tcpundump.1%{ext_man}
+%{_mandir}/man1/ovs-pcap.1%{ext_man}
+%{_mandir}/man8/ovs-vsctl.8%{ext_man}
+%{_mandir}/man1/ovsdb-tool.1%{ext_man}
+%{_mandir}/man8/ovs-vswitchd.8%{ext_man}
+%{_mandir}/man1/ovsdb-server.1%{ext_man}
+%{_mandir}/man5/ovs-vswitchd.conf.db.5%{ext_man}
+%{_mandir}/man8/ovs-ctl.8%{ext_man}
%{_sbindir}/rcopenvswitch
%{_unitdir}/openvswitch.service
%{_localstatedir}/adm/fillup-templates/sysconfig.openvswitch
@@ -538,10 +537,10 @@
%{_bindir}/ovs-l3ping
%{_bindir}/ovs-vlan-test
%{_bindir}/ovs-testcontroller
-%{_mandir}/man8/ovs-test.8.gz
-%{_mandir}/man8/ovs-l3ping.8.gz
-%{_mandir}/man8/ovs-vlan-test.8.gz
-%{_mandir}/man8/ovs-testcontroller.8.gz
+%{_mandir}/man8/ovs-test.8%{ext_man}
+%{_mandir}/man8/ovs-l3ping.8%{ext_man}
+%{_mandir}/man8/ovs-vlan-test.8%{ext_man}
+%{_mandir}/man8/ovs-testcontroller.8%{ext_man}
%files devel
%defattr(-,root,root)
Index: openvswitch.changes
===================================================================
--- openvswitch.changes (revision 98)
+++ openvswitch.changes (revision 46)
@@ -1,4 +1,11 @@
-------------------------------------------------------------------
+Tue Jul 12 10:41:14 UTC 2016 - mchandras@suse.de
+
+- Add missing licenses (bsc#988513)
+- Misc spec file cleanups highlighted by the spec-cleaner tool.
+- Allow aarch64 builds for openvswitch-dpdk
+
+-------------------------------------------------------------------
Mon Jul 4 12:08:06 UTC 2016 - mchandras@suse.de
- Allow the OvS daemon to run as non-root (bsc#987545)
@@ -197,6 +204,8 @@
- Added: ovn-northd.service
- TODO: Explicit DPDK support not yet added to spec.
- Spec file work and cleanup.
+- Includes fixes (or obsoletes) the following issues:
+ * bsc#948840, bsc#941466, bsc#936780, bnc#935750, bnc#867964
-------------------------------------------------------------------
Tue Mar 1 08:43:19 UTC 2016 - kmroz@suse.com
Index: openvswitch.spec
===================================================================
--- openvswitch.spec (revision 98)
+++ openvswitch.spec (revision 46)
@@ -14,10 +14,9 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-
-
# needssslcertforbuild
+
# Disable building the external kernel datapath by default
%bcond_with kmp
# DPDK build disabled by default. It's enabled in the
@@ -26,12 +25,14 @@
# The testsuite is somewhat fragile for continuous testing in OBS
# but keep it here as an option
%bcond_with check
-
Name: openvswitch
Version: 2.5.0
Release: 0
Summary: An open source, production quality, multilayer virtual switch
-License: Apache-2.0
+# All code is Apache-2.0 except
+# - lib/sflow* which is SISSL
+# - utilities/bugtool which is LGPL-2.1
+License: Apache-2.0 and LGPL-2.1 and SISSL
Group: Productivity/Networking/System
Url: http://openvswitch.org/
Source0: http://openvswitch.org/releases/openvswitch-%{version}.tar.gz
@@ -41,35 +42,26 @@
Source89: Module.supported.updates
# PATCH-FIX-UPSTREAM openvswitch-2.5.0-detect-dpdk-installation.patch
Patch0: openvswitch-%{version}-detect-dpdk-installation.patch
-Patch1: 0001-Remove-broken-pipe-warning-logs-from-ovsdb-server.lo.patch
+Patch1: 0001-Remove-broken-pipe-warning-logs-from-ovsdb-server.lo.patch
BuildRequires: autoconf
BuildRequires: automake
-%if %{with dpdk}
-# We need to be a bit strict with the dpdk version since
-# it's very possible for DPDK to change it's API between
-# releases. OVS currently requires 2.2.0. We may have to
-# provide multiple versions of dpdk if OVS and DPDK get
-# out of sync too often.
-BuildRequires: dpdk-devel = 2.2.0
-ExclusiveArch: x86_64 %ix86
-%endif
BuildRequires: fdupes
BuildRequires: gcc
BuildRequires: glibc-devel
BuildRequires: graphviz
BuildRequires: libcap-ng-devel
-BuildRequires: libopenssl-devel
BuildRequires: libtool
BuildRequires: make
BuildRequires: openssl
BuildRequires: perl
-BuildRequires: pkg-config
+BuildRequires: pkgconfig
# Needed by the testsuite
BuildRequires: procps
BuildRequires: python-devel
BuildRequires: python-xml
+BuildRequires: valgrind-devel
+BuildRequires: pkgconfig(openssl)
Requires: logrotate
-Requires: openssl
Requires: python
Provides: openvswitch-common = %{version}
Obsoletes: openvswitch-common < %{version}
@@ -77,10 +69,16 @@
Obsoletes: openvswitch-controller < %{version}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%py_requires
-BuildRequires: valgrind-devel
-# We can't have openvswitch and openvswitch-dpdk in parallel
%if %{with dpdk}
+# We need to be a bit strict with the dpdk version since
+# it's very possible for DPDK to change it's API between
+# releases. OVS currently requires 2.2.0. We may have to
+# provide multiple versions of dpdk if OVS and DPDK get
+# out of sync too often.
+BuildRequires: dpdk-devel = 2.2.0
+# We can't have openvswitch and openvswitch-dpdk in parallel
Conflicts: openvswitch
+ExclusiveArch: aarch64 x86_64 %{ix86}
%endif
%description
@@ -129,15 +127,15 @@
# ovs-ctl / ovs-pki use /usr/bin/uuidgen:
Requires: util-linux
Requires(post): %fillup_prereq
+Suggests: logrotate
Provides: openvswitch-any-switch = %{version}
+%{?systemd_requires}
%if %{with dpdk}
Conflicts: openvswitch-switch
%endif
-Suggests: logrotate
%if %{with kmp}
Suggests: openvswitch-kmp
%endif
-%{?systemd_requires}
%description switch
openvswitch-switch provides the userspace components and utilities for
@@ -244,7 +242,7 @@
Open vSwitch is a full-featured software-based Ethernet switch.
%prep
-%setup -n openvswitch-%{version} -q
+%setup -q -n openvswitch-%{version}
%patch0 -p1
%patch1 -p1
@@ -288,6 +286,7 @@
--disable-static \
--enable-libcapng \
--enable-shared \
+ --enable-ssl \
${dpdk_opt} \
--with-logdir=%{_localstatedir}/log/openvswitch
make %{?_smp_mflags}
@@ -299,7 +298,7 @@
# 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}" ||
+if make check TESTSUITEFLAGS="%{?_smp_mflags}" ||
make check TESTSUITEFLAGS='--recheck'; then :;
else
cat tests/testsuite.log
@@ -356,7 +355,7 @@
mv %{buildroot}%{_datadir}/openvswitch/python/* %{buildroot}%{py_sitedir}
rmdir %{buildroot}%{_datadir}/openvswitch/python
-rm -f %buildroot/%_libdir/*.la
+find %{buildroot} -type f -name "*.la" -delete -print
# Remove unpackaged files for the dpdk case
%if %{with dpdk}
@@ -436,26 +435,26 @@
%{_libdir}/libopenvswitch.so.*
%{_libdir}/libovsdb.so.*
%{_libdir}/libsflow.so.*
-%{_mandir}/man1/ovs-benchmark.1.gz
-%{_mandir}/man1/ovsdb-client.1.gz
-%{_mandir}/man8/ovs-appctl.8.gz
-%{_mandir}/man8/ovs-bugtool.8.gz
-%{_mandir}/man8/ovs-ofctl.8.gz
-%{_mandir}/man8/ovs-vlan-bug-workaround.8.gz
-%{_mandir}/man8/ovs-parse-backtrace.8.gz
-%{_mandir}/man8/ovs-dpctl-top.8.gz
+%{_mandir}/man1/ovs-benchmark.1%{ext_man}
+%{_mandir}/man1/ovsdb-client.1%{ext_man}
+%{_mandir}/man8/ovs-appctl.8%{ext_man}
+%{_mandir}/man8/ovs-bugtool.8%{ext_man}
+%{_mandir}/man8/ovs-ofctl.8%{ext_man}
+%{_mandir}/man8/ovs-vlan-bug-workaround.8%{ext_man}
+%{_mandir}/man8/ovs-parse-backtrace.8%{ext_man}
+%{_mandir}/man8/ovs-dpctl-top.8%{ext_man}
%{_sysconfdir}/bash_completion.d/ovs-appctl-bashcomp.bash
%files pki
%defattr(-,root,root)
-%{_mandir}/man8/ovs-pki.8.gz
+%{_mandir}/man8/ovs-pki.8%{ext_man}
%{_bindir}/ovs-pki
%files vtep
%defattr(-,root,root)
%{_bindir}/vtep-ctl
-%{_mandir}/man5/vtep.5.gz
-%{_mandir}/man8/vtep-ctl.8.gz
+%{_mandir}/man5/vtep.5%{ext_man}
+%{_mandir}/man8/vtep-ctl.8%{ext_man}
%{_datadir}/openvswitch/scripts/ovs-vtep
%{_datadir}/openvswitch/vtep.ovsschema
%{_libdir}/libvtep.so.*
@@ -487,15 +486,15 @@
%{_datadir}/openvswitch/vswitch.ovsschema
%{_sysconfdir}/bash_completion.d/ovs-vsctl-bashcomp.bash
%config(noreplace) %{_sysconfdir}/logrotate.d/openvswitch-switch
-%{_mandir}/man8/ovs-dpctl.8.gz
-%{_mandir}/man1/ovs-tcpundump.1.gz
-%{_mandir}/man1/ovs-pcap.1.gz
-%{_mandir}/man8/ovs-vsctl.8.gz
-%{_mandir}/man1/ovsdb-tool.1.gz
-%{_mandir}/man8/ovs-vswitchd.8.gz
-%{_mandir}/man1/ovsdb-server.1.gz
-%{_mandir}/man5/ovs-vswitchd.conf.db.5.gz
-%{_mandir}/man8/ovs-ctl.8.gz
+%{_mandir}/man8/ovs-dpctl.8%{ext_man}
+%{_mandir}/man1/ovs-tcpundump.1%{ext_man}
+%{_mandir}/man1/ovs-pcap.1%{ext_man}
+%{_mandir}/man8/ovs-vsctl.8%{ext_man}
+%{_mandir}/man1/ovsdb-tool.1%{ext_man}
+%{_mandir}/man8/ovs-vswitchd.8%{ext_man}
+%{_mandir}/man1/ovsdb-server.1%{ext_man}
+%{_mandir}/man5/ovs-vswitchd.conf.db.5%{ext_man}
+%{_mandir}/man8/ovs-ctl.8%{ext_man}
%{_sbindir}/rcopenvswitch
%{_unitdir}/openvswitch.service
%{_localstatedir}/adm/fillup-templates/sysconfig.openvswitch
@@ -536,10 +535,10 @@
%{_bindir}/ovs-l3ping
%{_bindir}/ovs-vlan-test
%{_bindir}/ovs-testcontroller
-%{_mandir}/man8/ovs-test.8.gz
-%{_mandir}/man8/ovs-l3ping.8.gz
-%{_mandir}/man8/ovs-vlan-test.8.gz
-%{_mandir}/man8/ovs-testcontroller.8.gz
+%{_mandir}/man8/ovs-test.8%{ext_man}
+%{_mandir}/man8/ovs-l3ping.8%{ext_man}
+%{_mandir}/man8/ovs-vlan-test.8%{ext_man}
+%{_mandir}/man8/ovs-testcontroller.8%{ext_man}
%files devel
%defattr(-,root,root)
OBS-URL: https://build.opensuse.org/request/show/408658
OBS-URL: https://build.opensuse.org/package/show/network/openvswitch?expand=0&rev=99
2016-07-18 10:19:36 +02:00
|
|
|
|
BuildRequires: valgrind-devel
|
|
|
|
|
BuildRequires: pkgconfig(openssl)
|
2013-03-27 13:25:19 +01:00
|
|
|
|
Requires: logrotate
|
|
|
|
|
Requires: python
|
|
|
|
|
Provides: openvswitch-common = %{version}
|
2013-04-09 16:39:09 +02:00
|
|
|
|
Obsoletes: openvswitch-common < %{version}
|
2014-05-20 18:03:31 +02:00
|
|
|
|
Provides: openvswitch-controller = %{version}
|
|
|
|
|
Obsoletes: openvswitch-controller < %{version}
|
2011-05-20 21:19:18 +02:00
|
|
|
|
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
2013-03-27 13:25:19 +01:00
|
|
|
|
%py_requires
|
2016-07-05 11:13:42 +02:00
|
|
|
|
%if %{with dpdk}
|
Accepting request 408658 from home:markoschandras:network
- Add missing licenses (bsc#988513)
- Misc spec file cleanups highlighted by the spec-cleaner tool.
- Allow aarch64 builds for openvswitch-dpdk
- Add missing bug references to 2.5.0 release.
old: network/openvswitch
new: home:markoschandras:network/openvswitch rev None
Index: openvswitch-dpdk.changes
===================================================================
--- openvswitch-dpdk.changes (revision 98)
+++ openvswitch-dpdk.changes (revision 46)
@@ -1,4 +1,11 @@
-------------------------------------------------------------------
+Tue Jul 12 10:41:14 UTC 2016 - mchandras@suse.de
+
+- Add missing licenses (bsc#988513)
+- Misc spec file cleanups highlighted by the spec-cleaner tool.
+- Allow aarch64 builds for openvswitch-dpdk
+
+-------------------------------------------------------------------
Mon Jul 4 12:08:06 UTC 2016 - mchandras@suse.de
- Allow the OvS daemon to run as non-root (bsc#987545)
@@ -197,6 +204,8 @@
- Added: ovn-northd.service
- TODO: Explicit DPDK support not yet added to spec.
- Spec file work and cleanup.
+- Includes fixes (or obsoletes) the following issues:
+ * bsc#948840, bsc#941466, bsc#936780, bnc#935750, bnc#867964
-------------------------------------------------------------------
Tue Mar 1 08:43:19 UTC 2016 - kmroz@suse.com
Index: openvswitch-dpdk.spec
===================================================================
--- openvswitch-dpdk.spec (revision 98)
+++ openvswitch-dpdk.spec (revision 46)
@@ -14,10 +14,9 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-
-
# needssslcertforbuild
+
# Disable building the external kernel datapath by default
%bcond_with kmp
# DPDK build disabled by default. It's enabled in the
@@ -26,14 +25,16 @@
# The testsuite is somewhat fragile for continuous testing in OBS
# but keep it here as an option
%bcond_with check
-
# Do NOT edit this auto generated file! Edit openvswitch.spec instead
# and run 'pre_checkin.sh' before committing
Name: openvswitch-dpdk
Version: 2.5.0
Release: 0
Summary: An open source, production quality, multilayer virtual switch (DPDK)
-License: Apache-2.0
+# All code is Apache-2.0 except
+# - lib/sflow* which is SISSL
+# - utilities/bugtool which is LGPL-2.1
+License: Apache-2.0 and LGPL-2.1 and SISSL
Group: Productivity/Networking/System
Url: http://openvswitch.org/
Source0: http://openvswitch.org/releases/openvswitch-%{version}.tar.gz
@@ -43,35 +44,26 @@
Source89: Module.supported.updates
# PATCH-FIX-UPSTREAM openvswitch-2.5.0-detect-dpdk-installation.patch
Patch0: openvswitch-%{version}-detect-dpdk-installation.patch
-Patch1: 0001-Remove-broken-pipe-warning-logs-from-ovsdb-server.lo.patch
+Patch1: 0001-Remove-broken-pipe-warning-logs-from-ovsdb-server.lo.patch
BuildRequires: autoconf
BuildRequires: automake
-%if %{with dpdk}
-# We need to be a bit strict with the dpdk version since
-# it's very possible for DPDK to change it's API between
-# releases. OVS currently requires 2.2.0. We may have to
-# provide multiple versions of dpdk if OVS and DPDK get
-# out of sync too often.
-BuildRequires: dpdk-devel = 2.2.0
-ExclusiveArch: x86_64 %ix86
-%endif
BuildRequires: fdupes
BuildRequires: gcc
BuildRequires: glibc-devel
BuildRequires: graphviz
BuildRequires: libcap-ng-devel
-BuildRequires: libopenssl-devel
BuildRequires: libtool
BuildRequires: make
BuildRequires: openssl
BuildRequires: perl
-BuildRequires: pkg-config
+BuildRequires: pkgconfig
# Needed by the testsuite
BuildRequires: procps
BuildRequires: python-devel
BuildRequires: python-xml
+BuildRequires: valgrind-devel
+BuildRequires: pkgconfig(openssl)
Requires: logrotate
-Requires: openssl
Requires: python
Provides: openvswitch-common = %{version}
Obsoletes: openvswitch-common < %{version}
@@ -79,10 +71,16 @@
Obsoletes: openvswitch-controller < %{version}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%py_requires
-BuildRequires: valgrind-devel
-# We can't have openvswitch and openvswitch-dpdk in parallel
%if %{with dpdk}
+# We need to be a bit strict with the dpdk version since
+# it's very possible for DPDK to change it's API between
+# releases. OVS currently requires 2.2.0. We may have to
+# provide multiple versions of dpdk if OVS and DPDK get
+# out of sync too often.
+BuildRequires: dpdk-devel = 2.2.0
+# We can't have openvswitch and openvswitch-dpdk in parallel
Conflicts: openvswitch
+ExclusiveArch: aarch64 x86_64 %{ix86}
%endif
%description
@@ -131,15 +129,15 @@
# ovs-ctl / ovs-pki use /usr/bin/uuidgen:
Requires: util-linux
Requires(post): %fillup_prereq
+Suggests: logrotate
Provides: openvswitch-any-switch = %{version}
+%{?systemd_requires}
%if %{with dpdk}
Conflicts: openvswitch-switch
%endif
-Suggests: logrotate
%if %{with kmp}
Suggests: openvswitch-kmp
%endif
-%{?systemd_requires}
%description switch
openvswitch-switch provides the userspace components and utilities for
@@ -246,7 +244,7 @@
Open vSwitch is a full-featured software-based Ethernet switch.
%prep
-%setup -n openvswitch-%{version} -q
+%setup -q -n openvswitch-%{version}
%patch0 -p1
%patch1 -p1
@@ -290,6 +288,7 @@
--disable-static \
--enable-libcapng \
--enable-shared \
+ --enable-ssl \
${dpdk_opt} \
--with-logdir=%{_localstatedir}/log/openvswitch
make %{?_smp_mflags}
@@ -301,7 +300,7 @@
# 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}" ||
+if make check TESTSUITEFLAGS="%{?_smp_mflags}" ||
make check TESTSUITEFLAGS='--recheck'; then :;
else
cat tests/testsuite.log
@@ -358,7 +357,7 @@
mv %{buildroot}%{_datadir}/openvswitch/python/* %{buildroot}%{py_sitedir}
rmdir %{buildroot}%{_datadir}/openvswitch/python
-rm -f %buildroot/%_libdir/*.la
+find %{buildroot} -type f -name "*.la" -delete -print
# Remove unpackaged files for the dpdk case
%if %{with dpdk}
@@ -438,26 +437,26 @@
%{_libdir}/libopenvswitch.so.*
%{_libdir}/libovsdb.so.*
%{_libdir}/libsflow.so.*
-%{_mandir}/man1/ovs-benchmark.1.gz
-%{_mandir}/man1/ovsdb-client.1.gz
-%{_mandir}/man8/ovs-appctl.8.gz
-%{_mandir}/man8/ovs-bugtool.8.gz
-%{_mandir}/man8/ovs-ofctl.8.gz
-%{_mandir}/man8/ovs-vlan-bug-workaround.8.gz
-%{_mandir}/man8/ovs-parse-backtrace.8.gz
-%{_mandir}/man8/ovs-dpctl-top.8.gz
+%{_mandir}/man1/ovs-benchmark.1%{ext_man}
+%{_mandir}/man1/ovsdb-client.1%{ext_man}
+%{_mandir}/man8/ovs-appctl.8%{ext_man}
+%{_mandir}/man8/ovs-bugtool.8%{ext_man}
+%{_mandir}/man8/ovs-ofctl.8%{ext_man}
+%{_mandir}/man8/ovs-vlan-bug-workaround.8%{ext_man}
+%{_mandir}/man8/ovs-parse-backtrace.8%{ext_man}
+%{_mandir}/man8/ovs-dpctl-top.8%{ext_man}
%{_sysconfdir}/bash_completion.d/ovs-appctl-bashcomp.bash
%files pki
%defattr(-,root,root)
-%{_mandir}/man8/ovs-pki.8.gz
+%{_mandir}/man8/ovs-pki.8%{ext_man}
%{_bindir}/ovs-pki
%files vtep
%defattr(-,root,root)
%{_bindir}/vtep-ctl
-%{_mandir}/man5/vtep.5.gz
-%{_mandir}/man8/vtep-ctl.8.gz
+%{_mandir}/man5/vtep.5%{ext_man}
+%{_mandir}/man8/vtep-ctl.8%{ext_man}
%{_datadir}/openvswitch/scripts/ovs-vtep
%{_datadir}/openvswitch/vtep.ovsschema
%{_libdir}/libvtep.so.*
@@ -489,15 +488,15 @@
%{_datadir}/openvswitch/vswitch.ovsschema
%{_sysconfdir}/bash_completion.d/ovs-vsctl-bashcomp.bash
%config(noreplace) %{_sysconfdir}/logrotate.d/openvswitch-switch
-%{_mandir}/man8/ovs-dpctl.8.gz
-%{_mandir}/man1/ovs-tcpundump.1.gz
-%{_mandir}/man1/ovs-pcap.1.gz
-%{_mandir}/man8/ovs-vsctl.8.gz
-%{_mandir}/man1/ovsdb-tool.1.gz
-%{_mandir}/man8/ovs-vswitchd.8.gz
-%{_mandir}/man1/ovsdb-server.1.gz
-%{_mandir}/man5/ovs-vswitchd.conf.db.5.gz
-%{_mandir}/man8/ovs-ctl.8.gz
+%{_mandir}/man8/ovs-dpctl.8%{ext_man}
+%{_mandir}/man1/ovs-tcpundump.1%{ext_man}
+%{_mandir}/man1/ovs-pcap.1%{ext_man}
+%{_mandir}/man8/ovs-vsctl.8%{ext_man}
+%{_mandir}/man1/ovsdb-tool.1%{ext_man}
+%{_mandir}/man8/ovs-vswitchd.8%{ext_man}
+%{_mandir}/man1/ovsdb-server.1%{ext_man}
+%{_mandir}/man5/ovs-vswitchd.conf.db.5%{ext_man}
+%{_mandir}/man8/ovs-ctl.8%{ext_man}
%{_sbindir}/rcopenvswitch
%{_unitdir}/openvswitch.service
%{_localstatedir}/adm/fillup-templates/sysconfig.openvswitch
@@ -538,10 +537,10 @@
%{_bindir}/ovs-l3ping
%{_bindir}/ovs-vlan-test
%{_bindir}/ovs-testcontroller
-%{_mandir}/man8/ovs-test.8.gz
-%{_mandir}/man8/ovs-l3ping.8.gz
-%{_mandir}/man8/ovs-vlan-test.8.gz
-%{_mandir}/man8/ovs-testcontroller.8.gz
+%{_mandir}/man8/ovs-test.8%{ext_man}
+%{_mandir}/man8/ovs-l3ping.8%{ext_man}
+%{_mandir}/man8/ovs-vlan-test.8%{ext_man}
+%{_mandir}/man8/ovs-testcontroller.8%{ext_man}
%files devel
%defattr(-,root,root)
Index: openvswitch.changes
===================================================================
--- openvswitch.changes (revision 98)
+++ openvswitch.changes (revision 46)
@@ -1,4 +1,11 @@
-------------------------------------------------------------------
+Tue Jul 12 10:41:14 UTC 2016 - mchandras@suse.de
+
+- Add missing licenses (bsc#988513)
+- Misc spec file cleanups highlighted by the spec-cleaner tool.
+- Allow aarch64 builds for openvswitch-dpdk
+
+-------------------------------------------------------------------
Mon Jul 4 12:08:06 UTC 2016 - mchandras@suse.de
- Allow the OvS daemon to run as non-root (bsc#987545)
@@ -197,6 +204,8 @@
- Added: ovn-northd.service
- TODO: Explicit DPDK support not yet added to spec.
- Spec file work and cleanup.
+- Includes fixes (or obsoletes) the following issues:
+ * bsc#948840, bsc#941466, bsc#936780, bnc#935750, bnc#867964
-------------------------------------------------------------------
Tue Mar 1 08:43:19 UTC 2016 - kmroz@suse.com
Index: openvswitch.spec
===================================================================
--- openvswitch.spec (revision 98)
+++ openvswitch.spec (revision 46)
@@ -14,10 +14,9 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-
-
# needssslcertforbuild
+
# Disable building the external kernel datapath by default
%bcond_with kmp
# DPDK build disabled by default. It's enabled in the
@@ -26,12 +25,14 @@
# The testsuite is somewhat fragile for continuous testing in OBS
# but keep it here as an option
%bcond_with check
-
Name: openvswitch
Version: 2.5.0
Release: 0
Summary: An open source, production quality, multilayer virtual switch
-License: Apache-2.0
+# All code is Apache-2.0 except
+# - lib/sflow* which is SISSL
+# - utilities/bugtool which is LGPL-2.1
+License: Apache-2.0 and LGPL-2.1 and SISSL
Group: Productivity/Networking/System
Url: http://openvswitch.org/
Source0: http://openvswitch.org/releases/openvswitch-%{version}.tar.gz
@@ -41,35 +42,26 @@
Source89: Module.supported.updates
# PATCH-FIX-UPSTREAM openvswitch-2.5.0-detect-dpdk-installation.patch
Patch0: openvswitch-%{version}-detect-dpdk-installation.patch
-Patch1: 0001-Remove-broken-pipe-warning-logs-from-ovsdb-server.lo.patch
+Patch1: 0001-Remove-broken-pipe-warning-logs-from-ovsdb-server.lo.patch
BuildRequires: autoconf
BuildRequires: automake
-%if %{with dpdk}
-# We need to be a bit strict with the dpdk version since
-# it's very possible for DPDK to change it's API between
-# releases. OVS currently requires 2.2.0. We may have to
-# provide multiple versions of dpdk if OVS and DPDK get
-# out of sync too often.
-BuildRequires: dpdk-devel = 2.2.0
-ExclusiveArch: x86_64 %ix86
-%endif
BuildRequires: fdupes
BuildRequires: gcc
BuildRequires: glibc-devel
BuildRequires: graphviz
BuildRequires: libcap-ng-devel
-BuildRequires: libopenssl-devel
BuildRequires: libtool
BuildRequires: make
BuildRequires: openssl
BuildRequires: perl
-BuildRequires: pkg-config
+BuildRequires: pkgconfig
# Needed by the testsuite
BuildRequires: procps
BuildRequires: python-devel
BuildRequires: python-xml
+BuildRequires: valgrind-devel
+BuildRequires: pkgconfig(openssl)
Requires: logrotate
-Requires: openssl
Requires: python
Provides: openvswitch-common = %{version}
Obsoletes: openvswitch-common < %{version}
@@ -77,10 +69,16 @@
Obsoletes: openvswitch-controller < %{version}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%py_requires
-BuildRequires: valgrind-devel
-# We can't have openvswitch and openvswitch-dpdk in parallel
%if %{with dpdk}
+# We need to be a bit strict with the dpdk version since
+# it's very possible for DPDK to change it's API between
+# releases. OVS currently requires 2.2.0. We may have to
+# provide multiple versions of dpdk if OVS and DPDK get
+# out of sync too often.
+BuildRequires: dpdk-devel = 2.2.0
+# We can't have openvswitch and openvswitch-dpdk in parallel
Conflicts: openvswitch
+ExclusiveArch: aarch64 x86_64 %{ix86}
%endif
%description
@@ -129,15 +127,15 @@
# ovs-ctl / ovs-pki use /usr/bin/uuidgen:
Requires: util-linux
Requires(post): %fillup_prereq
+Suggests: logrotate
Provides: openvswitch-any-switch = %{version}
+%{?systemd_requires}
%if %{with dpdk}
Conflicts: openvswitch-switch
%endif
-Suggests: logrotate
%if %{with kmp}
Suggests: openvswitch-kmp
%endif
-%{?systemd_requires}
%description switch
openvswitch-switch provides the userspace components and utilities for
@@ -244,7 +242,7 @@
Open vSwitch is a full-featured software-based Ethernet switch.
%prep
-%setup -n openvswitch-%{version} -q
+%setup -q -n openvswitch-%{version}
%patch0 -p1
%patch1 -p1
@@ -288,6 +286,7 @@
--disable-static \
--enable-libcapng \
--enable-shared \
+ --enable-ssl \
${dpdk_opt} \
--with-logdir=%{_localstatedir}/log/openvswitch
make %{?_smp_mflags}
@@ -299,7 +298,7 @@
# 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}" ||
+if make check TESTSUITEFLAGS="%{?_smp_mflags}" ||
make check TESTSUITEFLAGS='--recheck'; then :;
else
cat tests/testsuite.log
@@ -356,7 +355,7 @@
mv %{buildroot}%{_datadir}/openvswitch/python/* %{buildroot}%{py_sitedir}
rmdir %{buildroot}%{_datadir}/openvswitch/python
-rm -f %buildroot/%_libdir/*.la
+find %{buildroot} -type f -name "*.la" -delete -print
# Remove unpackaged files for the dpdk case
%if %{with dpdk}
@@ -436,26 +435,26 @@
%{_libdir}/libopenvswitch.so.*
%{_libdir}/libovsdb.so.*
%{_libdir}/libsflow.so.*
-%{_mandir}/man1/ovs-benchmark.1.gz
-%{_mandir}/man1/ovsdb-client.1.gz
-%{_mandir}/man8/ovs-appctl.8.gz
-%{_mandir}/man8/ovs-bugtool.8.gz
-%{_mandir}/man8/ovs-ofctl.8.gz
-%{_mandir}/man8/ovs-vlan-bug-workaround.8.gz
-%{_mandir}/man8/ovs-parse-backtrace.8.gz
-%{_mandir}/man8/ovs-dpctl-top.8.gz
+%{_mandir}/man1/ovs-benchmark.1%{ext_man}
+%{_mandir}/man1/ovsdb-client.1%{ext_man}
+%{_mandir}/man8/ovs-appctl.8%{ext_man}
+%{_mandir}/man8/ovs-bugtool.8%{ext_man}
+%{_mandir}/man8/ovs-ofctl.8%{ext_man}
+%{_mandir}/man8/ovs-vlan-bug-workaround.8%{ext_man}
+%{_mandir}/man8/ovs-parse-backtrace.8%{ext_man}
+%{_mandir}/man8/ovs-dpctl-top.8%{ext_man}
%{_sysconfdir}/bash_completion.d/ovs-appctl-bashcomp.bash
%files pki
%defattr(-,root,root)
-%{_mandir}/man8/ovs-pki.8.gz
+%{_mandir}/man8/ovs-pki.8%{ext_man}
%{_bindir}/ovs-pki
%files vtep
%defattr(-,root,root)
%{_bindir}/vtep-ctl
-%{_mandir}/man5/vtep.5.gz
-%{_mandir}/man8/vtep-ctl.8.gz
+%{_mandir}/man5/vtep.5%{ext_man}
+%{_mandir}/man8/vtep-ctl.8%{ext_man}
%{_datadir}/openvswitch/scripts/ovs-vtep
%{_datadir}/openvswitch/vtep.ovsschema
%{_libdir}/libvtep.so.*
@@ -487,15 +486,15 @@
%{_datadir}/openvswitch/vswitch.ovsschema
%{_sysconfdir}/bash_completion.d/ovs-vsctl-bashcomp.bash
%config(noreplace) %{_sysconfdir}/logrotate.d/openvswitch-switch
-%{_mandir}/man8/ovs-dpctl.8.gz
-%{_mandir}/man1/ovs-tcpundump.1.gz
-%{_mandir}/man1/ovs-pcap.1.gz
-%{_mandir}/man8/ovs-vsctl.8.gz
-%{_mandir}/man1/ovsdb-tool.1.gz
-%{_mandir}/man8/ovs-vswitchd.8.gz
-%{_mandir}/man1/ovsdb-server.1.gz
-%{_mandir}/man5/ovs-vswitchd.conf.db.5.gz
-%{_mandir}/man8/ovs-ctl.8.gz
+%{_mandir}/man8/ovs-dpctl.8%{ext_man}
+%{_mandir}/man1/ovs-tcpundump.1%{ext_man}
+%{_mandir}/man1/ovs-pcap.1%{ext_man}
+%{_mandir}/man8/ovs-vsctl.8%{ext_man}
+%{_mandir}/man1/ovsdb-tool.1%{ext_man}
+%{_mandir}/man8/ovs-vswitchd.8%{ext_man}
+%{_mandir}/man1/ovsdb-server.1%{ext_man}
+%{_mandir}/man5/ovs-vswitchd.conf.db.5%{ext_man}
+%{_mandir}/man8/ovs-ctl.8%{ext_man}
%{_sbindir}/rcopenvswitch
%{_unitdir}/openvswitch.service
%{_localstatedir}/adm/fillup-templates/sysconfig.openvswitch
@@ -536,10 +535,10 @@
%{_bindir}/ovs-l3ping
%{_bindir}/ovs-vlan-test
%{_bindir}/ovs-testcontroller
-%{_mandir}/man8/ovs-test.8.gz
-%{_mandir}/man8/ovs-l3ping.8.gz
-%{_mandir}/man8/ovs-vlan-test.8.gz
-%{_mandir}/man8/ovs-testcontroller.8.gz
+%{_mandir}/man8/ovs-test.8%{ext_man}
+%{_mandir}/man8/ovs-l3ping.8%{ext_man}
+%{_mandir}/man8/ovs-vlan-test.8%{ext_man}
+%{_mandir}/man8/ovs-testcontroller.8%{ext_man}
%files devel
%defattr(-,root,root)
OBS-URL: https://build.opensuse.org/request/show/408658
OBS-URL: https://build.opensuse.org/package/show/network/openvswitch?expand=0&rev=99
2016-07-18 10:19:36 +02:00
|
|
|
|
# We need to be a bit strict with the dpdk version since
|
|
|
|
|
# it's very possible for DPDK to change it's API between
|
2016-10-07 15:07:43 +02:00
|
|
|
|
# releases. This version currently requires 16.07.
|
|
|
|
|
BuildRequires: dpdk-devel = 16.07
|
|
|
|
|
BuildRequires: libnuma-devel
|
|
|
|
|
BuildRequires: libpcap-devel
|
Accepting request 408658 from home:markoschandras:network
- Add missing licenses (bsc#988513)
- Misc spec file cleanups highlighted by the spec-cleaner tool.
- Allow aarch64 builds for openvswitch-dpdk
- Add missing bug references to 2.5.0 release.
old: network/openvswitch
new: home:markoschandras:network/openvswitch rev None
Index: openvswitch-dpdk.changes
===================================================================
--- openvswitch-dpdk.changes (revision 98)
+++ openvswitch-dpdk.changes (revision 46)
@@ -1,4 +1,11 @@
-------------------------------------------------------------------
+Tue Jul 12 10:41:14 UTC 2016 - mchandras@suse.de
+
+- Add missing licenses (bsc#988513)
+- Misc spec file cleanups highlighted by the spec-cleaner tool.
+- Allow aarch64 builds for openvswitch-dpdk
+
+-------------------------------------------------------------------
Mon Jul 4 12:08:06 UTC 2016 - mchandras@suse.de
- Allow the OvS daemon to run as non-root (bsc#987545)
@@ -197,6 +204,8 @@
- Added: ovn-northd.service
- TODO: Explicit DPDK support not yet added to spec.
- Spec file work and cleanup.
+- Includes fixes (or obsoletes) the following issues:
+ * bsc#948840, bsc#941466, bsc#936780, bnc#935750, bnc#867964
-------------------------------------------------------------------
Tue Mar 1 08:43:19 UTC 2016 - kmroz@suse.com
Index: openvswitch-dpdk.spec
===================================================================
--- openvswitch-dpdk.spec (revision 98)
+++ openvswitch-dpdk.spec (revision 46)
@@ -14,10 +14,9 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-
-
# needssslcertforbuild
+
# Disable building the external kernel datapath by default
%bcond_with kmp
# DPDK build disabled by default. It's enabled in the
@@ -26,14 +25,16 @@
# The testsuite is somewhat fragile for continuous testing in OBS
# but keep it here as an option
%bcond_with check
-
# Do NOT edit this auto generated file! Edit openvswitch.spec instead
# and run 'pre_checkin.sh' before committing
Name: openvswitch-dpdk
Version: 2.5.0
Release: 0
Summary: An open source, production quality, multilayer virtual switch (DPDK)
-License: Apache-2.0
+# All code is Apache-2.0 except
+# - lib/sflow* which is SISSL
+# - utilities/bugtool which is LGPL-2.1
+License: Apache-2.0 and LGPL-2.1 and SISSL
Group: Productivity/Networking/System
Url: http://openvswitch.org/
Source0: http://openvswitch.org/releases/openvswitch-%{version}.tar.gz
@@ -43,35 +44,26 @@
Source89: Module.supported.updates
# PATCH-FIX-UPSTREAM openvswitch-2.5.0-detect-dpdk-installation.patch
Patch0: openvswitch-%{version}-detect-dpdk-installation.patch
-Patch1: 0001-Remove-broken-pipe-warning-logs-from-ovsdb-server.lo.patch
+Patch1: 0001-Remove-broken-pipe-warning-logs-from-ovsdb-server.lo.patch
BuildRequires: autoconf
BuildRequires: automake
-%if %{with dpdk}
-# We need to be a bit strict with the dpdk version since
-# it's very possible for DPDK to change it's API between
-# releases. OVS currently requires 2.2.0. We may have to
-# provide multiple versions of dpdk if OVS and DPDK get
-# out of sync too often.
-BuildRequires: dpdk-devel = 2.2.0
-ExclusiveArch: x86_64 %ix86
-%endif
BuildRequires: fdupes
BuildRequires: gcc
BuildRequires: glibc-devel
BuildRequires: graphviz
BuildRequires: libcap-ng-devel
-BuildRequires: libopenssl-devel
BuildRequires: libtool
BuildRequires: make
BuildRequires: openssl
BuildRequires: perl
-BuildRequires: pkg-config
+BuildRequires: pkgconfig
# Needed by the testsuite
BuildRequires: procps
BuildRequires: python-devel
BuildRequires: python-xml
+BuildRequires: valgrind-devel
+BuildRequires: pkgconfig(openssl)
Requires: logrotate
-Requires: openssl
Requires: python
Provides: openvswitch-common = %{version}
Obsoletes: openvswitch-common < %{version}
@@ -79,10 +71,16 @@
Obsoletes: openvswitch-controller < %{version}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%py_requires
-BuildRequires: valgrind-devel
-# We can't have openvswitch and openvswitch-dpdk in parallel
%if %{with dpdk}
+# We need to be a bit strict with the dpdk version since
+# it's very possible for DPDK to change it's API between
+# releases. OVS currently requires 2.2.0. We may have to
+# provide multiple versions of dpdk if OVS and DPDK get
+# out of sync too often.
+BuildRequires: dpdk-devel = 2.2.0
+# We can't have openvswitch and openvswitch-dpdk in parallel
Conflicts: openvswitch
+ExclusiveArch: aarch64 x86_64 %{ix86}
%endif
%description
@@ -131,15 +129,15 @@
# ovs-ctl / ovs-pki use /usr/bin/uuidgen:
Requires: util-linux
Requires(post): %fillup_prereq
+Suggests: logrotate
Provides: openvswitch-any-switch = %{version}
+%{?systemd_requires}
%if %{with dpdk}
Conflicts: openvswitch-switch
%endif
-Suggests: logrotate
%if %{with kmp}
Suggests: openvswitch-kmp
%endif
-%{?systemd_requires}
%description switch
openvswitch-switch provides the userspace components and utilities for
@@ -246,7 +244,7 @@
Open vSwitch is a full-featured software-based Ethernet switch.
%prep
-%setup -n openvswitch-%{version} -q
+%setup -q -n openvswitch-%{version}
%patch0 -p1
%patch1 -p1
@@ -290,6 +288,7 @@
--disable-static \
--enable-libcapng \
--enable-shared \
+ --enable-ssl \
${dpdk_opt} \
--with-logdir=%{_localstatedir}/log/openvswitch
make %{?_smp_mflags}
@@ -301,7 +300,7 @@
# 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}" ||
+if make check TESTSUITEFLAGS="%{?_smp_mflags}" ||
make check TESTSUITEFLAGS='--recheck'; then :;
else
cat tests/testsuite.log
@@ -358,7 +357,7 @@
mv %{buildroot}%{_datadir}/openvswitch/python/* %{buildroot}%{py_sitedir}
rmdir %{buildroot}%{_datadir}/openvswitch/python
-rm -f %buildroot/%_libdir/*.la
+find %{buildroot} -type f -name "*.la" -delete -print
# Remove unpackaged files for the dpdk case
%if %{with dpdk}
@@ -438,26 +437,26 @@
%{_libdir}/libopenvswitch.so.*
%{_libdir}/libovsdb.so.*
%{_libdir}/libsflow.so.*
-%{_mandir}/man1/ovs-benchmark.1.gz
-%{_mandir}/man1/ovsdb-client.1.gz
-%{_mandir}/man8/ovs-appctl.8.gz
-%{_mandir}/man8/ovs-bugtool.8.gz
-%{_mandir}/man8/ovs-ofctl.8.gz
-%{_mandir}/man8/ovs-vlan-bug-workaround.8.gz
-%{_mandir}/man8/ovs-parse-backtrace.8.gz
-%{_mandir}/man8/ovs-dpctl-top.8.gz
+%{_mandir}/man1/ovs-benchmark.1%{ext_man}
+%{_mandir}/man1/ovsdb-client.1%{ext_man}
+%{_mandir}/man8/ovs-appctl.8%{ext_man}
+%{_mandir}/man8/ovs-bugtool.8%{ext_man}
+%{_mandir}/man8/ovs-ofctl.8%{ext_man}
+%{_mandir}/man8/ovs-vlan-bug-workaround.8%{ext_man}
+%{_mandir}/man8/ovs-parse-backtrace.8%{ext_man}
+%{_mandir}/man8/ovs-dpctl-top.8%{ext_man}
%{_sysconfdir}/bash_completion.d/ovs-appctl-bashcomp.bash
%files pki
%defattr(-,root,root)
-%{_mandir}/man8/ovs-pki.8.gz
+%{_mandir}/man8/ovs-pki.8%{ext_man}
%{_bindir}/ovs-pki
%files vtep
%defattr(-,root,root)
%{_bindir}/vtep-ctl
-%{_mandir}/man5/vtep.5.gz
-%{_mandir}/man8/vtep-ctl.8.gz
+%{_mandir}/man5/vtep.5%{ext_man}
+%{_mandir}/man8/vtep-ctl.8%{ext_man}
%{_datadir}/openvswitch/scripts/ovs-vtep
%{_datadir}/openvswitch/vtep.ovsschema
%{_libdir}/libvtep.so.*
@@ -489,15 +488,15 @@
%{_datadir}/openvswitch/vswitch.ovsschema
%{_sysconfdir}/bash_completion.d/ovs-vsctl-bashcomp.bash
%config(noreplace) %{_sysconfdir}/logrotate.d/openvswitch-switch
-%{_mandir}/man8/ovs-dpctl.8.gz
-%{_mandir}/man1/ovs-tcpundump.1.gz
-%{_mandir}/man1/ovs-pcap.1.gz
-%{_mandir}/man8/ovs-vsctl.8.gz
-%{_mandir}/man1/ovsdb-tool.1.gz
-%{_mandir}/man8/ovs-vswitchd.8.gz
-%{_mandir}/man1/ovsdb-server.1.gz
-%{_mandir}/man5/ovs-vswitchd.conf.db.5.gz
-%{_mandir}/man8/ovs-ctl.8.gz
+%{_mandir}/man8/ovs-dpctl.8%{ext_man}
+%{_mandir}/man1/ovs-tcpundump.1%{ext_man}
+%{_mandir}/man1/ovs-pcap.1%{ext_man}
+%{_mandir}/man8/ovs-vsctl.8%{ext_man}
+%{_mandir}/man1/ovsdb-tool.1%{ext_man}
+%{_mandir}/man8/ovs-vswitchd.8%{ext_man}
+%{_mandir}/man1/ovsdb-server.1%{ext_man}
+%{_mandir}/man5/ovs-vswitchd.conf.db.5%{ext_man}
+%{_mandir}/man8/ovs-ctl.8%{ext_man}
%{_sbindir}/rcopenvswitch
%{_unitdir}/openvswitch.service
%{_localstatedir}/adm/fillup-templates/sysconfig.openvswitch
@@ -538,10 +537,10 @@
%{_bindir}/ovs-l3ping
%{_bindir}/ovs-vlan-test
%{_bindir}/ovs-testcontroller
-%{_mandir}/man8/ovs-test.8.gz
-%{_mandir}/man8/ovs-l3ping.8.gz
-%{_mandir}/man8/ovs-vlan-test.8.gz
-%{_mandir}/man8/ovs-testcontroller.8.gz
+%{_mandir}/man8/ovs-test.8%{ext_man}
+%{_mandir}/man8/ovs-l3ping.8%{ext_man}
+%{_mandir}/man8/ovs-vlan-test.8%{ext_man}
+%{_mandir}/man8/ovs-testcontroller.8%{ext_man}
%files devel
%defattr(-,root,root)
Index: openvswitch.changes
===================================================================
--- openvswitch.changes (revision 98)
+++ openvswitch.changes (revision 46)
@@ -1,4 +1,11 @@
-------------------------------------------------------------------
+Tue Jul 12 10:41:14 UTC 2016 - mchandras@suse.de
+
+- Add missing licenses (bsc#988513)
+- Misc spec file cleanups highlighted by the spec-cleaner tool.
+- Allow aarch64 builds for openvswitch-dpdk
+
+-------------------------------------------------------------------
Mon Jul 4 12:08:06 UTC 2016 - mchandras@suse.de
- Allow the OvS daemon to run as non-root (bsc#987545)
@@ -197,6 +204,8 @@
- Added: ovn-northd.service
- TODO: Explicit DPDK support not yet added to spec.
- Spec file work and cleanup.
+- Includes fixes (or obsoletes) the following issues:
+ * bsc#948840, bsc#941466, bsc#936780, bnc#935750, bnc#867964
-------------------------------------------------------------------
Tue Mar 1 08:43:19 UTC 2016 - kmroz@suse.com
Index: openvswitch.spec
===================================================================
--- openvswitch.spec (revision 98)
+++ openvswitch.spec (revision 46)
@@ -14,10 +14,9 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-
-
# needssslcertforbuild
+
# Disable building the external kernel datapath by default
%bcond_with kmp
# DPDK build disabled by default. It's enabled in the
@@ -26,12 +25,14 @@
# The testsuite is somewhat fragile for continuous testing in OBS
# but keep it here as an option
%bcond_with check
-
Name: openvswitch
Version: 2.5.0
Release: 0
Summary: An open source, production quality, multilayer virtual switch
-License: Apache-2.0
+# All code is Apache-2.0 except
+# - lib/sflow* which is SISSL
+# - utilities/bugtool which is LGPL-2.1
+License: Apache-2.0 and LGPL-2.1 and SISSL
Group: Productivity/Networking/System
Url: http://openvswitch.org/
Source0: http://openvswitch.org/releases/openvswitch-%{version}.tar.gz
@@ -41,35 +42,26 @@
Source89: Module.supported.updates
# PATCH-FIX-UPSTREAM openvswitch-2.5.0-detect-dpdk-installation.patch
Patch0: openvswitch-%{version}-detect-dpdk-installation.patch
-Patch1: 0001-Remove-broken-pipe-warning-logs-from-ovsdb-server.lo.patch
+Patch1: 0001-Remove-broken-pipe-warning-logs-from-ovsdb-server.lo.patch
BuildRequires: autoconf
BuildRequires: automake
-%if %{with dpdk}
-# We need to be a bit strict with the dpdk version since
-# it's very possible for DPDK to change it's API between
-# releases. OVS currently requires 2.2.0. We may have to
-# provide multiple versions of dpdk if OVS and DPDK get
-# out of sync too often.
-BuildRequires: dpdk-devel = 2.2.0
-ExclusiveArch: x86_64 %ix86
-%endif
BuildRequires: fdupes
BuildRequires: gcc
BuildRequires: glibc-devel
BuildRequires: graphviz
BuildRequires: libcap-ng-devel
-BuildRequires: libopenssl-devel
BuildRequires: libtool
BuildRequires: make
BuildRequires: openssl
BuildRequires: perl
-BuildRequires: pkg-config
+BuildRequires: pkgconfig
# Needed by the testsuite
BuildRequires: procps
BuildRequires: python-devel
BuildRequires: python-xml
+BuildRequires: valgrind-devel
+BuildRequires: pkgconfig(openssl)
Requires: logrotate
-Requires: openssl
Requires: python
Provides: openvswitch-common = %{version}
Obsoletes: openvswitch-common < %{version}
@@ -77,10 +69,16 @@
Obsoletes: openvswitch-controller < %{version}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%py_requires
-BuildRequires: valgrind-devel
-# We can't have openvswitch and openvswitch-dpdk in parallel
%if %{with dpdk}
+# We need to be a bit strict with the dpdk version since
+# it's very possible for DPDK to change it's API between
+# releases. OVS currently requires 2.2.0. We may have to
+# provide multiple versions of dpdk if OVS and DPDK get
+# out of sync too often.
+BuildRequires: dpdk-devel = 2.2.0
+# We can't have openvswitch and openvswitch-dpdk in parallel
Conflicts: openvswitch
+ExclusiveArch: aarch64 x86_64 %{ix86}
%endif
%description
@@ -129,15 +127,15 @@
# ovs-ctl / ovs-pki use /usr/bin/uuidgen:
Requires: util-linux
Requires(post): %fillup_prereq
+Suggests: logrotate
Provides: openvswitch-any-switch = %{version}
+%{?systemd_requires}
%if %{with dpdk}
Conflicts: openvswitch-switch
%endif
-Suggests: logrotate
%if %{with kmp}
Suggests: openvswitch-kmp
%endif
-%{?systemd_requires}
%description switch
openvswitch-switch provides the userspace components and utilities for
@@ -244,7 +242,7 @@
Open vSwitch is a full-featured software-based Ethernet switch.
%prep
-%setup -n openvswitch-%{version} -q
+%setup -q -n openvswitch-%{version}
%patch0 -p1
%patch1 -p1
@@ -288,6 +286,7 @@
--disable-static \
--enable-libcapng \
--enable-shared \
+ --enable-ssl \
${dpdk_opt} \
--with-logdir=%{_localstatedir}/log/openvswitch
make %{?_smp_mflags}
@@ -299,7 +298,7 @@
# 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}" ||
+if make check TESTSUITEFLAGS="%{?_smp_mflags}" ||
make check TESTSUITEFLAGS='--recheck'; then :;
else
cat tests/testsuite.log
@@ -356,7 +355,7 @@
mv %{buildroot}%{_datadir}/openvswitch/python/* %{buildroot}%{py_sitedir}
rmdir %{buildroot}%{_datadir}/openvswitch/python
-rm -f %buildroot/%_libdir/*.la
+find %{buildroot} -type f -name "*.la" -delete -print
# Remove unpackaged files for the dpdk case
%if %{with dpdk}
@@ -436,26 +435,26 @@
%{_libdir}/libopenvswitch.so.*
%{_libdir}/libovsdb.so.*
%{_libdir}/libsflow.so.*
-%{_mandir}/man1/ovs-benchmark.1.gz
-%{_mandir}/man1/ovsdb-client.1.gz
-%{_mandir}/man8/ovs-appctl.8.gz
-%{_mandir}/man8/ovs-bugtool.8.gz
-%{_mandir}/man8/ovs-ofctl.8.gz
-%{_mandir}/man8/ovs-vlan-bug-workaround.8.gz
-%{_mandir}/man8/ovs-parse-backtrace.8.gz
-%{_mandir}/man8/ovs-dpctl-top.8.gz
+%{_mandir}/man1/ovs-benchmark.1%{ext_man}
+%{_mandir}/man1/ovsdb-client.1%{ext_man}
+%{_mandir}/man8/ovs-appctl.8%{ext_man}
+%{_mandir}/man8/ovs-bugtool.8%{ext_man}
+%{_mandir}/man8/ovs-ofctl.8%{ext_man}
+%{_mandir}/man8/ovs-vlan-bug-workaround.8%{ext_man}
+%{_mandir}/man8/ovs-parse-backtrace.8%{ext_man}
+%{_mandir}/man8/ovs-dpctl-top.8%{ext_man}
%{_sysconfdir}/bash_completion.d/ovs-appctl-bashcomp.bash
%files pki
%defattr(-,root,root)
-%{_mandir}/man8/ovs-pki.8.gz
+%{_mandir}/man8/ovs-pki.8%{ext_man}
%{_bindir}/ovs-pki
%files vtep
%defattr(-,root,root)
%{_bindir}/vtep-ctl
-%{_mandir}/man5/vtep.5.gz
-%{_mandir}/man8/vtep-ctl.8.gz
+%{_mandir}/man5/vtep.5%{ext_man}
+%{_mandir}/man8/vtep-ctl.8%{ext_man}
%{_datadir}/openvswitch/scripts/ovs-vtep
%{_datadir}/openvswitch/vtep.ovsschema
%{_libdir}/libvtep.so.*
@@ -487,15 +486,15 @@
%{_datadir}/openvswitch/vswitch.ovsschema
%{_sysconfdir}/bash_completion.d/ovs-vsctl-bashcomp.bash
%config(noreplace) %{_sysconfdir}/logrotate.d/openvswitch-switch
-%{_mandir}/man8/ovs-dpctl.8.gz
-%{_mandir}/man1/ovs-tcpundump.1.gz
-%{_mandir}/man1/ovs-pcap.1.gz
-%{_mandir}/man8/ovs-vsctl.8.gz
-%{_mandir}/man1/ovsdb-tool.1.gz
-%{_mandir}/man8/ovs-vswitchd.8.gz
-%{_mandir}/man1/ovsdb-server.1.gz
-%{_mandir}/man5/ovs-vswitchd.conf.db.5.gz
-%{_mandir}/man8/ovs-ctl.8.gz
+%{_mandir}/man8/ovs-dpctl.8%{ext_man}
+%{_mandir}/man1/ovs-tcpundump.1%{ext_man}
+%{_mandir}/man1/ovs-pcap.1%{ext_man}
+%{_mandir}/man8/ovs-vsctl.8%{ext_man}
+%{_mandir}/man1/ovsdb-tool.1%{ext_man}
+%{_mandir}/man8/ovs-vswitchd.8%{ext_man}
+%{_mandir}/man1/ovsdb-server.1%{ext_man}
+%{_mandir}/man5/ovs-vswitchd.conf.db.5%{ext_man}
+%{_mandir}/man8/ovs-ctl.8%{ext_man}
%{_sbindir}/rcopenvswitch
%{_unitdir}/openvswitch.service
%{_localstatedir}/adm/fillup-templates/sysconfig.openvswitch
@@ -536,10 +535,10 @@
%{_bindir}/ovs-l3ping
%{_bindir}/ovs-vlan-test
%{_bindir}/ovs-testcontroller
-%{_mandir}/man8/ovs-test.8.gz
-%{_mandir}/man8/ovs-l3ping.8.gz
-%{_mandir}/man8/ovs-vlan-test.8.gz
-%{_mandir}/man8/ovs-testcontroller.8.gz
+%{_mandir}/man8/ovs-test.8%{ext_man}
+%{_mandir}/man8/ovs-l3ping.8%{ext_man}
+%{_mandir}/man8/ovs-vlan-test.8%{ext_man}
+%{_mandir}/man8/ovs-testcontroller.8%{ext_man}
%files devel
%defattr(-,root,root)
OBS-URL: https://build.opensuse.org/request/show/408658
OBS-URL: https://build.opensuse.org/package/show/network/openvswitch?expand=0&rev=99
2016-07-18 10:19:36 +02:00
|
|
|
|
# We can't have openvswitch and openvswitch-dpdk in parallel
|
2016-07-05 11:13:42 +02:00
|
|
|
|
Conflicts: openvswitch
|
Accepting request 408658 from home:markoschandras:network
- Add missing licenses (bsc#988513)
- Misc spec file cleanups highlighted by the spec-cleaner tool.
- Allow aarch64 builds for openvswitch-dpdk
- Add missing bug references to 2.5.0 release.
old: network/openvswitch
new: home:markoschandras:network/openvswitch rev None
Index: openvswitch-dpdk.changes
===================================================================
--- openvswitch-dpdk.changes (revision 98)
+++ openvswitch-dpdk.changes (revision 46)
@@ -1,4 +1,11 @@
-------------------------------------------------------------------
+Tue Jul 12 10:41:14 UTC 2016 - mchandras@suse.de
+
+- Add missing licenses (bsc#988513)
+- Misc spec file cleanups highlighted by the spec-cleaner tool.
+- Allow aarch64 builds for openvswitch-dpdk
+
+-------------------------------------------------------------------
Mon Jul 4 12:08:06 UTC 2016 - mchandras@suse.de
- Allow the OvS daemon to run as non-root (bsc#987545)
@@ -197,6 +204,8 @@
- Added: ovn-northd.service
- TODO: Explicit DPDK support not yet added to spec.
- Spec file work and cleanup.
+- Includes fixes (or obsoletes) the following issues:
+ * bsc#948840, bsc#941466, bsc#936780, bnc#935750, bnc#867964
-------------------------------------------------------------------
Tue Mar 1 08:43:19 UTC 2016 - kmroz@suse.com
Index: openvswitch-dpdk.spec
===================================================================
--- openvswitch-dpdk.spec (revision 98)
+++ openvswitch-dpdk.spec (revision 46)
@@ -14,10 +14,9 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-
-
# needssslcertforbuild
+
# Disable building the external kernel datapath by default
%bcond_with kmp
# DPDK build disabled by default. It's enabled in the
@@ -26,14 +25,16 @@
# The testsuite is somewhat fragile for continuous testing in OBS
# but keep it here as an option
%bcond_with check
-
# Do NOT edit this auto generated file! Edit openvswitch.spec instead
# and run 'pre_checkin.sh' before committing
Name: openvswitch-dpdk
Version: 2.5.0
Release: 0
Summary: An open source, production quality, multilayer virtual switch (DPDK)
-License: Apache-2.0
+# All code is Apache-2.0 except
+# - lib/sflow* which is SISSL
+# - utilities/bugtool which is LGPL-2.1
+License: Apache-2.0 and LGPL-2.1 and SISSL
Group: Productivity/Networking/System
Url: http://openvswitch.org/
Source0: http://openvswitch.org/releases/openvswitch-%{version}.tar.gz
@@ -43,35 +44,26 @@
Source89: Module.supported.updates
# PATCH-FIX-UPSTREAM openvswitch-2.5.0-detect-dpdk-installation.patch
Patch0: openvswitch-%{version}-detect-dpdk-installation.patch
-Patch1: 0001-Remove-broken-pipe-warning-logs-from-ovsdb-server.lo.patch
+Patch1: 0001-Remove-broken-pipe-warning-logs-from-ovsdb-server.lo.patch
BuildRequires: autoconf
BuildRequires: automake
-%if %{with dpdk}
-# We need to be a bit strict with the dpdk version since
-# it's very possible for DPDK to change it's API between
-# releases. OVS currently requires 2.2.0. We may have to
-# provide multiple versions of dpdk if OVS and DPDK get
-# out of sync too often.
-BuildRequires: dpdk-devel = 2.2.0
-ExclusiveArch: x86_64 %ix86
-%endif
BuildRequires: fdupes
BuildRequires: gcc
BuildRequires: glibc-devel
BuildRequires: graphviz
BuildRequires: libcap-ng-devel
-BuildRequires: libopenssl-devel
BuildRequires: libtool
BuildRequires: make
BuildRequires: openssl
BuildRequires: perl
-BuildRequires: pkg-config
+BuildRequires: pkgconfig
# Needed by the testsuite
BuildRequires: procps
BuildRequires: python-devel
BuildRequires: python-xml
+BuildRequires: valgrind-devel
+BuildRequires: pkgconfig(openssl)
Requires: logrotate
-Requires: openssl
Requires: python
Provides: openvswitch-common = %{version}
Obsoletes: openvswitch-common < %{version}
@@ -79,10 +71,16 @@
Obsoletes: openvswitch-controller < %{version}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%py_requires
-BuildRequires: valgrind-devel
-# We can't have openvswitch and openvswitch-dpdk in parallel
%if %{with dpdk}
+# We need to be a bit strict with the dpdk version since
+# it's very possible for DPDK to change it's API between
+# releases. OVS currently requires 2.2.0. We may have to
+# provide multiple versions of dpdk if OVS and DPDK get
+# out of sync too often.
+BuildRequires: dpdk-devel = 2.2.0
+# We can't have openvswitch and openvswitch-dpdk in parallel
Conflicts: openvswitch
+ExclusiveArch: aarch64 x86_64 %{ix86}
%endif
%description
@@ -131,15 +129,15 @@
# ovs-ctl / ovs-pki use /usr/bin/uuidgen:
Requires: util-linux
Requires(post): %fillup_prereq
+Suggests: logrotate
Provides: openvswitch-any-switch = %{version}
+%{?systemd_requires}
%if %{with dpdk}
Conflicts: openvswitch-switch
%endif
-Suggests: logrotate
%if %{with kmp}
Suggests: openvswitch-kmp
%endif
-%{?systemd_requires}
%description switch
openvswitch-switch provides the userspace components and utilities for
@@ -246,7 +244,7 @@
Open vSwitch is a full-featured software-based Ethernet switch.
%prep
-%setup -n openvswitch-%{version} -q
+%setup -q -n openvswitch-%{version}
%patch0 -p1
%patch1 -p1
@@ -290,6 +288,7 @@
--disable-static \
--enable-libcapng \
--enable-shared \
+ --enable-ssl \
${dpdk_opt} \
--with-logdir=%{_localstatedir}/log/openvswitch
make %{?_smp_mflags}
@@ -301,7 +300,7 @@
# 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}" ||
+if make check TESTSUITEFLAGS="%{?_smp_mflags}" ||
make check TESTSUITEFLAGS='--recheck'; then :;
else
cat tests/testsuite.log
@@ -358,7 +357,7 @@
mv %{buildroot}%{_datadir}/openvswitch/python/* %{buildroot}%{py_sitedir}
rmdir %{buildroot}%{_datadir}/openvswitch/python
-rm -f %buildroot/%_libdir/*.la
+find %{buildroot} -type f -name "*.la" -delete -print
# Remove unpackaged files for the dpdk case
%if %{with dpdk}
@@ -438,26 +437,26 @@
%{_libdir}/libopenvswitch.so.*
%{_libdir}/libovsdb.so.*
%{_libdir}/libsflow.so.*
-%{_mandir}/man1/ovs-benchmark.1.gz
-%{_mandir}/man1/ovsdb-client.1.gz
-%{_mandir}/man8/ovs-appctl.8.gz
-%{_mandir}/man8/ovs-bugtool.8.gz
-%{_mandir}/man8/ovs-ofctl.8.gz
-%{_mandir}/man8/ovs-vlan-bug-workaround.8.gz
-%{_mandir}/man8/ovs-parse-backtrace.8.gz
-%{_mandir}/man8/ovs-dpctl-top.8.gz
+%{_mandir}/man1/ovs-benchmark.1%{ext_man}
+%{_mandir}/man1/ovsdb-client.1%{ext_man}
+%{_mandir}/man8/ovs-appctl.8%{ext_man}
+%{_mandir}/man8/ovs-bugtool.8%{ext_man}
+%{_mandir}/man8/ovs-ofctl.8%{ext_man}
+%{_mandir}/man8/ovs-vlan-bug-workaround.8%{ext_man}
+%{_mandir}/man8/ovs-parse-backtrace.8%{ext_man}
+%{_mandir}/man8/ovs-dpctl-top.8%{ext_man}
%{_sysconfdir}/bash_completion.d/ovs-appctl-bashcomp.bash
%files pki
%defattr(-,root,root)
-%{_mandir}/man8/ovs-pki.8.gz
+%{_mandir}/man8/ovs-pki.8%{ext_man}
%{_bindir}/ovs-pki
%files vtep
%defattr(-,root,root)
%{_bindir}/vtep-ctl
-%{_mandir}/man5/vtep.5.gz
-%{_mandir}/man8/vtep-ctl.8.gz
+%{_mandir}/man5/vtep.5%{ext_man}
+%{_mandir}/man8/vtep-ctl.8%{ext_man}
%{_datadir}/openvswitch/scripts/ovs-vtep
%{_datadir}/openvswitch/vtep.ovsschema
%{_libdir}/libvtep.so.*
@@ -489,15 +488,15 @@
%{_datadir}/openvswitch/vswitch.ovsschema
%{_sysconfdir}/bash_completion.d/ovs-vsctl-bashcomp.bash
%config(noreplace) %{_sysconfdir}/logrotate.d/openvswitch-switch
-%{_mandir}/man8/ovs-dpctl.8.gz
-%{_mandir}/man1/ovs-tcpundump.1.gz
-%{_mandir}/man1/ovs-pcap.1.gz
-%{_mandir}/man8/ovs-vsctl.8.gz
-%{_mandir}/man1/ovsdb-tool.1.gz
-%{_mandir}/man8/ovs-vswitchd.8.gz
-%{_mandir}/man1/ovsdb-server.1.gz
-%{_mandir}/man5/ovs-vswitchd.conf.db.5.gz
-%{_mandir}/man8/ovs-ctl.8.gz
+%{_mandir}/man8/ovs-dpctl.8%{ext_man}
+%{_mandir}/man1/ovs-tcpundump.1%{ext_man}
+%{_mandir}/man1/ovs-pcap.1%{ext_man}
+%{_mandir}/man8/ovs-vsctl.8%{ext_man}
+%{_mandir}/man1/ovsdb-tool.1%{ext_man}
+%{_mandir}/man8/ovs-vswitchd.8%{ext_man}
+%{_mandir}/man1/ovsdb-server.1%{ext_man}
+%{_mandir}/man5/ovs-vswitchd.conf.db.5%{ext_man}
+%{_mandir}/man8/ovs-ctl.8%{ext_man}
%{_sbindir}/rcopenvswitch
%{_unitdir}/openvswitch.service
%{_localstatedir}/adm/fillup-templates/sysconfig.openvswitch
@@ -538,10 +537,10 @@
%{_bindir}/ovs-l3ping
%{_bindir}/ovs-vlan-test
%{_bindir}/ovs-testcontroller
-%{_mandir}/man8/ovs-test.8.gz
-%{_mandir}/man8/ovs-l3ping.8.gz
-%{_mandir}/man8/ovs-vlan-test.8.gz
-%{_mandir}/man8/ovs-testcontroller.8.gz
+%{_mandir}/man8/ovs-test.8%{ext_man}
+%{_mandir}/man8/ovs-l3ping.8%{ext_man}
+%{_mandir}/man8/ovs-vlan-test.8%{ext_man}
+%{_mandir}/man8/ovs-testcontroller.8%{ext_man}
%files devel
%defattr(-,root,root)
Index: openvswitch.changes
===================================================================
--- openvswitch.changes (revision 98)
+++ openvswitch.changes (revision 46)
@@ -1,4 +1,11 @@
-------------------------------------------------------------------
+Tue Jul 12 10:41:14 UTC 2016 - mchandras@suse.de
+
+- Add missing licenses (bsc#988513)
+- Misc spec file cleanups highlighted by the spec-cleaner tool.
+- Allow aarch64 builds for openvswitch-dpdk
+
+-------------------------------------------------------------------
Mon Jul 4 12:08:06 UTC 2016 - mchandras@suse.de
- Allow the OvS daemon to run as non-root (bsc#987545)
@@ -197,6 +204,8 @@
- Added: ovn-northd.service
- TODO: Explicit DPDK support not yet added to spec.
- Spec file work and cleanup.
+- Includes fixes (or obsoletes) the following issues:
+ * bsc#948840, bsc#941466, bsc#936780, bnc#935750, bnc#867964
-------------------------------------------------------------------
Tue Mar 1 08:43:19 UTC 2016 - kmroz@suse.com
Index: openvswitch.spec
===================================================================
--- openvswitch.spec (revision 98)
+++ openvswitch.spec (revision 46)
@@ -14,10 +14,9 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-
-
# needssslcertforbuild
+
# Disable building the external kernel datapath by default
%bcond_with kmp
# DPDK build disabled by default. It's enabled in the
@@ -26,12 +25,14 @@
# The testsuite is somewhat fragile for continuous testing in OBS
# but keep it here as an option
%bcond_with check
-
Name: openvswitch
Version: 2.5.0
Release: 0
Summary: An open source, production quality, multilayer virtual switch
-License: Apache-2.0
+# All code is Apache-2.0 except
+# - lib/sflow* which is SISSL
+# - utilities/bugtool which is LGPL-2.1
+License: Apache-2.0 and LGPL-2.1 and SISSL
Group: Productivity/Networking/System
Url: http://openvswitch.org/
Source0: http://openvswitch.org/releases/openvswitch-%{version}.tar.gz
@@ -41,35 +42,26 @@
Source89: Module.supported.updates
# PATCH-FIX-UPSTREAM openvswitch-2.5.0-detect-dpdk-installation.patch
Patch0: openvswitch-%{version}-detect-dpdk-installation.patch
-Patch1: 0001-Remove-broken-pipe-warning-logs-from-ovsdb-server.lo.patch
+Patch1: 0001-Remove-broken-pipe-warning-logs-from-ovsdb-server.lo.patch
BuildRequires: autoconf
BuildRequires: automake
-%if %{with dpdk}
-# We need to be a bit strict with the dpdk version since
-# it's very possible for DPDK to change it's API between
-# releases. OVS currently requires 2.2.0. We may have to
-# provide multiple versions of dpdk if OVS and DPDK get
-# out of sync too often.
-BuildRequires: dpdk-devel = 2.2.0
-ExclusiveArch: x86_64 %ix86
-%endif
BuildRequires: fdupes
BuildRequires: gcc
BuildRequires: glibc-devel
BuildRequires: graphviz
BuildRequires: libcap-ng-devel
-BuildRequires: libopenssl-devel
BuildRequires: libtool
BuildRequires: make
BuildRequires: openssl
BuildRequires: perl
-BuildRequires: pkg-config
+BuildRequires: pkgconfig
# Needed by the testsuite
BuildRequires: procps
BuildRequires: python-devel
BuildRequires: python-xml
+BuildRequires: valgrind-devel
+BuildRequires: pkgconfig(openssl)
Requires: logrotate
-Requires: openssl
Requires: python
Provides: openvswitch-common = %{version}
Obsoletes: openvswitch-common < %{version}
@@ -77,10 +69,16 @@
Obsoletes: openvswitch-controller < %{version}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%py_requires
-BuildRequires: valgrind-devel
-# We can't have openvswitch and openvswitch-dpdk in parallel
%if %{with dpdk}
+# We need to be a bit strict with the dpdk version since
+# it's very possible for DPDK to change it's API between
+# releases. OVS currently requires 2.2.0. We may have to
+# provide multiple versions of dpdk if OVS and DPDK get
+# out of sync too often.
+BuildRequires: dpdk-devel = 2.2.0
+# We can't have openvswitch and openvswitch-dpdk in parallel
Conflicts: openvswitch
+ExclusiveArch: aarch64 x86_64 %{ix86}
%endif
%description
@@ -129,15 +127,15 @@
# ovs-ctl / ovs-pki use /usr/bin/uuidgen:
Requires: util-linux
Requires(post): %fillup_prereq
+Suggests: logrotate
Provides: openvswitch-any-switch = %{version}
+%{?systemd_requires}
%if %{with dpdk}
Conflicts: openvswitch-switch
%endif
-Suggests: logrotate
%if %{with kmp}
Suggests: openvswitch-kmp
%endif
-%{?systemd_requires}
%description switch
openvswitch-switch provides the userspace components and utilities for
@@ -244,7 +242,7 @@
Open vSwitch is a full-featured software-based Ethernet switch.
%prep
-%setup -n openvswitch-%{version} -q
+%setup -q -n openvswitch-%{version}
%patch0 -p1
%patch1 -p1
@@ -288,6 +286,7 @@
--disable-static \
--enable-libcapng \
--enable-shared \
+ --enable-ssl \
${dpdk_opt} \
--with-logdir=%{_localstatedir}/log/openvswitch
make %{?_smp_mflags}
@@ -299,7 +298,7 @@
# 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}" ||
+if make check TESTSUITEFLAGS="%{?_smp_mflags}" ||
make check TESTSUITEFLAGS='--recheck'; then :;
else
cat tests/testsuite.log
@@ -356,7 +355,7 @@
mv %{buildroot}%{_datadir}/openvswitch/python/* %{buildroot}%{py_sitedir}
rmdir %{buildroot}%{_datadir}/openvswitch/python
-rm -f %buildroot/%_libdir/*.la
+find %{buildroot} -type f -name "*.la" -delete -print
# Remove unpackaged files for the dpdk case
%if %{with dpdk}
@@ -436,26 +435,26 @@
%{_libdir}/libopenvswitch.so.*
%{_libdir}/libovsdb.so.*
%{_libdir}/libsflow.so.*
-%{_mandir}/man1/ovs-benchmark.1.gz
-%{_mandir}/man1/ovsdb-client.1.gz
-%{_mandir}/man8/ovs-appctl.8.gz
-%{_mandir}/man8/ovs-bugtool.8.gz
-%{_mandir}/man8/ovs-ofctl.8.gz
-%{_mandir}/man8/ovs-vlan-bug-workaround.8.gz
-%{_mandir}/man8/ovs-parse-backtrace.8.gz
-%{_mandir}/man8/ovs-dpctl-top.8.gz
+%{_mandir}/man1/ovs-benchmark.1%{ext_man}
+%{_mandir}/man1/ovsdb-client.1%{ext_man}
+%{_mandir}/man8/ovs-appctl.8%{ext_man}
+%{_mandir}/man8/ovs-bugtool.8%{ext_man}
+%{_mandir}/man8/ovs-ofctl.8%{ext_man}
+%{_mandir}/man8/ovs-vlan-bug-workaround.8%{ext_man}
+%{_mandir}/man8/ovs-parse-backtrace.8%{ext_man}
+%{_mandir}/man8/ovs-dpctl-top.8%{ext_man}
%{_sysconfdir}/bash_completion.d/ovs-appctl-bashcomp.bash
%files pki
%defattr(-,root,root)
-%{_mandir}/man8/ovs-pki.8.gz
+%{_mandir}/man8/ovs-pki.8%{ext_man}
%{_bindir}/ovs-pki
%files vtep
%defattr(-,root,root)
%{_bindir}/vtep-ctl
-%{_mandir}/man5/vtep.5.gz
-%{_mandir}/man8/vtep-ctl.8.gz
+%{_mandir}/man5/vtep.5%{ext_man}
+%{_mandir}/man8/vtep-ctl.8%{ext_man}
%{_datadir}/openvswitch/scripts/ovs-vtep
%{_datadir}/openvswitch/vtep.ovsschema
%{_libdir}/libvtep.so.*
@@ -487,15 +486,15 @@
%{_datadir}/openvswitch/vswitch.ovsschema
%{_sysconfdir}/bash_completion.d/ovs-vsctl-bashcomp.bash
%config(noreplace) %{_sysconfdir}/logrotate.d/openvswitch-switch
-%{_mandir}/man8/ovs-dpctl.8.gz
-%{_mandir}/man1/ovs-tcpundump.1.gz
-%{_mandir}/man1/ovs-pcap.1.gz
-%{_mandir}/man8/ovs-vsctl.8.gz
-%{_mandir}/man1/ovsdb-tool.1.gz
-%{_mandir}/man8/ovs-vswitchd.8.gz
-%{_mandir}/man1/ovsdb-server.1.gz
-%{_mandir}/man5/ovs-vswitchd.conf.db.5.gz
-%{_mandir}/man8/ovs-ctl.8.gz
+%{_mandir}/man8/ovs-dpctl.8%{ext_man}
+%{_mandir}/man1/ovs-tcpundump.1%{ext_man}
+%{_mandir}/man1/ovs-pcap.1%{ext_man}
+%{_mandir}/man8/ovs-vsctl.8%{ext_man}
+%{_mandir}/man1/ovsdb-tool.1%{ext_man}
+%{_mandir}/man8/ovs-vswitchd.8%{ext_man}
+%{_mandir}/man1/ovsdb-server.1%{ext_man}
+%{_mandir}/man5/ovs-vswitchd.conf.db.5%{ext_man}
+%{_mandir}/man8/ovs-ctl.8%{ext_man}
%{_sbindir}/rcopenvswitch
%{_unitdir}/openvswitch.service
%{_localstatedir}/adm/fillup-templates/sysconfig.openvswitch
@@ -536,10 +535,10 @@
%{_bindir}/ovs-l3ping
%{_bindir}/ovs-vlan-test
%{_bindir}/ovs-testcontroller
-%{_mandir}/man8/ovs-test.8.gz
-%{_mandir}/man8/ovs-l3ping.8.gz
-%{_mandir}/man8/ovs-vlan-test.8.gz
-%{_mandir}/man8/ovs-testcontroller.8.gz
+%{_mandir}/man8/ovs-test.8%{ext_man}
+%{_mandir}/man8/ovs-l3ping.8%{ext_man}
+%{_mandir}/man8/ovs-vlan-test.8%{ext_man}
+%{_mandir}/man8/ovs-testcontroller.8%{ext_man}
%files devel
%defattr(-,root,root)
OBS-URL: https://build.opensuse.org/request/show/408658
OBS-URL: https://build.opensuse.org/package/show/network/openvswitch?expand=0&rev=99
2016-07-18 10:19:36 +02:00
|
|
|
|
ExclusiveArch: aarch64 x86_64 %{ix86}
|
2016-07-05 11:13:42 +02:00
|
|
|
|
%endif
|
2010-12-11 17:10:38 +01:00
|
|
|
|
|
2011-05-20 21:19:18 +02:00
|
|
|
|
%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.
|
2010-12-11 17:10:38 +01:00
|
|
|
|
|
2016-06-22 11:27:41 +02:00
|
|
|
|
%if ! %{with dpdk}
|
2013-03-27 13:25:19 +01:00
|
|
|
|
%if %{with kmp}
|
|
|
|
|
%package kmp
|
|
|
|
|
Summary: Open vSwitch kernel modules
|
2014-05-20 18:03:31 +02:00
|
|
|
|
License: GPL-2.0+
|
2013-03-27 13:25:19 +01:00
|
|
|
|
Group: System/Kernel
|
2016-05-19 12:13:17 +02:00
|
|
|
|
BuildRequires: %{kernel_module_package_buildreqs}
|
|
|
|
|
%suse_kernel_module_package -p %{_sourcedir}/preamble ec2 xenpae vmi um
|
2010-12-11 17:10:38 +01:00
|
|
|
|
|
2016-06-21 14:24:21 +02:00
|
|
|
|
%description kmp
|
2014-09-22 09:24:15 +02:00
|
|
|
|
Kernel modules supporting the openvswitch datapath.
|
2011-01-11 16:04:59 +01:00
|
|
|
|
%endif
|
2016-06-22 11:27:41 +02:00
|
|
|
|
%endif
|
2010-12-11 17:10:38 +01:00
|
|
|
|
|
2014-05-20 18:03:31 +02:00
|
|
|
|
%package devel
|
|
|
|
|
Summary: Open vSwitch Devel Libraries
|
|
|
|
|
License: Apache-2.0
|
2016-06-23 16:44:49 +02:00
|
|
|
|
Group: Development/Libraries/C and C++
|
2014-05-20 18:03:31 +02:00
|
|
|
|
Requires: %{name} = %{version}
|
2016-07-05 11:13:42 +02:00
|
|
|
|
Provides: openvswitch-any-devel = %{version}
|
2016-07-04 23:42:42 +02:00
|
|
|
|
%if %{with dpdk}
|
|
|
|
|
Conflicts: openvswitch-devel
|
|
|
|
|
%endif
|
2014-05-20 18:03:31 +02:00
|
|
|
|
|
2016-05-19 12:13:17 +02:00
|
|
|
|
%description devel
|
Accepting request 361282 from home:k_mroz:branches:network
- Don't install INSTALL.* files.
- Removed: openvswitch-switch.template
- New upstream version 2.4.0
- Flow table modifications are now atomic, meaning that each packet
now sees a coherent version of the OpenFlow pipeline. For
example, if a controller removes all flows with a single OpenFlow
"flow_mod", no packet sees an intermediate version of the OpenFlow
pipeline where only some of the flows have been deleted.
- Added support for SFQ, FQ_CoDel and CoDel qdiscs.
- Add bash command-line completion support for ovs-vsctl Please check
utilities/ovs-command-compgen.INSTALL.md for how to use.
- The MAC learning feature now includes per-port fairness to mitigate
MAC flooding attacks.
- New support for a "conjunctive match" OpenFlow extension, which
allows constructing OpenFlow matches of the form "field1 in
{a,b,c...} AND field2 in {d,e,f...}" and generalizations. For details,
see documentation for the "conjunction" action in ovs-ofctl(8).
- Add bash command-line completion support for ovs-appctl/ovs-dpctl/
ovs-ofctl/ovsdb-tool commands. Please check
utilities/ovs-command-compgen.INSTALL.md for how to use.
- The "learn" action supports a new flag "delete_learned" that causes
the learned flows to be deleted when the flow with the "learn" action
is deleted.
- Basic support for the Geneve tunneling protocol. It is not yet
possible to generate or match options. This is planned for a future
release. The protocol is documented at
http://tools.ietf.org/html/draft-gross-geneve-00
- The OVS database now reports controller rate limiting statistics.
OBS-URL: https://build.opensuse.org/request/show/361282
OBS-URL: https://build.opensuse.org/package/show/network/openvswitch?expand=0&rev=76
2016-02-26 16:24:36 +01:00
|
|
|
|
Devel libraries and headers for Open vSwitch.
|
2014-05-20 18:03:31 +02:00
|
|
|
|
|
2012-03-14 11:03:21 +01:00
|
|
|
|
%package switch
|
2013-03-27 13:25:19 +01:00
|
|
|
|
Summary: Open vSwitch switch implementations
|
2014-05-20 18:03:31 +02:00
|
|
|
|
License: Apache-2.0
|
2013-03-27 13:25:19 +01:00
|
|
|
|
Group: Productivity/Networking/System
|
2016-06-21 14:24:21 +02:00
|
|
|
|
Requires: %{name} = %{version}
|
2014-05-20 18:03:31 +02:00
|
|
|
|
Requires: modutils
|
2013-03-27 13:25:19 +01:00
|
|
|
|
Requires: procps
|
|
|
|
|
Requires: python
|
2014-05-20 18:03:31 +02:00
|
|
|
|
# ovs-ctl / ovs-pki use /usr/bin/uuidgen:
|
|
|
|
|
Requires: util-linux
|
2016-05-19 12:13:17 +02:00
|
|
|
|
Requires(post): %fillup_prereq
|
Accepting request 408658 from home:markoschandras:network
- Add missing licenses (bsc#988513)
- Misc spec file cleanups highlighted by the spec-cleaner tool.
- Allow aarch64 builds for openvswitch-dpdk
- Add missing bug references to 2.5.0 release.
old: network/openvswitch
new: home:markoschandras:network/openvswitch rev None
Index: openvswitch-dpdk.changes
===================================================================
--- openvswitch-dpdk.changes (revision 98)
+++ openvswitch-dpdk.changes (revision 46)
@@ -1,4 +1,11 @@
-------------------------------------------------------------------
+Tue Jul 12 10:41:14 UTC 2016 - mchandras@suse.de
+
+- Add missing licenses (bsc#988513)
+- Misc spec file cleanups highlighted by the spec-cleaner tool.
+- Allow aarch64 builds for openvswitch-dpdk
+
+-------------------------------------------------------------------
Mon Jul 4 12:08:06 UTC 2016 - mchandras@suse.de
- Allow the OvS daemon to run as non-root (bsc#987545)
@@ -197,6 +204,8 @@
- Added: ovn-northd.service
- TODO: Explicit DPDK support not yet added to spec.
- Spec file work and cleanup.
+- Includes fixes (or obsoletes) the following issues:
+ * bsc#948840, bsc#941466, bsc#936780, bnc#935750, bnc#867964
-------------------------------------------------------------------
Tue Mar 1 08:43:19 UTC 2016 - kmroz@suse.com
Index: openvswitch-dpdk.spec
===================================================================
--- openvswitch-dpdk.spec (revision 98)
+++ openvswitch-dpdk.spec (revision 46)
@@ -14,10 +14,9 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-
-
# needssslcertforbuild
+
# Disable building the external kernel datapath by default
%bcond_with kmp
# DPDK build disabled by default. It's enabled in the
@@ -26,14 +25,16 @@
# The testsuite is somewhat fragile for continuous testing in OBS
# but keep it here as an option
%bcond_with check
-
# Do NOT edit this auto generated file! Edit openvswitch.spec instead
# and run 'pre_checkin.sh' before committing
Name: openvswitch-dpdk
Version: 2.5.0
Release: 0
Summary: An open source, production quality, multilayer virtual switch (DPDK)
-License: Apache-2.0
+# All code is Apache-2.0 except
+# - lib/sflow* which is SISSL
+# - utilities/bugtool which is LGPL-2.1
+License: Apache-2.0 and LGPL-2.1 and SISSL
Group: Productivity/Networking/System
Url: http://openvswitch.org/
Source0: http://openvswitch.org/releases/openvswitch-%{version}.tar.gz
@@ -43,35 +44,26 @@
Source89: Module.supported.updates
# PATCH-FIX-UPSTREAM openvswitch-2.5.0-detect-dpdk-installation.patch
Patch0: openvswitch-%{version}-detect-dpdk-installation.patch
-Patch1: 0001-Remove-broken-pipe-warning-logs-from-ovsdb-server.lo.patch
+Patch1: 0001-Remove-broken-pipe-warning-logs-from-ovsdb-server.lo.patch
BuildRequires: autoconf
BuildRequires: automake
-%if %{with dpdk}
-# We need to be a bit strict with the dpdk version since
-# it's very possible for DPDK to change it's API between
-# releases. OVS currently requires 2.2.0. We may have to
-# provide multiple versions of dpdk if OVS and DPDK get
-# out of sync too often.
-BuildRequires: dpdk-devel = 2.2.0
-ExclusiveArch: x86_64 %ix86
-%endif
BuildRequires: fdupes
BuildRequires: gcc
BuildRequires: glibc-devel
BuildRequires: graphviz
BuildRequires: libcap-ng-devel
-BuildRequires: libopenssl-devel
BuildRequires: libtool
BuildRequires: make
BuildRequires: openssl
BuildRequires: perl
-BuildRequires: pkg-config
+BuildRequires: pkgconfig
# Needed by the testsuite
BuildRequires: procps
BuildRequires: python-devel
BuildRequires: python-xml
+BuildRequires: valgrind-devel
+BuildRequires: pkgconfig(openssl)
Requires: logrotate
-Requires: openssl
Requires: python
Provides: openvswitch-common = %{version}
Obsoletes: openvswitch-common < %{version}
@@ -79,10 +71,16 @@
Obsoletes: openvswitch-controller < %{version}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%py_requires
-BuildRequires: valgrind-devel
-# We can't have openvswitch and openvswitch-dpdk in parallel
%if %{with dpdk}
+# We need to be a bit strict with the dpdk version since
+# it's very possible for DPDK to change it's API between
+# releases. OVS currently requires 2.2.0. We may have to
+# provide multiple versions of dpdk if OVS and DPDK get
+# out of sync too often.
+BuildRequires: dpdk-devel = 2.2.0
+# We can't have openvswitch and openvswitch-dpdk in parallel
Conflicts: openvswitch
+ExclusiveArch: aarch64 x86_64 %{ix86}
%endif
%description
@@ -131,15 +129,15 @@
# ovs-ctl / ovs-pki use /usr/bin/uuidgen:
Requires: util-linux
Requires(post): %fillup_prereq
+Suggests: logrotate
Provides: openvswitch-any-switch = %{version}
+%{?systemd_requires}
%if %{with dpdk}
Conflicts: openvswitch-switch
%endif
-Suggests: logrotate
%if %{with kmp}
Suggests: openvswitch-kmp
%endif
-%{?systemd_requires}
%description switch
openvswitch-switch provides the userspace components and utilities for
@@ -246,7 +244,7 @@
Open vSwitch is a full-featured software-based Ethernet switch.
%prep
-%setup -n openvswitch-%{version} -q
+%setup -q -n openvswitch-%{version}
%patch0 -p1
%patch1 -p1
@@ -290,6 +288,7 @@
--disable-static \
--enable-libcapng \
--enable-shared \
+ --enable-ssl \
${dpdk_opt} \
--with-logdir=%{_localstatedir}/log/openvswitch
make %{?_smp_mflags}
@@ -301,7 +300,7 @@
# 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}" ||
+if make check TESTSUITEFLAGS="%{?_smp_mflags}" ||
make check TESTSUITEFLAGS='--recheck'; then :;
else
cat tests/testsuite.log
@@ -358,7 +357,7 @@
mv %{buildroot}%{_datadir}/openvswitch/python/* %{buildroot}%{py_sitedir}
rmdir %{buildroot}%{_datadir}/openvswitch/python
-rm -f %buildroot/%_libdir/*.la
+find %{buildroot} -type f -name "*.la" -delete -print
# Remove unpackaged files for the dpdk case
%if %{with dpdk}
@@ -438,26 +437,26 @@
%{_libdir}/libopenvswitch.so.*
%{_libdir}/libovsdb.so.*
%{_libdir}/libsflow.so.*
-%{_mandir}/man1/ovs-benchmark.1.gz
-%{_mandir}/man1/ovsdb-client.1.gz
-%{_mandir}/man8/ovs-appctl.8.gz
-%{_mandir}/man8/ovs-bugtool.8.gz
-%{_mandir}/man8/ovs-ofctl.8.gz
-%{_mandir}/man8/ovs-vlan-bug-workaround.8.gz
-%{_mandir}/man8/ovs-parse-backtrace.8.gz
-%{_mandir}/man8/ovs-dpctl-top.8.gz
+%{_mandir}/man1/ovs-benchmark.1%{ext_man}
+%{_mandir}/man1/ovsdb-client.1%{ext_man}
+%{_mandir}/man8/ovs-appctl.8%{ext_man}
+%{_mandir}/man8/ovs-bugtool.8%{ext_man}
+%{_mandir}/man8/ovs-ofctl.8%{ext_man}
+%{_mandir}/man8/ovs-vlan-bug-workaround.8%{ext_man}
+%{_mandir}/man8/ovs-parse-backtrace.8%{ext_man}
+%{_mandir}/man8/ovs-dpctl-top.8%{ext_man}
%{_sysconfdir}/bash_completion.d/ovs-appctl-bashcomp.bash
%files pki
%defattr(-,root,root)
-%{_mandir}/man8/ovs-pki.8.gz
+%{_mandir}/man8/ovs-pki.8%{ext_man}
%{_bindir}/ovs-pki
%files vtep
%defattr(-,root,root)
%{_bindir}/vtep-ctl
-%{_mandir}/man5/vtep.5.gz
-%{_mandir}/man8/vtep-ctl.8.gz
+%{_mandir}/man5/vtep.5%{ext_man}
+%{_mandir}/man8/vtep-ctl.8%{ext_man}
%{_datadir}/openvswitch/scripts/ovs-vtep
%{_datadir}/openvswitch/vtep.ovsschema
%{_libdir}/libvtep.so.*
@@ -489,15 +488,15 @@
%{_datadir}/openvswitch/vswitch.ovsschema
%{_sysconfdir}/bash_completion.d/ovs-vsctl-bashcomp.bash
%config(noreplace) %{_sysconfdir}/logrotate.d/openvswitch-switch
-%{_mandir}/man8/ovs-dpctl.8.gz
-%{_mandir}/man1/ovs-tcpundump.1.gz
-%{_mandir}/man1/ovs-pcap.1.gz
-%{_mandir}/man8/ovs-vsctl.8.gz
-%{_mandir}/man1/ovsdb-tool.1.gz
-%{_mandir}/man8/ovs-vswitchd.8.gz
-%{_mandir}/man1/ovsdb-server.1.gz
-%{_mandir}/man5/ovs-vswitchd.conf.db.5.gz
-%{_mandir}/man8/ovs-ctl.8.gz
+%{_mandir}/man8/ovs-dpctl.8%{ext_man}
+%{_mandir}/man1/ovs-tcpundump.1%{ext_man}
+%{_mandir}/man1/ovs-pcap.1%{ext_man}
+%{_mandir}/man8/ovs-vsctl.8%{ext_man}
+%{_mandir}/man1/ovsdb-tool.1%{ext_man}
+%{_mandir}/man8/ovs-vswitchd.8%{ext_man}
+%{_mandir}/man1/ovsdb-server.1%{ext_man}
+%{_mandir}/man5/ovs-vswitchd.conf.db.5%{ext_man}
+%{_mandir}/man8/ovs-ctl.8%{ext_man}
%{_sbindir}/rcopenvswitch
%{_unitdir}/openvswitch.service
%{_localstatedir}/adm/fillup-templates/sysconfig.openvswitch
@@ -538,10 +537,10 @@
%{_bindir}/ovs-l3ping
%{_bindir}/ovs-vlan-test
%{_bindir}/ovs-testcontroller
-%{_mandir}/man8/ovs-test.8.gz
-%{_mandir}/man8/ovs-l3ping.8.gz
-%{_mandir}/man8/ovs-vlan-test.8.gz
-%{_mandir}/man8/ovs-testcontroller.8.gz
+%{_mandir}/man8/ovs-test.8%{ext_man}
+%{_mandir}/man8/ovs-l3ping.8%{ext_man}
+%{_mandir}/man8/ovs-vlan-test.8%{ext_man}
+%{_mandir}/man8/ovs-testcontroller.8%{ext_man}
%files devel
%defattr(-,root,root)
Index: openvswitch.changes
===================================================================
--- openvswitch.changes (revision 98)
+++ openvswitch.changes (revision 46)
@@ -1,4 +1,11 @@
-------------------------------------------------------------------
+Tue Jul 12 10:41:14 UTC 2016 - mchandras@suse.de
+
+- Add missing licenses (bsc#988513)
+- Misc spec file cleanups highlighted by the spec-cleaner tool.
+- Allow aarch64 builds for openvswitch-dpdk
+
+-------------------------------------------------------------------
Mon Jul 4 12:08:06 UTC 2016 - mchandras@suse.de
- Allow the OvS daemon to run as non-root (bsc#987545)
@@ -197,6 +204,8 @@
- Added: ovn-northd.service
- TODO: Explicit DPDK support not yet added to spec.
- Spec file work and cleanup.
+- Includes fixes (or obsoletes) the following issues:
+ * bsc#948840, bsc#941466, bsc#936780, bnc#935750, bnc#867964
-------------------------------------------------------------------
Tue Mar 1 08:43:19 UTC 2016 - kmroz@suse.com
Index: openvswitch.spec
===================================================================
--- openvswitch.spec (revision 98)
+++ openvswitch.spec (revision 46)
@@ -14,10 +14,9 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-
-
# needssslcertforbuild
+
# Disable building the external kernel datapath by default
%bcond_with kmp
# DPDK build disabled by default. It's enabled in the
@@ -26,12 +25,14 @@
# The testsuite is somewhat fragile for continuous testing in OBS
# but keep it here as an option
%bcond_with check
-
Name: openvswitch
Version: 2.5.0
Release: 0
Summary: An open source, production quality, multilayer virtual switch
-License: Apache-2.0
+# All code is Apache-2.0 except
+# - lib/sflow* which is SISSL
+# - utilities/bugtool which is LGPL-2.1
+License: Apache-2.0 and LGPL-2.1 and SISSL
Group: Productivity/Networking/System
Url: http://openvswitch.org/
Source0: http://openvswitch.org/releases/openvswitch-%{version}.tar.gz
@@ -41,35 +42,26 @@
Source89: Module.supported.updates
# PATCH-FIX-UPSTREAM openvswitch-2.5.0-detect-dpdk-installation.patch
Patch0: openvswitch-%{version}-detect-dpdk-installation.patch
-Patch1: 0001-Remove-broken-pipe-warning-logs-from-ovsdb-server.lo.patch
+Patch1: 0001-Remove-broken-pipe-warning-logs-from-ovsdb-server.lo.patch
BuildRequires: autoconf
BuildRequires: automake
-%if %{with dpdk}
-# We need to be a bit strict with the dpdk version since
-# it's very possible for DPDK to change it's API between
-# releases. OVS currently requires 2.2.0. We may have to
-# provide multiple versions of dpdk if OVS and DPDK get
-# out of sync too often.
-BuildRequires: dpdk-devel = 2.2.0
-ExclusiveArch: x86_64 %ix86
-%endif
BuildRequires: fdupes
BuildRequires: gcc
BuildRequires: glibc-devel
BuildRequires: graphviz
BuildRequires: libcap-ng-devel
-BuildRequires: libopenssl-devel
BuildRequires: libtool
BuildRequires: make
BuildRequires: openssl
BuildRequires: perl
-BuildRequires: pkg-config
+BuildRequires: pkgconfig
# Needed by the testsuite
BuildRequires: procps
BuildRequires: python-devel
BuildRequires: python-xml
+BuildRequires: valgrind-devel
+BuildRequires: pkgconfig(openssl)
Requires: logrotate
-Requires: openssl
Requires: python
Provides: openvswitch-common = %{version}
Obsoletes: openvswitch-common < %{version}
@@ -77,10 +69,16 @@
Obsoletes: openvswitch-controller < %{version}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%py_requires
-BuildRequires: valgrind-devel
-# We can't have openvswitch and openvswitch-dpdk in parallel
%if %{with dpdk}
+# We need to be a bit strict with the dpdk version since
+# it's very possible for DPDK to change it's API between
+# releases. OVS currently requires 2.2.0. We may have to
+# provide multiple versions of dpdk if OVS and DPDK get
+# out of sync too often.
+BuildRequires: dpdk-devel = 2.2.0
+# We can't have openvswitch and openvswitch-dpdk in parallel
Conflicts: openvswitch
+ExclusiveArch: aarch64 x86_64 %{ix86}
%endif
%description
@@ -129,15 +127,15 @@
# ovs-ctl / ovs-pki use /usr/bin/uuidgen:
Requires: util-linux
Requires(post): %fillup_prereq
+Suggests: logrotate
Provides: openvswitch-any-switch = %{version}
+%{?systemd_requires}
%if %{with dpdk}
Conflicts: openvswitch-switch
%endif
-Suggests: logrotate
%if %{with kmp}
Suggests: openvswitch-kmp
%endif
-%{?systemd_requires}
%description switch
openvswitch-switch provides the userspace components and utilities for
@@ -244,7 +242,7 @@
Open vSwitch is a full-featured software-based Ethernet switch.
%prep
-%setup -n openvswitch-%{version} -q
+%setup -q -n openvswitch-%{version}
%patch0 -p1
%patch1 -p1
@@ -288,6 +286,7 @@
--disable-static \
--enable-libcapng \
--enable-shared \
+ --enable-ssl \
${dpdk_opt} \
--with-logdir=%{_localstatedir}/log/openvswitch
make %{?_smp_mflags}
@@ -299,7 +298,7 @@
# 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}" ||
+if make check TESTSUITEFLAGS="%{?_smp_mflags}" ||
make check TESTSUITEFLAGS='--recheck'; then :;
else
cat tests/testsuite.log
@@ -356,7 +355,7 @@
mv %{buildroot}%{_datadir}/openvswitch/python/* %{buildroot}%{py_sitedir}
rmdir %{buildroot}%{_datadir}/openvswitch/python
-rm -f %buildroot/%_libdir/*.la
+find %{buildroot} -type f -name "*.la" -delete -print
# Remove unpackaged files for the dpdk case
%if %{with dpdk}
@@ -436,26 +435,26 @@
%{_libdir}/libopenvswitch.so.*
%{_libdir}/libovsdb.so.*
%{_libdir}/libsflow.so.*
-%{_mandir}/man1/ovs-benchmark.1.gz
-%{_mandir}/man1/ovsdb-client.1.gz
-%{_mandir}/man8/ovs-appctl.8.gz
-%{_mandir}/man8/ovs-bugtool.8.gz
-%{_mandir}/man8/ovs-ofctl.8.gz
-%{_mandir}/man8/ovs-vlan-bug-workaround.8.gz
-%{_mandir}/man8/ovs-parse-backtrace.8.gz
-%{_mandir}/man8/ovs-dpctl-top.8.gz
+%{_mandir}/man1/ovs-benchmark.1%{ext_man}
+%{_mandir}/man1/ovsdb-client.1%{ext_man}
+%{_mandir}/man8/ovs-appctl.8%{ext_man}
+%{_mandir}/man8/ovs-bugtool.8%{ext_man}
+%{_mandir}/man8/ovs-ofctl.8%{ext_man}
+%{_mandir}/man8/ovs-vlan-bug-workaround.8%{ext_man}
+%{_mandir}/man8/ovs-parse-backtrace.8%{ext_man}
+%{_mandir}/man8/ovs-dpctl-top.8%{ext_man}
%{_sysconfdir}/bash_completion.d/ovs-appctl-bashcomp.bash
%files pki
%defattr(-,root,root)
-%{_mandir}/man8/ovs-pki.8.gz
+%{_mandir}/man8/ovs-pki.8%{ext_man}
%{_bindir}/ovs-pki
%files vtep
%defattr(-,root,root)
%{_bindir}/vtep-ctl
-%{_mandir}/man5/vtep.5.gz
-%{_mandir}/man8/vtep-ctl.8.gz
+%{_mandir}/man5/vtep.5%{ext_man}
+%{_mandir}/man8/vtep-ctl.8%{ext_man}
%{_datadir}/openvswitch/scripts/ovs-vtep
%{_datadir}/openvswitch/vtep.ovsschema
%{_libdir}/libvtep.so.*
@@ -487,15 +486,15 @@
%{_datadir}/openvswitch/vswitch.ovsschema
%{_sysconfdir}/bash_completion.d/ovs-vsctl-bashcomp.bash
%config(noreplace) %{_sysconfdir}/logrotate.d/openvswitch-switch
-%{_mandir}/man8/ovs-dpctl.8.gz
-%{_mandir}/man1/ovs-tcpundump.1.gz
-%{_mandir}/man1/ovs-pcap.1.gz
-%{_mandir}/man8/ovs-vsctl.8.gz
-%{_mandir}/man1/ovsdb-tool.1.gz
-%{_mandir}/man8/ovs-vswitchd.8.gz
-%{_mandir}/man1/ovsdb-server.1.gz
-%{_mandir}/man5/ovs-vswitchd.conf.db.5.gz
-%{_mandir}/man8/ovs-ctl.8.gz
+%{_mandir}/man8/ovs-dpctl.8%{ext_man}
+%{_mandir}/man1/ovs-tcpundump.1%{ext_man}
+%{_mandir}/man1/ovs-pcap.1%{ext_man}
+%{_mandir}/man8/ovs-vsctl.8%{ext_man}
+%{_mandir}/man1/ovsdb-tool.1%{ext_man}
+%{_mandir}/man8/ovs-vswitchd.8%{ext_man}
+%{_mandir}/man1/ovsdb-server.1%{ext_man}
+%{_mandir}/man5/ovs-vswitchd.conf.db.5%{ext_man}
+%{_mandir}/man8/ovs-ctl.8%{ext_man}
%{_sbindir}/rcopenvswitch
%{_unitdir}/openvswitch.service
%{_localstatedir}/adm/fillup-templates/sysconfig.openvswitch
@@ -536,10 +535,10 @@
%{_bindir}/ovs-l3ping
%{_bindir}/ovs-vlan-test
%{_bindir}/ovs-testcontroller
-%{_mandir}/man8/ovs-test.8.gz
-%{_mandir}/man8/ovs-l3ping.8.gz
-%{_mandir}/man8/ovs-vlan-test.8.gz
-%{_mandir}/man8/ovs-testcontroller.8.gz
+%{_mandir}/man8/ovs-test.8%{ext_man}
+%{_mandir}/man8/ovs-l3ping.8%{ext_man}
+%{_mandir}/man8/ovs-vlan-test.8%{ext_man}
+%{_mandir}/man8/ovs-testcontroller.8%{ext_man}
%files devel
%defattr(-,root,root)
OBS-URL: https://build.opensuse.org/request/show/408658
OBS-URL: https://build.opensuse.org/package/show/network/openvswitch?expand=0&rev=99
2016-07-18 10:19:36 +02:00
|
|
|
|
Suggests: logrotate
|
2016-06-22 11:27:41 +02:00
|
|
|
|
Provides: openvswitch-any-switch = %{version}
|
Accepting request 408658 from home:markoschandras:network
- Add missing licenses (bsc#988513)
- Misc spec file cleanups highlighted by the spec-cleaner tool.
- Allow aarch64 builds for openvswitch-dpdk
- Add missing bug references to 2.5.0 release.
old: network/openvswitch
new: home:markoschandras:network/openvswitch rev None
Index: openvswitch-dpdk.changes
===================================================================
--- openvswitch-dpdk.changes (revision 98)
+++ openvswitch-dpdk.changes (revision 46)
@@ -1,4 +1,11 @@
-------------------------------------------------------------------
+Tue Jul 12 10:41:14 UTC 2016 - mchandras@suse.de
+
+- Add missing licenses (bsc#988513)
+- Misc spec file cleanups highlighted by the spec-cleaner tool.
+- Allow aarch64 builds for openvswitch-dpdk
+
+-------------------------------------------------------------------
Mon Jul 4 12:08:06 UTC 2016 - mchandras@suse.de
- Allow the OvS daemon to run as non-root (bsc#987545)
@@ -197,6 +204,8 @@
- Added: ovn-northd.service
- TODO: Explicit DPDK support not yet added to spec.
- Spec file work and cleanup.
+- Includes fixes (or obsoletes) the following issues:
+ * bsc#948840, bsc#941466, bsc#936780, bnc#935750, bnc#867964
-------------------------------------------------------------------
Tue Mar 1 08:43:19 UTC 2016 - kmroz@suse.com
Index: openvswitch-dpdk.spec
===================================================================
--- openvswitch-dpdk.spec (revision 98)
+++ openvswitch-dpdk.spec (revision 46)
@@ -14,10 +14,9 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-
-
# needssslcertforbuild
+
# Disable building the external kernel datapath by default
%bcond_with kmp
# DPDK build disabled by default. It's enabled in the
@@ -26,14 +25,16 @@
# The testsuite is somewhat fragile for continuous testing in OBS
# but keep it here as an option
%bcond_with check
-
# Do NOT edit this auto generated file! Edit openvswitch.spec instead
# and run 'pre_checkin.sh' before committing
Name: openvswitch-dpdk
Version: 2.5.0
Release: 0
Summary: An open source, production quality, multilayer virtual switch (DPDK)
-License: Apache-2.0
+# All code is Apache-2.0 except
+# - lib/sflow* which is SISSL
+# - utilities/bugtool which is LGPL-2.1
+License: Apache-2.0 and LGPL-2.1 and SISSL
Group: Productivity/Networking/System
Url: http://openvswitch.org/
Source0: http://openvswitch.org/releases/openvswitch-%{version}.tar.gz
@@ -43,35 +44,26 @@
Source89: Module.supported.updates
# PATCH-FIX-UPSTREAM openvswitch-2.5.0-detect-dpdk-installation.patch
Patch0: openvswitch-%{version}-detect-dpdk-installation.patch
-Patch1: 0001-Remove-broken-pipe-warning-logs-from-ovsdb-server.lo.patch
+Patch1: 0001-Remove-broken-pipe-warning-logs-from-ovsdb-server.lo.patch
BuildRequires: autoconf
BuildRequires: automake
-%if %{with dpdk}
-# We need to be a bit strict with the dpdk version since
-# it's very possible for DPDK to change it's API between
-# releases. OVS currently requires 2.2.0. We may have to
-# provide multiple versions of dpdk if OVS and DPDK get
-# out of sync too often.
-BuildRequires: dpdk-devel = 2.2.0
-ExclusiveArch: x86_64 %ix86
-%endif
BuildRequires: fdupes
BuildRequires: gcc
BuildRequires: glibc-devel
BuildRequires: graphviz
BuildRequires: libcap-ng-devel
-BuildRequires: libopenssl-devel
BuildRequires: libtool
BuildRequires: make
BuildRequires: openssl
BuildRequires: perl
-BuildRequires: pkg-config
+BuildRequires: pkgconfig
# Needed by the testsuite
BuildRequires: procps
BuildRequires: python-devel
BuildRequires: python-xml
+BuildRequires: valgrind-devel
+BuildRequires: pkgconfig(openssl)
Requires: logrotate
-Requires: openssl
Requires: python
Provides: openvswitch-common = %{version}
Obsoletes: openvswitch-common < %{version}
@@ -79,10 +71,16 @@
Obsoletes: openvswitch-controller < %{version}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%py_requires
-BuildRequires: valgrind-devel
-# We can't have openvswitch and openvswitch-dpdk in parallel
%if %{with dpdk}
+# We need to be a bit strict with the dpdk version since
+# it's very possible for DPDK to change it's API between
+# releases. OVS currently requires 2.2.0. We may have to
+# provide multiple versions of dpdk if OVS and DPDK get
+# out of sync too often.
+BuildRequires: dpdk-devel = 2.2.0
+# We can't have openvswitch and openvswitch-dpdk in parallel
Conflicts: openvswitch
+ExclusiveArch: aarch64 x86_64 %{ix86}
%endif
%description
@@ -131,15 +129,15 @@
# ovs-ctl / ovs-pki use /usr/bin/uuidgen:
Requires: util-linux
Requires(post): %fillup_prereq
+Suggests: logrotate
Provides: openvswitch-any-switch = %{version}
+%{?systemd_requires}
%if %{with dpdk}
Conflicts: openvswitch-switch
%endif
-Suggests: logrotate
%if %{with kmp}
Suggests: openvswitch-kmp
%endif
-%{?systemd_requires}
%description switch
openvswitch-switch provides the userspace components and utilities for
@@ -246,7 +244,7 @@
Open vSwitch is a full-featured software-based Ethernet switch.
%prep
-%setup -n openvswitch-%{version} -q
+%setup -q -n openvswitch-%{version}
%patch0 -p1
%patch1 -p1
@@ -290,6 +288,7 @@
--disable-static \
--enable-libcapng \
--enable-shared \
+ --enable-ssl \
${dpdk_opt} \
--with-logdir=%{_localstatedir}/log/openvswitch
make %{?_smp_mflags}
@@ -301,7 +300,7 @@
# 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}" ||
+if make check TESTSUITEFLAGS="%{?_smp_mflags}" ||
make check TESTSUITEFLAGS='--recheck'; then :;
else
cat tests/testsuite.log
@@ -358,7 +357,7 @@
mv %{buildroot}%{_datadir}/openvswitch/python/* %{buildroot}%{py_sitedir}
rmdir %{buildroot}%{_datadir}/openvswitch/python
-rm -f %buildroot/%_libdir/*.la
+find %{buildroot} -type f -name "*.la" -delete -print
# Remove unpackaged files for the dpdk case
%if %{with dpdk}
@@ -438,26 +437,26 @@
%{_libdir}/libopenvswitch.so.*
%{_libdir}/libovsdb.so.*
%{_libdir}/libsflow.so.*
-%{_mandir}/man1/ovs-benchmark.1.gz
-%{_mandir}/man1/ovsdb-client.1.gz
-%{_mandir}/man8/ovs-appctl.8.gz
-%{_mandir}/man8/ovs-bugtool.8.gz
-%{_mandir}/man8/ovs-ofctl.8.gz
-%{_mandir}/man8/ovs-vlan-bug-workaround.8.gz
-%{_mandir}/man8/ovs-parse-backtrace.8.gz
-%{_mandir}/man8/ovs-dpctl-top.8.gz
+%{_mandir}/man1/ovs-benchmark.1%{ext_man}
+%{_mandir}/man1/ovsdb-client.1%{ext_man}
+%{_mandir}/man8/ovs-appctl.8%{ext_man}
+%{_mandir}/man8/ovs-bugtool.8%{ext_man}
+%{_mandir}/man8/ovs-ofctl.8%{ext_man}
+%{_mandir}/man8/ovs-vlan-bug-workaround.8%{ext_man}
+%{_mandir}/man8/ovs-parse-backtrace.8%{ext_man}
+%{_mandir}/man8/ovs-dpctl-top.8%{ext_man}
%{_sysconfdir}/bash_completion.d/ovs-appctl-bashcomp.bash
%files pki
%defattr(-,root,root)
-%{_mandir}/man8/ovs-pki.8.gz
+%{_mandir}/man8/ovs-pki.8%{ext_man}
%{_bindir}/ovs-pki
%files vtep
%defattr(-,root,root)
%{_bindir}/vtep-ctl
-%{_mandir}/man5/vtep.5.gz
-%{_mandir}/man8/vtep-ctl.8.gz
+%{_mandir}/man5/vtep.5%{ext_man}
+%{_mandir}/man8/vtep-ctl.8%{ext_man}
%{_datadir}/openvswitch/scripts/ovs-vtep
%{_datadir}/openvswitch/vtep.ovsschema
%{_libdir}/libvtep.so.*
@@ -489,15 +488,15 @@
%{_datadir}/openvswitch/vswitch.ovsschema
%{_sysconfdir}/bash_completion.d/ovs-vsctl-bashcomp.bash
%config(noreplace) %{_sysconfdir}/logrotate.d/openvswitch-switch
-%{_mandir}/man8/ovs-dpctl.8.gz
-%{_mandir}/man1/ovs-tcpundump.1.gz
-%{_mandir}/man1/ovs-pcap.1.gz
-%{_mandir}/man8/ovs-vsctl.8.gz
-%{_mandir}/man1/ovsdb-tool.1.gz
-%{_mandir}/man8/ovs-vswitchd.8.gz
-%{_mandir}/man1/ovsdb-server.1.gz
-%{_mandir}/man5/ovs-vswitchd.conf.db.5.gz
-%{_mandir}/man8/ovs-ctl.8.gz
+%{_mandir}/man8/ovs-dpctl.8%{ext_man}
+%{_mandir}/man1/ovs-tcpundump.1%{ext_man}
+%{_mandir}/man1/ovs-pcap.1%{ext_man}
+%{_mandir}/man8/ovs-vsctl.8%{ext_man}
+%{_mandir}/man1/ovsdb-tool.1%{ext_man}
+%{_mandir}/man8/ovs-vswitchd.8%{ext_man}
+%{_mandir}/man1/ovsdb-server.1%{ext_man}
+%{_mandir}/man5/ovs-vswitchd.conf.db.5%{ext_man}
+%{_mandir}/man8/ovs-ctl.8%{ext_man}
%{_sbindir}/rcopenvswitch
%{_unitdir}/openvswitch.service
%{_localstatedir}/adm/fillup-templates/sysconfig.openvswitch
@@ -538,10 +537,10 @@
%{_bindir}/ovs-l3ping
%{_bindir}/ovs-vlan-test
%{_bindir}/ovs-testcontroller
-%{_mandir}/man8/ovs-test.8.gz
-%{_mandir}/man8/ovs-l3ping.8.gz
-%{_mandir}/man8/ovs-vlan-test.8.gz
-%{_mandir}/man8/ovs-testcontroller.8.gz
+%{_mandir}/man8/ovs-test.8%{ext_man}
+%{_mandir}/man8/ovs-l3ping.8%{ext_man}
+%{_mandir}/man8/ovs-vlan-test.8%{ext_man}
+%{_mandir}/man8/ovs-testcontroller.8%{ext_man}
%files devel
%defattr(-,root,root)
Index: openvswitch.changes
===================================================================
--- openvswitch.changes (revision 98)
+++ openvswitch.changes (revision 46)
@@ -1,4 +1,11 @@
-------------------------------------------------------------------
+Tue Jul 12 10:41:14 UTC 2016 - mchandras@suse.de
+
+- Add missing licenses (bsc#988513)
+- Misc spec file cleanups highlighted by the spec-cleaner tool.
+- Allow aarch64 builds for openvswitch-dpdk
+
+-------------------------------------------------------------------
Mon Jul 4 12:08:06 UTC 2016 - mchandras@suse.de
- Allow the OvS daemon to run as non-root (bsc#987545)
@@ -197,6 +204,8 @@
- Added: ovn-northd.service
- TODO: Explicit DPDK support not yet added to spec.
- Spec file work and cleanup.
+- Includes fixes (or obsoletes) the following issues:
+ * bsc#948840, bsc#941466, bsc#936780, bnc#935750, bnc#867964
-------------------------------------------------------------------
Tue Mar 1 08:43:19 UTC 2016 - kmroz@suse.com
Index: openvswitch.spec
===================================================================
--- openvswitch.spec (revision 98)
+++ openvswitch.spec (revision 46)
@@ -14,10 +14,9 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-
-
# needssslcertforbuild
+
# Disable building the external kernel datapath by default
%bcond_with kmp
# DPDK build disabled by default. It's enabled in the
@@ -26,12 +25,14 @@
# The testsuite is somewhat fragile for continuous testing in OBS
# but keep it here as an option
%bcond_with check
-
Name: openvswitch
Version: 2.5.0
Release: 0
Summary: An open source, production quality, multilayer virtual switch
-License: Apache-2.0
+# All code is Apache-2.0 except
+# - lib/sflow* which is SISSL
+# - utilities/bugtool which is LGPL-2.1
+License: Apache-2.0 and LGPL-2.1 and SISSL
Group: Productivity/Networking/System
Url: http://openvswitch.org/
Source0: http://openvswitch.org/releases/openvswitch-%{version}.tar.gz
@@ -41,35 +42,26 @@
Source89: Module.supported.updates
# PATCH-FIX-UPSTREAM openvswitch-2.5.0-detect-dpdk-installation.patch
Patch0: openvswitch-%{version}-detect-dpdk-installation.patch
-Patch1: 0001-Remove-broken-pipe-warning-logs-from-ovsdb-server.lo.patch
+Patch1: 0001-Remove-broken-pipe-warning-logs-from-ovsdb-server.lo.patch
BuildRequires: autoconf
BuildRequires: automake
-%if %{with dpdk}
-# We need to be a bit strict with the dpdk version since
-# it's very possible for DPDK to change it's API between
-# releases. OVS currently requires 2.2.0. We may have to
-# provide multiple versions of dpdk if OVS and DPDK get
-# out of sync too often.
-BuildRequires: dpdk-devel = 2.2.0
-ExclusiveArch: x86_64 %ix86
-%endif
BuildRequires: fdupes
BuildRequires: gcc
BuildRequires: glibc-devel
BuildRequires: graphviz
BuildRequires: libcap-ng-devel
-BuildRequires: libopenssl-devel
BuildRequires: libtool
BuildRequires: make
BuildRequires: openssl
BuildRequires: perl
-BuildRequires: pkg-config
+BuildRequires: pkgconfig
# Needed by the testsuite
BuildRequires: procps
BuildRequires: python-devel
BuildRequires: python-xml
+BuildRequires: valgrind-devel
+BuildRequires: pkgconfig(openssl)
Requires: logrotate
-Requires: openssl
Requires: python
Provides: openvswitch-common = %{version}
Obsoletes: openvswitch-common < %{version}
@@ -77,10 +69,16 @@
Obsoletes: openvswitch-controller < %{version}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%py_requires
-BuildRequires: valgrind-devel
-# We can't have openvswitch and openvswitch-dpdk in parallel
%if %{with dpdk}
+# We need to be a bit strict with the dpdk version since
+# it's very possible for DPDK to change it's API between
+# releases. OVS currently requires 2.2.0. We may have to
+# provide multiple versions of dpdk if OVS and DPDK get
+# out of sync too often.
+BuildRequires: dpdk-devel = 2.2.0
+# We can't have openvswitch and openvswitch-dpdk in parallel
Conflicts: openvswitch
+ExclusiveArch: aarch64 x86_64 %{ix86}
%endif
%description
@@ -129,15 +127,15 @@
# ovs-ctl / ovs-pki use /usr/bin/uuidgen:
Requires: util-linux
Requires(post): %fillup_prereq
+Suggests: logrotate
Provides: openvswitch-any-switch = %{version}
+%{?systemd_requires}
%if %{with dpdk}
Conflicts: openvswitch-switch
%endif
-Suggests: logrotate
%if %{with kmp}
Suggests: openvswitch-kmp
%endif
-%{?systemd_requires}
%description switch
openvswitch-switch provides the userspace components and utilities for
@@ -244,7 +242,7 @@
Open vSwitch is a full-featured software-based Ethernet switch.
%prep
-%setup -n openvswitch-%{version} -q
+%setup -q -n openvswitch-%{version}
%patch0 -p1
%patch1 -p1
@@ -288,6 +286,7 @@
--disable-static \
--enable-libcapng \
--enable-shared \
+ --enable-ssl \
${dpdk_opt} \
--with-logdir=%{_localstatedir}/log/openvswitch
make %{?_smp_mflags}
@@ -299,7 +298,7 @@
# 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}" ||
+if make check TESTSUITEFLAGS="%{?_smp_mflags}" ||
make check TESTSUITEFLAGS='--recheck'; then :;
else
cat tests/testsuite.log
@@ -356,7 +355,7 @@
mv %{buildroot}%{_datadir}/openvswitch/python/* %{buildroot}%{py_sitedir}
rmdir %{buildroot}%{_datadir}/openvswitch/python
-rm -f %buildroot/%_libdir/*.la
+find %{buildroot} -type f -name "*.la" -delete -print
# Remove unpackaged files for the dpdk case
%if %{with dpdk}
@@ -436,26 +435,26 @@
%{_libdir}/libopenvswitch.so.*
%{_libdir}/libovsdb.so.*
%{_libdir}/libsflow.so.*
-%{_mandir}/man1/ovs-benchmark.1.gz
-%{_mandir}/man1/ovsdb-client.1.gz
-%{_mandir}/man8/ovs-appctl.8.gz
-%{_mandir}/man8/ovs-bugtool.8.gz
-%{_mandir}/man8/ovs-ofctl.8.gz
-%{_mandir}/man8/ovs-vlan-bug-workaround.8.gz
-%{_mandir}/man8/ovs-parse-backtrace.8.gz
-%{_mandir}/man8/ovs-dpctl-top.8.gz
+%{_mandir}/man1/ovs-benchmark.1%{ext_man}
+%{_mandir}/man1/ovsdb-client.1%{ext_man}
+%{_mandir}/man8/ovs-appctl.8%{ext_man}
+%{_mandir}/man8/ovs-bugtool.8%{ext_man}
+%{_mandir}/man8/ovs-ofctl.8%{ext_man}
+%{_mandir}/man8/ovs-vlan-bug-workaround.8%{ext_man}
+%{_mandir}/man8/ovs-parse-backtrace.8%{ext_man}
+%{_mandir}/man8/ovs-dpctl-top.8%{ext_man}
%{_sysconfdir}/bash_completion.d/ovs-appctl-bashcomp.bash
%files pki
%defattr(-,root,root)
-%{_mandir}/man8/ovs-pki.8.gz
+%{_mandir}/man8/ovs-pki.8%{ext_man}
%{_bindir}/ovs-pki
%files vtep
%defattr(-,root,root)
%{_bindir}/vtep-ctl
-%{_mandir}/man5/vtep.5.gz
-%{_mandir}/man8/vtep-ctl.8.gz
+%{_mandir}/man5/vtep.5%{ext_man}
+%{_mandir}/man8/vtep-ctl.8%{ext_man}
%{_datadir}/openvswitch/scripts/ovs-vtep
%{_datadir}/openvswitch/vtep.ovsschema
%{_libdir}/libvtep.so.*
@@ -487,15 +486,15 @@
%{_datadir}/openvswitch/vswitch.ovsschema
%{_sysconfdir}/bash_completion.d/ovs-vsctl-bashcomp.bash
%config(noreplace) %{_sysconfdir}/logrotate.d/openvswitch-switch
-%{_mandir}/man8/ovs-dpctl.8.gz
-%{_mandir}/man1/ovs-tcpundump.1.gz
-%{_mandir}/man1/ovs-pcap.1.gz
-%{_mandir}/man8/ovs-vsctl.8.gz
-%{_mandir}/man1/ovsdb-tool.1.gz
-%{_mandir}/man8/ovs-vswitchd.8.gz
-%{_mandir}/man1/ovsdb-server.1.gz
-%{_mandir}/man5/ovs-vswitchd.conf.db.5.gz
-%{_mandir}/man8/ovs-ctl.8.gz
+%{_mandir}/man8/ovs-dpctl.8%{ext_man}
+%{_mandir}/man1/ovs-tcpundump.1%{ext_man}
+%{_mandir}/man1/ovs-pcap.1%{ext_man}
+%{_mandir}/man8/ovs-vsctl.8%{ext_man}
+%{_mandir}/man1/ovsdb-tool.1%{ext_man}
+%{_mandir}/man8/ovs-vswitchd.8%{ext_man}
+%{_mandir}/man1/ovsdb-server.1%{ext_man}
+%{_mandir}/man5/ovs-vswitchd.conf.db.5%{ext_man}
+%{_mandir}/man8/ovs-ctl.8%{ext_man}
%{_sbindir}/rcopenvswitch
%{_unitdir}/openvswitch.service
%{_localstatedir}/adm/fillup-templates/sysconfig.openvswitch
@@ -536,10 +535,10 @@
%{_bindir}/ovs-l3ping
%{_bindir}/ovs-vlan-test
%{_bindir}/ovs-testcontroller
-%{_mandir}/man8/ovs-test.8.gz
-%{_mandir}/man8/ovs-l3ping.8.gz
-%{_mandir}/man8/ovs-vlan-test.8.gz
-%{_mandir}/man8/ovs-testcontroller.8.gz
+%{_mandir}/man8/ovs-test.8%{ext_man}
+%{_mandir}/man8/ovs-l3ping.8%{ext_man}
+%{_mandir}/man8/ovs-vlan-test.8%{ext_man}
+%{_mandir}/man8/ovs-testcontroller.8%{ext_man}
%files devel
%defattr(-,root,root)
OBS-URL: https://build.opensuse.org/request/show/408658
OBS-URL: https://build.opensuse.org/package/show/network/openvswitch?expand=0&rev=99
2016-07-18 10:19:36 +02:00
|
|
|
|
%{?systemd_requires}
|
2016-07-05 11:13:42 +02:00
|
|
|
|
%if %{with dpdk}
|
|
|
|
|
Conflicts: openvswitch-switch
|
|
|
|
|
%endif
|
2016-06-22 11:27:41 +02:00
|
|
|
|
%if %{with kmp}
|
|
|
|
|
Suggests: openvswitch-kmp
|
|
|
|
|
%endif
|
2014-05-20 18:03:31 +02:00
|
|
|
|
|
2012-03-14 11:03:21 +01:00
|
|
|
|
%description switch
|
|
|
|
|
openvswitch-switch provides the userspace components and utilities for
|
2013-03-27 13:25:19 +01:00
|
|
|
|
the Open vSwitch kernel-based switch.
|
2012-03-14 11:03:21 +01:00
|
|
|
|
|
|
|
|
|
Open vSwitch is a full-featured software-based Ethernet switch.
|
|
|
|
|
|
2016-03-09 18:19:55 +01:00
|
|
|
|
%package ovn
|
|
|
|
|
Summary: Open vSwitch - Open Virtual Network support
|
|
|
|
|
License: Apache-2.0
|
|
|
|
|
Group: Productivity/Networking/System
|
2016-06-21 14:24:21 +02:00
|
|
|
|
Requires: %{name} = %{version}
|
|
|
|
|
Requires: %{name}-switch = %{version}
|
|
|
|
|
Requires: %{name}-vtep = %{version}
|
2016-06-22 11:27:41 +02:00
|
|
|
|
Provides: openvswitch-any-ovn = %{version}
|
2016-07-05 11:13:42 +02:00
|
|
|
|
%if %{with dpdk}
|
|
|
|
|
Conflicts: openvswitch-ovn
|
|
|
|
|
%endif
|
2016-03-09 18:19:55 +01:00
|
|
|
|
|
|
|
|
|
%description ovn
|
|
|
|
|
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.
|
|
|
|
|
|
2012-03-14 11:03:21 +01:00
|
|
|
|
%package pki
|
2013-03-27 13:25:19 +01:00
|
|
|
|
Summary: Open vSwitch public key infrastructure dependency package
|
2014-05-20 18:03:31 +02:00
|
|
|
|
License: Apache-2.0
|
2013-03-27 13:25:19 +01:00
|
|
|
|
Group: Productivity/Networking/System
|
2016-06-21 14:24:21 +02:00
|
|
|
|
Requires: %{name} = %{version}
|
2016-06-22 11:27:41 +02:00
|
|
|
|
Provides: openvswitch-any-pki = %{version}
|
2016-07-05 11:13:42 +02:00
|
|
|
|
%if %{with dpdk}
|
|
|
|
|
Conflicts: openvswitch-pki
|
|
|
|
|
%endif
|
2013-03-08 15:12:33 +01:00
|
|
|
|
|
2012-03-14 11:03:21 +01:00
|
|
|
|
%description pki
|
|
|
|
|
openvswitch-pki provides PKI (public key infrastructure) support for
|
|
|
|
|
Open vSwitch switches and controllers, reducing the risk of
|
|
|
|
|
man-in-the-middle attacks on the Open vSwitch network infrastructure.
|
|
|
|
|
|
|
|
|
|
Open vSwitch is a full-featured software-based Ethernet switch.
|
|
|
|
|
|
2014-05-20 18:03:31 +02:00
|
|
|
|
%package vtep
|
|
|
|
|
Summary: Open vSwitch VTEP emulator
|
|
|
|
|
License: Apache-2.0
|
2013-03-27 13:25:19 +01:00
|
|
|
|
Group: Productivity/Networking/System
|
2016-06-21 14:24:21 +02:00
|
|
|
|
Requires: %{name} = %{version}
|
|
|
|
|
Requires: %{name}-switch = %{version}
|
2014-05-20 18:03:31 +02:00
|
|
|
|
# Since openvswitch/scripts/ovs-vtep requires various ovs python modules.
|
2016-06-28 16:58:40 +02:00
|
|
|
|
Requires: python-openvswitch = %{version}
|
2016-06-22 11:27:41 +02:00
|
|
|
|
Provides: openvswitch-any-vtep = %{version}
|
2016-07-05 11:13:42 +02:00
|
|
|
|
%if %{with dpdk}
|
|
|
|
|
Conflicts: openvswitch-vtep
|
|
|
|
|
%endif
|
2013-03-08 15:12:33 +01:00
|
|
|
|
|
2014-05-20 18:03:31 +02:00
|
|
|
|
%description vtep
|
2016-06-23 16:44:49 +02:00
|
|
|
|
A VTEP (VXLAN Tunnel EndPoint) emulator that uses Open vSwitch for
|
|
|
|
|
forwarding.
|
2012-03-14 11:03:21 +01:00
|
|
|
|
|
|
|
|
|
Open vSwitch is a full-featured software-based Ethernet switch.
|
|
|
|
|
|
2016-06-22 11:27:41 +02:00
|
|
|
|
%if ! %{with dpdk}
|
2016-06-28 16:58:40 +02:00
|
|
|
|
%package -n python-openvswitch
|
2013-03-27 13:25:19 +01:00
|
|
|
|
Summary: Python bindings for Open vSwitch
|
2014-05-20 18:03:31 +02:00
|
|
|
|
License: Python-2.0
|
2013-03-27 13:25:19 +01:00
|
|
|
|
Group: Productivity/Networking/System
|
2016-06-22 11:27:41 +02:00
|
|
|
|
Requires: openvswitch-common = %{version}
|
2013-03-27 13:25:19 +01:00
|
|
|
|
Requires: python
|
2013-03-08 15:12:33 +01:00
|
|
|
|
|
2016-06-28 16:58:40 +02:00
|
|
|
|
%description -n python-openvswitch
|
2012-03-14 11:03:21 +01:00
|
|
|
|
This package contains the full Python bindings for Open vSwitch database.
|
|
|
|
|
|
2016-06-28 16:58:40 +02:00
|
|
|
|
%package -n python-openvswitch-test
|
2013-03-27 13:25:19 +01:00
|
|
|
|
Summary: Python bindings for Open vSwitch
|
2014-05-20 18:03:31 +02:00
|
|
|
|
License: Python-2.0
|
2013-03-27 13:25:19 +01:00
|
|
|
|
Group: Productivity/Networking/System
|
2016-06-22 11:27:41 +02:00
|
|
|
|
Requires: openvswitch-common = %{version}
|
2013-03-27 13:25:19 +01:00
|
|
|
|
Requires: python
|
2016-06-28 16:58:40 +02:00
|
|
|
|
Requires: python-openvswitch = %{version}
|
2016-03-09 18:19:55 +01:00
|
|
|
|
Requires: python-twisted
|
2013-03-08 15:12:33 +01:00
|
|
|
|
|
2016-06-28 16:58:40 +02:00
|
|
|
|
%description -n python-openvswitch-test
|
2013-03-08 15:12:33 +01:00
|
|
|
|
This package contains the full Python bindings for Open vSwitch database.
|
2016-06-22 11:27:41 +02:00
|
|
|
|
%endif
|
2013-03-08 15:12:33 +01:00
|
|
|
|
|
2012-03-14 11:03:21 +01:00
|
|
|
|
%package test
|
2013-03-27 13:25:19 +01:00
|
|
|
|
Summary: Open vSwitch test package
|
2014-05-20 18:03:31 +02:00
|
|
|
|
License: Apache-2.0
|
2013-03-27 13:25:19 +01:00
|
|
|
|
Group: Productivity/Networking/System
|
2016-06-21 14:24:21 +02:00
|
|
|
|
Requires: %{name} = %{version}
|
2013-03-27 13:25:19 +01:00
|
|
|
|
Requires: python
|
|
|
|
|
Requires: python-argparse
|
2016-06-28 16:58:40 +02:00
|
|
|
|
Requires: python-openvswitch-test = %{version}
|
2013-03-27 13:25:19 +01:00
|
|
|
|
Requires: python-twisted
|
2016-06-22 11:27:41 +02:00
|
|
|
|
Provides: openvswitch-any-test = %{version}
|
2016-07-05 11:13:42 +02:00
|
|
|
|
%if %{with dpdk}
|
|
|
|
|
Conflicts: openvswitch-test
|
|
|
|
|
%endif
|
2013-03-08 15:12:33 +01:00
|
|
|
|
|
2012-03-14 11:03:21 +01:00
|
|
|
|
%description test
|
|
|
|
|
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.
|
|
|
|
|
|
2010-12-11 17:10:38 +01:00
|
|
|
|
%prep
|
Accepting request 408658 from home:markoschandras:network
- Add missing licenses (bsc#988513)
- Misc spec file cleanups highlighted by the spec-cleaner tool.
- Allow aarch64 builds for openvswitch-dpdk
- Add missing bug references to 2.5.0 release.
old: network/openvswitch
new: home:markoschandras:network/openvswitch rev None
Index: openvswitch-dpdk.changes
===================================================================
--- openvswitch-dpdk.changes (revision 98)
+++ openvswitch-dpdk.changes (revision 46)
@@ -1,4 +1,11 @@
-------------------------------------------------------------------
+Tue Jul 12 10:41:14 UTC 2016 - mchandras@suse.de
+
+- Add missing licenses (bsc#988513)
+- Misc spec file cleanups highlighted by the spec-cleaner tool.
+- Allow aarch64 builds for openvswitch-dpdk
+
+-------------------------------------------------------------------
Mon Jul 4 12:08:06 UTC 2016 - mchandras@suse.de
- Allow the OvS daemon to run as non-root (bsc#987545)
@@ -197,6 +204,8 @@
- Added: ovn-northd.service
- TODO: Explicit DPDK support not yet added to spec.
- Spec file work and cleanup.
+- Includes fixes (or obsoletes) the following issues:
+ * bsc#948840, bsc#941466, bsc#936780, bnc#935750, bnc#867964
-------------------------------------------------------------------
Tue Mar 1 08:43:19 UTC 2016 - kmroz@suse.com
Index: openvswitch-dpdk.spec
===================================================================
--- openvswitch-dpdk.spec (revision 98)
+++ openvswitch-dpdk.spec (revision 46)
@@ -14,10 +14,9 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-
-
# needssslcertforbuild
+
# Disable building the external kernel datapath by default
%bcond_with kmp
# DPDK build disabled by default. It's enabled in the
@@ -26,14 +25,16 @@
# The testsuite is somewhat fragile for continuous testing in OBS
# but keep it here as an option
%bcond_with check
-
# Do NOT edit this auto generated file! Edit openvswitch.spec instead
# and run 'pre_checkin.sh' before committing
Name: openvswitch-dpdk
Version: 2.5.0
Release: 0
Summary: An open source, production quality, multilayer virtual switch (DPDK)
-License: Apache-2.0
+# All code is Apache-2.0 except
+# - lib/sflow* which is SISSL
+# - utilities/bugtool which is LGPL-2.1
+License: Apache-2.0 and LGPL-2.1 and SISSL
Group: Productivity/Networking/System
Url: http://openvswitch.org/
Source0: http://openvswitch.org/releases/openvswitch-%{version}.tar.gz
@@ -43,35 +44,26 @@
Source89: Module.supported.updates
# PATCH-FIX-UPSTREAM openvswitch-2.5.0-detect-dpdk-installation.patch
Patch0: openvswitch-%{version}-detect-dpdk-installation.patch
-Patch1: 0001-Remove-broken-pipe-warning-logs-from-ovsdb-server.lo.patch
+Patch1: 0001-Remove-broken-pipe-warning-logs-from-ovsdb-server.lo.patch
BuildRequires: autoconf
BuildRequires: automake
-%if %{with dpdk}
-# We need to be a bit strict with the dpdk version since
-# it's very possible for DPDK to change it's API between
-# releases. OVS currently requires 2.2.0. We may have to
-# provide multiple versions of dpdk if OVS and DPDK get
-# out of sync too often.
-BuildRequires: dpdk-devel = 2.2.0
-ExclusiveArch: x86_64 %ix86
-%endif
BuildRequires: fdupes
BuildRequires: gcc
BuildRequires: glibc-devel
BuildRequires: graphviz
BuildRequires: libcap-ng-devel
-BuildRequires: libopenssl-devel
BuildRequires: libtool
BuildRequires: make
BuildRequires: openssl
BuildRequires: perl
-BuildRequires: pkg-config
+BuildRequires: pkgconfig
# Needed by the testsuite
BuildRequires: procps
BuildRequires: python-devel
BuildRequires: python-xml
+BuildRequires: valgrind-devel
+BuildRequires: pkgconfig(openssl)
Requires: logrotate
-Requires: openssl
Requires: python
Provides: openvswitch-common = %{version}
Obsoletes: openvswitch-common < %{version}
@@ -79,10 +71,16 @@
Obsoletes: openvswitch-controller < %{version}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%py_requires
-BuildRequires: valgrind-devel
-# We can't have openvswitch and openvswitch-dpdk in parallel
%if %{with dpdk}
+# We need to be a bit strict with the dpdk version since
+# it's very possible for DPDK to change it's API between
+# releases. OVS currently requires 2.2.0. We may have to
+# provide multiple versions of dpdk if OVS and DPDK get
+# out of sync too often.
+BuildRequires: dpdk-devel = 2.2.0
+# We can't have openvswitch and openvswitch-dpdk in parallel
Conflicts: openvswitch
+ExclusiveArch: aarch64 x86_64 %{ix86}
%endif
%description
@@ -131,15 +129,15 @@
# ovs-ctl / ovs-pki use /usr/bin/uuidgen:
Requires: util-linux
Requires(post): %fillup_prereq
+Suggests: logrotate
Provides: openvswitch-any-switch = %{version}
+%{?systemd_requires}
%if %{with dpdk}
Conflicts: openvswitch-switch
%endif
-Suggests: logrotate
%if %{with kmp}
Suggests: openvswitch-kmp
%endif
-%{?systemd_requires}
%description switch
openvswitch-switch provides the userspace components and utilities for
@@ -246,7 +244,7 @@
Open vSwitch is a full-featured software-based Ethernet switch.
%prep
-%setup -n openvswitch-%{version} -q
+%setup -q -n openvswitch-%{version}
%patch0 -p1
%patch1 -p1
@@ -290,6 +288,7 @@
--disable-static \
--enable-libcapng \
--enable-shared \
+ --enable-ssl \
${dpdk_opt} \
--with-logdir=%{_localstatedir}/log/openvswitch
make %{?_smp_mflags}
@@ -301,7 +300,7 @@
# 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}" ||
+if make check TESTSUITEFLAGS="%{?_smp_mflags}" ||
make check TESTSUITEFLAGS='--recheck'; then :;
else
cat tests/testsuite.log
@@ -358,7 +357,7 @@
mv %{buildroot}%{_datadir}/openvswitch/python/* %{buildroot}%{py_sitedir}
rmdir %{buildroot}%{_datadir}/openvswitch/python
-rm -f %buildroot/%_libdir/*.la
+find %{buildroot} -type f -name "*.la" -delete -print
# Remove unpackaged files for the dpdk case
%if %{with dpdk}
@@ -438,26 +437,26 @@
%{_libdir}/libopenvswitch.so.*
%{_libdir}/libovsdb.so.*
%{_libdir}/libsflow.so.*
-%{_mandir}/man1/ovs-benchmark.1.gz
-%{_mandir}/man1/ovsdb-client.1.gz
-%{_mandir}/man8/ovs-appctl.8.gz
-%{_mandir}/man8/ovs-bugtool.8.gz
-%{_mandir}/man8/ovs-ofctl.8.gz
-%{_mandir}/man8/ovs-vlan-bug-workaround.8.gz
-%{_mandir}/man8/ovs-parse-backtrace.8.gz
-%{_mandir}/man8/ovs-dpctl-top.8.gz
+%{_mandir}/man1/ovs-benchmark.1%{ext_man}
+%{_mandir}/man1/ovsdb-client.1%{ext_man}
+%{_mandir}/man8/ovs-appctl.8%{ext_man}
+%{_mandir}/man8/ovs-bugtool.8%{ext_man}
+%{_mandir}/man8/ovs-ofctl.8%{ext_man}
+%{_mandir}/man8/ovs-vlan-bug-workaround.8%{ext_man}
+%{_mandir}/man8/ovs-parse-backtrace.8%{ext_man}
+%{_mandir}/man8/ovs-dpctl-top.8%{ext_man}
%{_sysconfdir}/bash_completion.d/ovs-appctl-bashcomp.bash
%files pki
%defattr(-,root,root)
-%{_mandir}/man8/ovs-pki.8.gz
+%{_mandir}/man8/ovs-pki.8%{ext_man}
%{_bindir}/ovs-pki
%files vtep
%defattr(-,root,root)
%{_bindir}/vtep-ctl
-%{_mandir}/man5/vtep.5.gz
-%{_mandir}/man8/vtep-ctl.8.gz
+%{_mandir}/man5/vtep.5%{ext_man}
+%{_mandir}/man8/vtep-ctl.8%{ext_man}
%{_datadir}/openvswitch/scripts/ovs-vtep
%{_datadir}/openvswitch/vtep.ovsschema
%{_libdir}/libvtep.so.*
@@ -489,15 +488,15 @@
%{_datadir}/openvswitch/vswitch.ovsschema
%{_sysconfdir}/bash_completion.d/ovs-vsctl-bashcomp.bash
%config(noreplace) %{_sysconfdir}/logrotate.d/openvswitch-switch
-%{_mandir}/man8/ovs-dpctl.8.gz
-%{_mandir}/man1/ovs-tcpundump.1.gz
-%{_mandir}/man1/ovs-pcap.1.gz
-%{_mandir}/man8/ovs-vsctl.8.gz
-%{_mandir}/man1/ovsdb-tool.1.gz
-%{_mandir}/man8/ovs-vswitchd.8.gz
-%{_mandir}/man1/ovsdb-server.1.gz
-%{_mandir}/man5/ovs-vswitchd.conf.db.5.gz
-%{_mandir}/man8/ovs-ctl.8.gz
+%{_mandir}/man8/ovs-dpctl.8%{ext_man}
+%{_mandir}/man1/ovs-tcpundump.1%{ext_man}
+%{_mandir}/man1/ovs-pcap.1%{ext_man}
+%{_mandir}/man8/ovs-vsctl.8%{ext_man}
+%{_mandir}/man1/ovsdb-tool.1%{ext_man}
+%{_mandir}/man8/ovs-vswitchd.8%{ext_man}
+%{_mandir}/man1/ovsdb-server.1%{ext_man}
+%{_mandir}/man5/ovs-vswitchd.conf.db.5%{ext_man}
+%{_mandir}/man8/ovs-ctl.8%{ext_man}
%{_sbindir}/rcopenvswitch
%{_unitdir}/openvswitch.service
%{_localstatedir}/adm/fillup-templates/sysconfig.openvswitch
@@ -538,10 +537,10 @@
%{_bindir}/ovs-l3ping
%{_bindir}/ovs-vlan-test
%{_bindir}/ovs-testcontroller
-%{_mandir}/man8/ovs-test.8.gz
-%{_mandir}/man8/ovs-l3ping.8.gz
-%{_mandir}/man8/ovs-vlan-test.8.gz
-%{_mandir}/man8/ovs-testcontroller.8.gz
+%{_mandir}/man8/ovs-test.8%{ext_man}
+%{_mandir}/man8/ovs-l3ping.8%{ext_man}
+%{_mandir}/man8/ovs-vlan-test.8%{ext_man}
+%{_mandir}/man8/ovs-testcontroller.8%{ext_man}
%files devel
%defattr(-,root,root)
Index: openvswitch.changes
===================================================================
--- openvswitch.changes (revision 98)
+++ openvswitch.changes (revision 46)
@@ -1,4 +1,11 @@
-------------------------------------------------------------------
+Tue Jul 12 10:41:14 UTC 2016 - mchandras@suse.de
+
+- Add missing licenses (bsc#988513)
+- Misc spec file cleanups highlighted by the spec-cleaner tool.
+- Allow aarch64 builds for openvswitch-dpdk
+
+-------------------------------------------------------------------
Mon Jul 4 12:08:06 UTC 2016 - mchandras@suse.de
- Allow the OvS daemon to run as non-root (bsc#987545)
@@ -197,6 +204,8 @@
- Added: ovn-northd.service
- TODO: Explicit DPDK support not yet added to spec.
- Spec file work and cleanup.
+- Includes fixes (or obsoletes) the following issues:
+ * bsc#948840, bsc#941466, bsc#936780, bnc#935750, bnc#867964
-------------------------------------------------------------------
Tue Mar 1 08:43:19 UTC 2016 - kmroz@suse.com
Index: openvswitch.spec
===================================================================
--- openvswitch.spec (revision 98)
+++ openvswitch.spec (revision 46)
@@ -14,10 +14,9 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-
-
# needssslcertforbuild
+
# Disable building the external kernel datapath by default
%bcond_with kmp
# DPDK build disabled by default. It's enabled in the
@@ -26,12 +25,14 @@
# The testsuite is somewhat fragile for continuous testing in OBS
# but keep it here as an option
%bcond_with check
-
Name: openvswitch
Version: 2.5.0
Release: 0
Summary: An open source, production quality, multilayer virtual switch
-License: Apache-2.0
+# All code is Apache-2.0 except
+# - lib/sflow* which is SISSL
+# - utilities/bugtool which is LGPL-2.1
+License: Apache-2.0 and LGPL-2.1 and SISSL
Group: Productivity/Networking/System
Url: http://openvswitch.org/
Source0: http://openvswitch.org/releases/openvswitch-%{version}.tar.gz
@@ -41,35 +42,26 @@
Source89: Module.supported.updates
# PATCH-FIX-UPSTREAM openvswitch-2.5.0-detect-dpdk-installation.patch
Patch0: openvswitch-%{version}-detect-dpdk-installation.patch
-Patch1: 0001-Remove-broken-pipe-warning-logs-from-ovsdb-server.lo.patch
+Patch1: 0001-Remove-broken-pipe-warning-logs-from-ovsdb-server.lo.patch
BuildRequires: autoconf
BuildRequires: automake
-%if %{with dpdk}
-# We need to be a bit strict with the dpdk version since
-# it's very possible for DPDK to change it's API between
-# releases. OVS currently requires 2.2.0. We may have to
-# provide multiple versions of dpdk if OVS and DPDK get
-# out of sync too often.
-BuildRequires: dpdk-devel = 2.2.0
-ExclusiveArch: x86_64 %ix86
-%endif
BuildRequires: fdupes
BuildRequires: gcc
BuildRequires: glibc-devel
BuildRequires: graphviz
BuildRequires: libcap-ng-devel
-BuildRequires: libopenssl-devel
BuildRequires: libtool
BuildRequires: make
BuildRequires: openssl
BuildRequires: perl
-BuildRequires: pkg-config
+BuildRequires: pkgconfig
# Needed by the testsuite
BuildRequires: procps
BuildRequires: python-devel
BuildRequires: python-xml
+BuildRequires: valgrind-devel
+BuildRequires: pkgconfig(openssl)
Requires: logrotate
-Requires: openssl
Requires: python
Provides: openvswitch-common = %{version}
Obsoletes: openvswitch-common < %{version}
@@ -77,10 +69,16 @@
Obsoletes: openvswitch-controller < %{version}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%py_requires
-BuildRequires: valgrind-devel
-# We can't have openvswitch and openvswitch-dpdk in parallel
%if %{with dpdk}
+# We need to be a bit strict with the dpdk version since
+# it's very possible for DPDK to change it's API between
+# releases. OVS currently requires 2.2.0. We may have to
+# provide multiple versions of dpdk if OVS and DPDK get
+# out of sync too often.
+BuildRequires: dpdk-devel = 2.2.0
+# We can't have openvswitch and openvswitch-dpdk in parallel
Conflicts: openvswitch
+ExclusiveArch: aarch64 x86_64 %{ix86}
%endif
%description
@@ -129,15 +127,15 @@
# ovs-ctl / ovs-pki use /usr/bin/uuidgen:
Requires: util-linux
Requires(post): %fillup_prereq
+Suggests: logrotate
Provides: openvswitch-any-switch = %{version}
+%{?systemd_requires}
%if %{with dpdk}
Conflicts: openvswitch-switch
%endif
-Suggests: logrotate
%if %{with kmp}
Suggests: openvswitch-kmp
%endif
-%{?systemd_requires}
%description switch
openvswitch-switch provides the userspace components and utilities for
@@ -244,7 +242,7 @@
Open vSwitch is a full-featured software-based Ethernet switch.
%prep
-%setup -n openvswitch-%{version} -q
+%setup -q -n openvswitch-%{version}
%patch0 -p1
%patch1 -p1
@@ -288,6 +286,7 @@
--disable-static \
--enable-libcapng \
--enable-shared \
+ --enable-ssl \
${dpdk_opt} \
--with-logdir=%{_localstatedir}/log/openvswitch
make %{?_smp_mflags}
@@ -299,7 +298,7 @@
# 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}" ||
+if make check TESTSUITEFLAGS="%{?_smp_mflags}" ||
make check TESTSUITEFLAGS='--recheck'; then :;
else
cat tests/testsuite.log
@@ -356,7 +355,7 @@
mv %{buildroot}%{_datadir}/openvswitch/python/* %{buildroot}%{py_sitedir}
rmdir %{buildroot}%{_datadir}/openvswitch/python
-rm -f %buildroot/%_libdir/*.la
+find %{buildroot} -type f -name "*.la" -delete -print
# Remove unpackaged files for the dpdk case
%if %{with dpdk}
@@ -436,26 +435,26 @@
%{_libdir}/libopenvswitch.so.*
%{_libdir}/libovsdb.so.*
%{_libdir}/libsflow.so.*
-%{_mandir}/man1/ovs-benchmark.1.gz
-%{_mandir}/man1/ovsdb-client.1.gz
-%{_mandir}/man8/ovs-appctl.8.gz
-%{_mandir}/man8/ovs-bugtool.8.gz
-%{_mandir}/man8/ovs-ofctl.8.gz
-%{_mandir}/man8/ovs-vlan-bug-workaround.8.gz
-%{_mandir}/man8/ovs-parse-backtrace.8.gz
-%{_mandir}/man8/ovs-dpctl-top.8.gz
+%{_mandir}/man1/ovs-benchmark.1%{ext_man}
+%{_mandir}/man1/ovsdb-client.1%{ext_man}
+%{_mandir}/man8/ovs-appctl.8%{ext_man}
+%{_mandir}/man8/ovs-bugtool.8%{ext_man}
+%{_mandir}/man8/ovs-ofctl.8%{ext_man}
+%{_mandir}/man8/ovs-vlan-bug-workaround.8%{ext_man}
+%{_mandir}/man8/ovs-parse-backtrace.8%{ext_man}
+%{_mandir}/man8/ovs-dpctl-top.8%{ext_man}
%{_sysconfdir}/bash_completion.d/ovs-appctl-bashcomp.bash
%files pki
%defattr(-,root,root)
-%{_mandir}/man8/ovs-pki.8.gz
+%{_mandir}/man8/ovs-pki.8%{ext_man}
%{_bindir}/ovs-pki
%files vtep
%defattr(-,root,root)
%{_bindir}/vtep-ctl
-%{_mandir}/man5/vtep.5.gz
-%{_mandir}/man8/vtep-ctl.8.gz
+%{_mandir}/man5/vtep.5%{ext_man}
+%{_mandir}/man8/vtep-ctl.8%{ext_man}
%{_datadir}/openvswitch/scripts/ovs-vtep
%{_datadir}/openvswitch/vtep.ovsschema
%{_libdir}/libvtep.so.*
@@ -487,15 +486,15 @@
%{_datadir}/openvswitch/vswitch.ovsschema
%{_sysconfdir}/bash_completion.d/ovs-vsctl-bashcomp.bash
%config(noreplace) %{_sysconfdir}/logrotate.d/openvswitch-switch
-%{_mandir}/man8/ovs-dpctl.8.gz
-%{_mandir}/man1/ovs-tcpundump.1.gz
-%{_mandir}/man1/ovs-pcap.1.gz
-%{_mandir}/man8/ovs-vsctl.8.gz
-%{_mandir}/man1/ovsdb-tool.1.gz
-%{_mandir}/man8/ovs-vswitchd.8.gz
-%{_mandir}/man1/ovsdb-server.1.gz
-%{_mandir}/man5/ovs-vswitchd.conf.db.5.gz
-%{_mandir}/man8/ovs-ctl.8.gz
+%{_mandir}/man8/ovs-dpctl.8%{ext_man}
+%{_mandir}/man1/ovs-tcpundump.1%{ext_man}
+%{_mandir}/man1/ovs-pcap.1%{ext_man}
+%{_mandir}/man8/ovs-vsctl.8%{ext_man}
+%{_mandir}/man1/ovsdb-tool.1%{ext_man}
+%{_mandir}/man8/ovs-vswitchd.8%{ext_man}
+%{_mandir}/man1/ovsdb-server.1%{ext_man}
+%{_mandir}/man5/ovs-vswitchd.conf.db.5%{ext_man}
+%{_mandir}/man8/ovs-ctl.8%{ext_man}
%{_sbindir}/rcopenvswitch
%{_unitdir}/openvswitch.service
%{_localstatedir}/adm/fillup-templates/sysconfig.openvswitch
@@ -536,10 +535,10 @@
%{_bindir}/ovs-l3ping
%{_bindir}/ovs-vlan-test
%{_bindir}/ovs-testcontroller
-%{_mandir}/man8/ovs-test.8.gz
-%{_mandir}/man8/ovs-l3ping.8.gz
-%{_mandir}/man8/ovs-vlan-test.8.gz
-%{_mandir}/man8/ovs-testcontroller.8.gz
+%{_mandir}/man8/ovs-test.8%{ext_man}
+%{_mandir}/man8/ovs-l3ping.8%{ext_man}
+%{_mandir}/man8/ovs-vlan-test.8%{ext_man}
+%{_mandir}/man8/ovs-testcontroller.8%{ext_man}
%files devel
%defattr(-,root,root)
OBS-URL: https://build.opensuse.org/request/show/408658
OBS-URL: https://build.opensuse.org/package/show/network/openvswitch?expand=0&rev=99
2016-07-18 10:19:36 +02:00
|
|
|
|
%setup -q -n openvswitch-%{version}
|
2013-03-02 13:51:25 +01:00
|
|
|
|
|
2016-05-24 07:00:44 +02:00
|
|
|
|
%build
|
Accepting request 361282 from home:k_mroz:branches:network
- Don't install INSTALL.* files.
- Removed: openvswitch-switch.template
- New upstream version 2.4.0
- Flow table modifications are now atomic, meaning that each packet
now sees a coherent version of the OpenFlow pipeline. For
example, if a controller removes all flows with a single OpenFlow
"flow_mod", no packet sees an intermediate version of the OpenFlow
pipeline where only some of the flows have been deleted.
- Added support for SFQ, FQ_CoDel and CoDel qdiscs.
- Add bash command-line completion support for ovs-vsctl Please check
utilities/ovs-command-compgen.INSTALL.md for how to use.
- The MAC learning feature now includes per-port fairness to mitigate
MAC flooding attacks.
- New support for a "conjunctive match" OpenFlow extension, which
allows constructing OpenFlow matches of the form "field1 in
{a,b,c...} AND field2 in {d,e,f...}" and generalizations. For details,
see documentation for the "conjunction" action in ovs-ofctl(8).
- Add bash command-line completion support for ovs-appctl/ovs-dpctl/
ovs-ofctl/ovsdb-tool commands. Please check
utilities/ovs-command-compgen.INSTALL.md for how to use.
- The "learn" action supports a new flag "delete_learned" that causes
the learned flows to be deleted when the flow with the "learn" action
is deleted.
- Basic support for the Geneve tunneling protocol. It is not yet
possible to generate or match options. This is planned for a future
release. The protocol is documented at
http://tools.ietf.org/html/draft-gross-geneve-00
- The OVS database now reports controller rate limiting statistics.
OBS-URL: https://build.opensuse.org/request/show/361282
OBS-URL: https://build.opensuse.org/package/show/network/openvswitch?expand=0&rev=76
2016-02-26 16:24:36 +01:00
|
|
|
|
set -- * .travis*
|
2011-05-20 21:19:18 +02:00
|
|
|
|
mkdir source
|
|
|
|
|
mv "$@" source/
|
2010-12-11 17:10:38 +01:00
|
|
|
|
mkdir obj
|
2011-05-20 21:19:18 +02:00
|
|
|
|
|
2010-12-11 17:10:38 +01:00
|
|
|
|
pushd source
|
2014-05-20 18:03:31 +02:00
|
|
|
|
# only call boot.sh for distros with autoconf >= 2.64
|
2016-05-19 12:13:17 +02:00
|
|
|
|
bash -x boot.sh
|
2010-12-11 17:10:38 +01:00
|
|
|
|
popd
|
2016-06-22 11:27:41 +02:00
|
|
|
|
%if ! %{with dpdk}
|
2013-03-27 13:25:19 +01:00
|
|
|
|
%if %{with kmp}
|
|
|
|
|
export EXTRA_CFLAGS='-DVERSION=\"%{version}\"'
|
2016-05-19 12:13:17 +02:00
|
|
|
|
for flavor in %{flavors_to_build}; do
|
2010-12-11 17:10:38 +01:00
|
|
|
|
rm -rf obj/$flavor
|
|
|
|
|
cp -r source obj/$flavor
|
2016-05-19 12:13:17 +02:00
|
|
|
|
cp -a %{SOURCE89} obj/$flavor/datapath/linux/Module.supported
|
2010-12-11 17:10:38 +01:00
|
|
|
|
pushd obj/$flavor
|
2011-05-20 21:19:18 +02:00
|
|
|
|
%configure \
|
2016-05-19 12:13:17 +02:00
|
|
|
|
--with-logdir=%{_localstatedir}/log/openvswitch \
|
|
|
|
|
--with-linux=%{_prefix}/src/linux-obj/%{_target_cpu}/$flavor \
|
|
|
|
|
--with-linux-source=%{_prefix}/src/linux
|
2011-08-08 21:19:28 +02:00
|
|
|
|
cd datapath/linux
|
2014-05-20 18:03:31 +02:00
|
|
|
|
make %{?_smp_mflags}
|
2010-12-11 17:10:38 +01:00
|
|
|
|
popd
|
|
|
|
|
done
|
2011-01-11 16:04:59 +01:00
|
|
|
|
%endif
|
2016-06-22 11:27:41 +02:00
|
|
|
|
%endif
|
2016-05-19 12:13:17 +02:00
|
|
|
|
|
2010-12-11 17:10:38 +01:00
|
|
|
|
pushd source
|
2016-06-21 14:24:21 +02:00
|
|
|
|
|
2016-06-29 17:59:20 +02:00
|
|
|
|
%if %{with dpdk}
|
|
|
|
|
dpdk_opt="--with-dpdk"
|
|
|
|
|
%endif
|
|
|
|
|
|
2011-05-20 21:19:18 +02:00
|
|
|
|
%configure \
|
2014-05-20 18:03:31 +02:00
|
|
|
|
--disable-static \
|
2016-07-04 23:42:42 +02:00
|
|
|
|
--enable-libcapng \
|
2014-05-20 18:03:31 +02:00
|
|
|
|
--enable-shared \
|
Accepting request 408658 from home:markoschandras:network
- Add missing licenses (bsc#988513)
- Misc spec file cleanups highlighted by the spec-cleaner tool.
- Allow aarch64 builds for openvswitch-dpdk
- Add missing bug references to 2.5.0 release.
old: network/openvswitch
new: home:markoschandras:network/openvswitch rev None
Index: openvswitch-dpdk.changes
===================================================================
--- openvswitch-dpdk.changes (revision 98)
+++ openvswitch-dpdk.changes (revision 46)
@@ -1,4 +1,11 @@
-------------------------------------------------------------------
+Tue Jul 12 10:41:14 UTC 2016 - mchandras@suse.de
+
+- Add missing licenses (bsc#988513)
+- Misc spec file cleanups highlighted by the spec-cleaner tool.
+- Allow aarch64 builds for openvswitch-dpdk
+
+-------------------------------------------------------------------
Mon Jul 4 12:08:06 UTC 2016 - mchandras@suse.de
- Allow the OvS daemon to run as non-root (bsc#987545)
@@ -197,6 +204,8 @@
- Added: ovn-northd.service
- TODO: Explicit DPDK support not yet added to spec.
- Spec file work and cleanup.
+- Includes fixes (or obsoletes) the following issues:
+ * bsc#948840, bsc#941466, bsc#936780, bnc#935750, bnc#867964
-------------------------------------------------------------------
Tue Mar 1 08:43:19 UTC 2016 - kmroz@suse.com
Index: openvswitch-dpdk.spec
===================================================================
--- openvswitch-dpdk.spec (revision 98)
+++ openvswitch-dpdk.spec (revision 46)
@@ -14,10 +14,9 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-
-
# needssslcertforbuild
+
# Disable building the external kernel datapath by default
%bcond_with kmp
# DPDK build disabled by default. It's enabled in the
@@ -26,14 +25,16 @@
# The testsuite is somewhat fragile for continuous testing in OBS
# but keep it here as an option
%bcond_with check
-
# Do NOT edit this auto generated file! Edit openvswitch.spec instead
# and run 'pre_checkin.sh' before committing
Name: openvswitch-dpdk
Version: 2.5.0
Release: 0
Summary: An open source, production quality, multilayer virtual switch (DPDK)
-License: Apache-2.0
+# All code is Apache-2.0 except
+# - lib/sflow* which is SISSL
+# - utilities/bugtool which is LGPL-2.1
+License: Apache-2.0 and LGPL-2.1 and SISSL
Group: Productivity/Networking/System
Url: http://openvswitch.org/
Source0: http://openvswitch.org/releases/openvswitch-%{version}.tar.gz
@@ -43,35 +44,26 @@
Source89: Module.supported.updates
# PATCH-FIX-UPSTREAM openvswitch-2.5.0-detect-dpdk-installation.patch
Patch0: openvswitch-%{version}-detect-dpdk-installation.patch
-Patch1: 0001-Remove-broken-pipe-warning-logs-from-ovsdb-server.lo.patch
+Patch1: 0001-Remove-broken-pipe-warning-logs-from-ovsdb-server.lo.patch
BuildRequires: autoconf
BuildRequires: automake
-%if %{with dpdk}
-# We need to be a bit strict with the dpdk version since
-# it's very possible for DPDK to change it's API between
-# releases. OVS currently requires 2.2.0. We may have to
-# provide multiple versions of dpdk if OVS and DPDK get
-# out of sync too often.
-BuildRequires: dpdk-devel = 2.2.0
-ExclusiveArch: x86_64 %ix86
-%endif
BuildRequires: fdupes
BuildRequires: gcc
BuildRequires: glibc-devel
BuildRequires: graphviz
BuildRequires: libcap-ng-devel
-BuildRequires: libopenssl-devel
BuildRequires: libtool
BuildRequires: make
BuildRequires: openssl
BuildRequires: perl
-BuildRequires: pkg-config
+BuildRequires: pkgconfig
# Needed by the testsuite
BuildRequires: procps
BuildRequires: python-devel
BuildRequires: python-xml
+BuildRequires: valgrind-devel
+BuildRequires: pkgconfig(openssl)
Requires: logrotate
-Requires: openssl
Requires: python
Provides: openvswitch-common = %{version}
Obsoletes: openvswitch-common < %{version}
@@ -79,10 +71,16 @@
Obsoletes: openvswitch-controller < %{version}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%py_requires
-BuildRequires: valgrind-devel
-# We can't have openvswitch and openvswitch-dpdk in parallel
%if %{with dpdk}
+# We need to be a bit strict with the dpdk version since
+# it's very possible for DPDK to change it's API between
+# releases. OVS currently requires 2.2.0. We may have to
+# provide multiple versions of dpdk if OVS and DPDK get
+# out of sync too often.
+BuildRequires: dpdk-devel = 2.2.0
+# We can't have openvswitch and openvswitch-dpdk in parallel
Conflicts: openvswitch
+ExclusiveArch: aarch64 x86_64 %{ix86}
%endif
%description
@@ -131,15 +129,15 @@
# ovs-ctl / ovs-pki use /usr/bin/uuidgen:
Requires: util-linux
Requires(post): %fillup_prereq
+Suggests: logrotate
Provides: openvswitch-any-switch = %{version}
+%{?systemd_requires}
%if %{with dpdk}
Conflicts: openvswitch-switch
%endif
-Suggests: logrotate
%if %{with kmp}
Suggests: openvswitch-kmp
%endif
-%{?systemd_requires}
%description switch
openvswitch-switch provides the userspace components and utilities for
@@ -246,7 +244,7 @@
Open vSwitch is a full-featured software-based Ethernet switch.
%prep
-%setup -n openvswitch-%{version} -q
+%setup -q -n openvswitch-%{version}
%patch0 -p1
%patch1 -p1
@@ -290,6 +288,7 @@
--disable-static \
--enable-libcapng \
--enable-shared \
+ --enable-ssl \
${dpdk_opt} \
--with-logdir=%{_localstatedir}/log/openvswitch
make %{?_smp_mflags}
@@ -301,7 +300,7 @@
# 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}" ||
+if make check TESTSUITEFLAGS="%{?_smp_mflags}" ||
make check TESTSUITEFLAGS='--recheck'; then :;
else
cat tests/testsuite.log
@@ -358,7 +357,7 @@
mv %{buildroot}%{_datadir}/openvswitch/python/* %{buildroot}%{py_sitedir}
rmdir %{buildroot}%{_datadir}/openvswitch/python
-rm -f %buildroot/%_libdir/*.la
+find %{buildroot} -type f -name "*.la" -delete -print
# Remove unpackaged files for the dpdk case
%if %{with dpdk}
@@ -438,26 +437,26 @@
%{_libdir}/libopenvswitch.so.*
%{_libdir}/libovsdb.so.*
%{_libdir}/libsflow.so.*
-%{_mandir}/man1/ovs-benchmark.1.gz
-%{_mandir}/man1/ovsdb-client.1.gz
-%{_mandir}/man8/ovs-appctl.8.gz
-%{_mandir}/man8/ovs-bugtool.8.gz
-%{_mandir}/man8/ovs-ofctl.8.gz
-%{_mandir}/man8/ovs-vlan-bug-workaround.8.gz
-%{_mandir}/man8/ovs-parse-backtrace.8.gz
-%{_mandir}/man8/ovs-dpctl-top.8.gz
+%{_mandir}/man1/ovs-benchmark.1%{ext_man}
+%{_mandir}/man1/ovsdb-client.1%{ext_man}
+%{_mandir}/man8/ovs-appctl.8%{ext_man}
+%{_mandir}/man8/ovs-bugtool.8%{ext_man}
+%{_mandir}/man8/ovs-ofctl.8%{ext_man}
+%{_mandir}/man8/ovs-vlan-bug-workaround.8%{ext_man}
+%{_mandir}/man8/ovs-parse-backtrace.8%{ext_man}
+%{_mandir}/man8/ovs-dpctl-top.8%{ext_man}
%{_sysconfdir}/bash_completion.d/ovs-appctl-bashcomp.bash
%files pki
%defattr(-,root,root)
-%{_mandir}/man8/ovs-pki.8.gz
+%{_mandir}/man8/ovs-pki.8%{ext_man}
%{_bindir}/ovs-pki
%files vtep
%defattr(-,root,root)
%{_bindir}/vtep-ctl
-%{_mandir}/man5/vtep.5.gz
-%{_mandir}/man8/vtep-ctl.8.gz
+%{_mandir}/man5/vtep.5%{ext_man}
+%{_mandir}/man8/vtep-ctl.8%{ext_man}
%{_datadir}/openvswitch/scripts/ovs-vtep
%{_datadir}/openvswitch/vtep.ovsschema
%{_libdir}/libvtep.so.*
@@ -489,15 +488,15 @@
%{_datadir}/openvswitch/vswitch.ovsschema
%{_sysconfdir}/bash_completion.d/ovs-vsctl-bashcomp.bash
%config(noreplace) %{_sysconfdir}/logrotate.d/openvswitch-switch
-%{_mandir}/man8/ovs-dpctl.8.gz
-%{_mandir}/man1/ovs-tcpundump.1.gz
-%{_mandir}/man1/ovs-pcap.1.gz
-%{_mandir}/man8/ovs-vsctl.8.gz
-%{_mandir}/man1/ovsdb-tool.1.gz
-%{_mandir}/man8/ovs-vswitchd.8.gz
-%{_mandir}/man1/ovsdb-server.1.gz
-%{_mandir}/man5/ovs-vswitchd.conf.db.5.gz
-%{_mandir}/man8/ovs-ctl.8.gz
+%{_mandir}/man8/ovs-dpctl.8%{ext_man}
+%{_mandir}/man1/ovs-tcpundump.1%{ext_man}
+%{_mandir}/man1/ovs-pcap.1%{ext_man}
+%{_mandir}/man8/ovs-vsctl.8%{ext_man}
+%{_mandir}/man1/ovsdb-tool.1%{ext_man}
+%{_mandir}/man8/ovs-vswitchd.8%{ext_man}
+%{_mandir}/man1/ovsdb-server.1%{ext_man}
+%{_mandir}/man5/ovs-vswitchd.conf.db.5%{ext_man}
+%{_mandir}/man8/ovs-ctl.8%{ext_man}
%{_sbindir}/rcopenvswitch
%{_unitdir}/openvswitch.service
%{_localstatedir}/adm/fillup-templates/sysconfig.openvswitch
@@ -538,10 +537,10 @@
%{_bindir}/ovs-l3ping
%{_bindir}/ovs-vlan-test
%{_bindir}/ovs-testcontroller
-%{_mandir}/man8/ovs-test.8.gz
-%{_mandir}/man8/ovs-l3ping.8.gz
-%{_mandir}/man8/ovs-vlan-test.8.gz
-%{_mandir}/man8/ovs-testcontroller.8.gz
+%{_mandir}/man8/ovs-test.8%{ext_man}
+%{_mandir}/man8/ovs-l3ping.8%{ext_man}
+%{_mandir}/man8/ovs-vlan-test.8%{ext_man}
+%{_mandir}/man8/ovs-testcontroller.8%{ext_man}
%files devel
%defattr(-,root,root)
Index: openvswitch.changes
===================================================================
--- openvswitch.changes (revision 98)
+++ openvswitch.changes (revision 46)
@@ -1,4 +1,11 @@
-------------------------------------------------------------------
+Tue Jul 12 10:41:14 UTC 2016 - mchandras@suse.de
+
+- Add missing licenses (bsc#988513)
+- Misc spec file cleanups highlighted by the spec-cleaner tool.
+- Allow aarch64 builds for openvswitch-dpdk
+
+-------------------------------------------------------------------
Mon Jul 4 12:08:06 UTC 2016 - mchandras@suse.de
- Allow the OvS daemon to run as non-root (bsc#987545)
@@ -197,6 +204,8 @@
- Added: ovn-northd.service
- TODO: Explicit DPDK support not yet added to spec.
- Spec file work and cleanup.
+- Includes fixes (or obsoletes) the following issues:
+ * bsc#948840, bsc#941466, bsc#936780, bnc#935750, bnc#867964
-------------------------------------------------------------------
Tue Mar 1 08:43:19 UTC 2016 - kmroz@suse.com
Index: openvswitch.spec
===================================================================
--- openvswitch.spec (revision 98)
+++ openvswitch.spec (revision 46)
@@ -14,10 +14,9 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-
-
# needssslcertforbuild
+
# Disable building the external kernel datapath by default
%bcond_with kmp
# DPDK build disabled by default. It's enabled in the
@@ -26,12 +25,14 @@
# The testsuite is somewhat fragile for continuous testing in OBS
# but keep it here as an option
%bcond_with check
-
Name: openvswitch
Version: 2.5.0
Release: 0
Summary: An open source, production quality, multilayer virtual switch
-License: Apache-2.0
+# All code is Apache-2.0 except
+# - lib/sflow* which is SISSL
+# - utilities/bugtool which is LGPL-2.1
+License: Apache-2.0 and LGPL-2.1 and SISSL
Group: Productivity/Networking/System
Url: http://openvswitch.org/
Source0: http://openvswitch.org/releases/openvswitch-%{version}.tar.gz
@@ -41,35 +42,26 @@
Source89: Module.supported.updates
# PATCH-FIX-UPSTREAM openvswitch-2.5.0-detect-dpdk-installation.patch
Patch0: openvswitch-%{version}-detect-dpdk-installation.patch
-Patch1: 0001-Remove-broken-pipe-warning-logs-from-ovsdb-server.lo.patch
+Patch1: 0001-Remove-broken-pipe-warning-logs-from-ovsdb-server.lo.patch
BuildRequires: autoconf
BuildRequires: automake
-%if %{with dpdk}
-# We need to be a bit strict with the dpdk version since
-# it's very possible for DPDK to change it's API between
-# releases. OVS currently requires 2.2.0. We may have to
-# provide multiple versions of dpdk if OVS and DPDK get
-# out of sync too often.
-BuildRequires: dpdk-devel = 2.2.0
-ExclusiveArch: x86_64 %ix86
-%endif
BuildRequires: fdupes
BuildRequires: gcc
BuildRequires: glibc-devel
BuildRequires: graphviz
BuildRequires: libcap-ng-devel
-BuildRequires: libopenssl-devel
BuildRequires: libtool
BuildRequires: make
BuildRequires: openssl
BuildRequires: perl
-BuildRequires: pkg-config
+BuildRequires: pkgconfig
# Needed by the testsuite
BuildRequires: procps
BuildRequires: python-devel
BuildRequires: python-xml
+BuildRequires: valgrind-devel
+BuildRequires: pkgconfig(openssl)
Requires: logrotate
-Requires: openssl
Requires: python
Provides: openvswitch-common = %{version}
Obsoletes: openvswitch-common < %{version}
@@ -77,10 +69,16 @@
Obsoletes: openvswitch-controller < %{version}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%py_requires
-BuildRequires: valgrind-devel
-# We can't have openvswitch and openvswitch-dpdk in parallel
%if %{with dpdk}
+# We need to be a bit strict with the dpdk version since
+# it's very possible for DPDK to change it's API between
+# releases. OVS currently requires 2.2.0. We may have to
+# provide multiple versions of dpdk if OVS and DPDK get
+# out of sync too often.
+BuildRequires: dpdk-devel = 2.2.0
+# We can't have openvswitch and openvswitch-dpdk in parallel
Conflicts: openvswitch
+ExclusiveArch: aarch64 x86_64 %{ix86}
%endif
%description
@@ -129,15 +127,15 @@
# ovs-ctl / ovs-pki use /usr/bin/uuidgen:
Requires: util-linux
Requires(post): %fillup_prereq
+Suggests: logrotate
Provides: openvswitch-any-switch = %{version}
+%{?systemd_requires}
%if %{with dpdk}
Conflicts: openvswitch-switch
%endif
-Suggests: logrotate
%if %{with kmp}
Suggests: openvswitch-kmp
%endif
-%{?systemd_requires}
%description switch
openvswitch-switch provides the userspace components and utilities for
@@ -244,7 +242,7 @@
Open vSwitch is a full-featured software-based Ethernet switch.
%prep
-%setup -n openvswitch-%{version} -q
+%setup -q -n openvswitch-%{version}
%patch0 -p1
%patch1 -p1
@@ -288,6 +286,7 @@
--disable-static \
--enable-libcapng \
--enable-shared \
+ --enable-ssl \
${dpdk_opt} \
--with-logdir=%{_localstatedir}/log/openvswitch
make %{?_smp_mflags}
@@ -299,7 +298,7 @@
# 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}" ||
+if make check TESTSUITEFLAGS="%{?_smp_mflags}" ||
make check TESTSUITEFLAGS='--recheck'; then :;
else
cat tests/testsuite.log
@@ -356,7 +355,7 @@
mv %{buildroot}%{_datadir}/openvswitch/python/* %{buildroot}%{py_sitedir}
rmdir %{buildroot}%{_datadir}/openvswitch/python
-rm -f %buildroot/%_libdir/*.la
+find %{buildroot} -type f -name "*.la" -delete -print
# Remove unpackaged files for the dpdk case
%if %{with dpdk}
@@ -436,26 +435,26 @@
%{_libdir}/libopenvswitch.so.*
%{_libdir}/libovsdb.so.*
%{_libdir}/libsflow.so.*
-%{_mandir}/man1/ovs-benchmark.1.gz
-%{_mandir}/man1/ovsdb-client.1.gz
-%{_mandir}/man8/ovs-appctl.8.gz
-%{_mandir}/man8/ovs-bugtool.8.gz
-%{_mandir}/man8/ovs-ofctl.8.gz
-%{_mandir}/man8/ovs-vlan-bug-workaround.8.gz
-%{_mandir}/man8/ovs-parse-backtrace.8.gz
-%{_mandir}/man8/ovs-dpctl-top.8.gz
+%{_mandir}/man1/ovs-benchmark.1%{ext_man}
+%{_mandir}/man1/ovsdb-client.1%{ext_man}
+%{_mandir}/man8/ovs-appctl.8%{ext_man}
+%{_mandir}/man8/ovs-bugtool.8%{ext_man}
+%{_mandir}/man8/ovs-ofctl.8%{ext_man}
+%{_mandir}/man8/ovs-vlan-bug-workaround.8%{ext_man}
+%{_mandir}/man8/ovs-parse-backtrace.8%{ext_man}
+%{_mandir}/man8/ovs-dpctl-top.8%{ext_man}
%{_sysconfdir}/bash_completion.d/ovs-appctl-bashcomp.bash
%files pki
%defattr(-,root,root)
-%{_mandir}/man8/ovs-pki.8.gz
+%{_mandir}/man8/ovs-pki.8%{ext_man}
%{_bindir}/ovs-pki
%files vtep
%defattr(-,root,root)
%{_bindir}/vtep-ctl
-%{_mandir}/man5/vtep.5.gz
-%{_mandir}/man8/vtep-ctl.8.gz
+%{_mandir}/man5/vtep.5%{ext_man}
+%{_mandir}/man8/vtep-ctl.8%{ext_man}
%{_datadir}/openvswitch/scripts/ovs-vtep
%{_datadir}/openvswitch/vtep.ovsschema
%{_libdir}/libvtep.so.*
@@ -487,15 +486,15 @@
%{_datadir}/openvswitch/vswitch.ovsschema
%{_sysconfdir}/bash_completion.d/ovs-vsctl-bashcomp.bash
%config(noreplace) %{_sysconfdir}/logrotate.d/openvswitch-switch
-%{_mandir}/man8/ovs-dpctl.8.gz
-%{_mandir}/man1/ovs-tcpundump.1.gz
-%{_mandir}/man1/ovs-pcap.1.gz
-%{_mandir}/man8/ovs-vsctl.8.gz
-%{_mandir}/man1/ovsdb-tool.1.gz
-%{_mandir}/man8/ovs-vswitchd.8.gz
-%{_mandir}/man1/ovsdb-server.1.gz
-%{_mandir}/man5/ovs-vswitchd.conf.db.5.gz
-%{_mandir}/man8/ovs-ctl.8.gz
+%{_mandir}/man8/ovs-dpctl.8%{ext_man}
+%{_mandir}/man1/ovs-tcpundump.1%{ext_man}
+%{_mandir}/man1/ovs-pcap.1%{ext_man}
+%{_mandir}/man8/ovs-vsctl.8%{ext_man}
+%{_mandir}/man1/ovsdb-tool.1%{ext_man}
+%{_mandir}/man8/ovs-vswitchd.8%{ext_man}
+%{_mandir}/man1/ovsdb-server.1%{ext_man}
+%{_mandir}/man5/ovs-vswitchd.conf.db.5%{ext_man}
+%{_mandir}/man8/ovs-ctl.8%{ext_man}
%{_sbindir}/rcopenvswitch
%{_unitdir}/openvswitch.service
%{_localstatedir}/adm/fillup-templates/sysconfig.openvswitch
@@ -536,10 +535,10 @@
%{_bindir}/ovs-l3ping
%{_bindir}/ovs-vlan-test
%{_bindir}/ovs-testcontroller
-%{_mandir}/man8/ovs-test.8.gz
-%{_mandir}/man8/ovs-l3ping.8.gz
-%{_mandir}/man8/ovs-vlan-test.8.gz
-%{_mandir}/man8/ovs-testcontroller.8.gz
+%{_mandir}/man8/ovs-test.8%{ext_man}
+%{_mandir}/man8/ovs-l3ping.8%{ext_man}
+%{_mandir}/man8/ovs-vlan-test.8%{ext_man}
+%{_mandir}/man8/ovs-testcontroller.8%{ext_man}
%files devel
%defattr(-,root,root)
OBS-URL: https://build.opensuse.org/request/show/408658
OBS-URL: https://build.opensuse.org/package/show/network/openvswitch?expand=0&rev=99
2016-07-18 10:19:36 +02:00
|
|
|
|
--enable-ssl \
|
2016-06-29 17:59:20 +02:00
|
|
|
|
${dpdk_opt} \
|
2016-05-19 12:13:17 +02:00
|
|
|
|
--with-logdir=%{_localstatedir}/log/openvswitch
|
2010-12-11 17:10:38 +01:00
|
|
|
|
make %{?_smp_mflags}
|
|
|
|
|
popd
|
|
|
|
|
|
2016-06-21 14:24:21 +02:00
|
|
|
|
%check
|
|
|
|
|
%if %{with check}
|
|
|
|
|
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.
|
Accepting request 408658 from home:markoschandras:network
- Add missing licenses (bsc#988513)
- Misc spec file cleanups highlighted by the spec-cleaner tool.
- Allow aarch64 builds for openvswitch-dpdk
- Add missing bug references to 2.5.0 release.
old: network/openvswitch
new: home:markoschandras:network/openvswitch rev None
Index: openvswitch-dpdk.changes
===================================================================
--- openvswitch-dpdk.changes (revision 98)
+++ openvswitch-dpdk.changes (revision 46)
@@ -1,4 +1,11 @@
-------------------------------------------------------------------
+Tue Jul 12 10:41:14 UTC 2016 - mchandras@suse.de
+
+- Add missing licenses (bsc#988513)
+- Misc spec file cleanups highlighted by the spec-cleaner tool.
+- Allow aarch64 builds for openvswitch-dpdk
+
+-------------------------------------------------------------------
Mon Jul 4 12:08:06 UTC 2016 - mchandras@suse.de
- Allow the OvS daemon to run as non-root (bsc#987545)
@@ -197,6 +204,8 @@
- Added: ovn-northd.service
- TODO: Explicit DPDK support not yet added to spec.
- Spec file work and cleanup.
+- Includes fixes (or obsoletes) the following issues:
+ * bsc#948840, bsc#941466, bsc#936780, bnc#935750, bnc#867964
-------------------------------------------------------------------
Tue Mar 1 08:43:19 UTC 2016 - kmroz@suse.com
Index: openvswitch-dpdk.spec
===================================================================
--- openvswitch-dpdk.spec (revision 98)
+++ openvswitch-dpdk.spec (revision 46)
@@ -14,10 +14,9 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-
-
# needssslcertforbuild
+
# Disable building the external kernel datapath by default
%bcond_with kmp
# DPDK build disabled by default. It's enabled in the
@@ -26,14 +25,16 @@
# The testsuite is somewhat fragile for continuous testing in OBS
# but keep it here as an option
%bcond_with check
-
# Do NOT edit this auto generated file! Edit openvswitch.spec instead
# and run 'pre_checkin.sh' before committing
Name: openvswitch-dpdk
Version: 2.5.0
Release: 0
Summary: An open source, production quality, multilayer virtual switch (DPDK)
-License: Apache-2.0
+# All code is Apache-2.0 except
+# - lib/sflow* which is SISSL
+# - utilities/bugtool which is LGPL-2.1
+License: Apache-2.0 and LGPL-2.1 and SISSL
Group: Productivity/Networking/System
Url: http://openvswitch.org/
Source0: http://openvswitch.org/releases/openvswitch-%{version}.tar.gz
@@ -43,35 +44,26 @@
Source89: Module.supported.updates
# PATCH-FIX-UPSTREAM openvswitch-2.5.0-detect-dpdk-installation.patch
Patch0: openvswitch-%{version}-detect-dpdk-installation.patch
-Patch1: 0001-Remove-broken-pipe-warning-logs-from-ovsdb-server.lo.patch
+Patch1: 0001-Remove-broken-pipe-warning-logs-from-ovsdb-server.lo.patch
BuildRequires: autoconf
BuildRequires: automake
-%if %{with dpdk}
-# We need to be a bit strict with the dpdk version since
-# it's very possible for DPDK to change it's API between
-# releases. OVS currently requires 2.2.0. We may have to
-# provide multiple versions of dpdk if OVS and DPDK get
-# out of sync too often.
-BuildRequires: dpdk-devel = 2.2.0
-ExclusiveArch: x86_64 %ix86
-%endif
BuildRequires: fdupes
BuildRequires: gcc
BuildRequires: glibc-devel
BuildRequires: graphviz
BuildRequires: libcap-ng-devel
-BuildRequires: libopenssl-devel
BuildRequires: libtool
BuildRequires: make
BuildRequires: openssl
BuildRequires: perl
-BuildRequires: pkg-config
+BuildRequires: pkgconfig
# Needed by the testsuite
BuildRequires: procps
BuildRequires: python-devel
BuildRequires: python-xml
+BuildRequires: valgrind-devel
+BuildRequires: pkgconfig(openssl)
Requires: logrotate
-Requires: openssl
Requires: python
Provides: openvswitch-common = %{version}
Obsoletes: openvswitch-common < %{version}
@@ -79,10 +71,16 @@
Obsoletes: openvswitch-controller < %{version}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%py_requires
-BuildRequires: valgrind-devel
-# We can't have openvswitch and openvswitch-dpdk in parallel
%if %{with dpdk}
+# We need to be a bit strict with the dpdk version since
+# it's very possible for DPDK to change it's API between
+# releases. OVS currently requires 2.2.0. We may have to
+# provide multiple versions of dpdk if OVS and DPDK get
+# out of sync too often.
+BuildRequires: dpdk-devel = 2.2.0
+# We can't have openvswitch and openvswitch-dpdk in parallel
Conflicts: openvswitch
+ExclusiveArch: aarch64 x86_64 %{ix86}
%endif
%description
@@ -131,15 +129,15 @@
# ovs-ctl / ovs-pki use /usr/bin/uuidgen:
Requires: util-linux
Requires(post): %fillup_prereq
+Suggests: logrotate
Provides: openvswitch-any-switch = %{version}
+%{?systemd_requires}
%if %{with dpdk}
Conflicts: openvswitch-switch
%endif
-Suggests: logrotate
%if %{with kmp}
Suggests: openvswitch-kmp
%endif
-%{?systemd_requires}
%description switch
openvswitch-switch provides the userspace components and utilities for
@@ -246,7 +244,7 @@
Open vSwitch is a full-featured software-based Ethernet switch.
%prep
-%setup -n openvswitch-%{version} -q
+%setup -q -n openvswitch-%{version}
%patch0 -p1
%patch1 -p1
@@ -290,6 +288,7 @@
--disable-static \
--enable-libcapng \
--enable-shared \
+ --enable-ssl \
${dpdk_opt} \
--with-logdir=%{_localstatedir}/log/openvswitch
make %{?_smp_mflags}
@@ -301,7 +300,7 @@
# 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}" ||
+if make check TESTSUITEFLAGS="%{?_smp_mflags}" ||
make check TESTSUITEFLAGS='--recheck'; then :;
else
cat tests/testsuite.log
@@ -358,7 +357,7 @@
mv %{buildroot}%{_datadir}/openvswitch/python/* %{buildroot}%{py_sitedir}
rmdir %{buildroot}%{_datadir}/openvswitch/python
-rm -f %buildroot/%_libdir/*.la
+find %{buildroot} -type f -name "*.la" -delete -print
# Remove unpackaged files for the dpdk case
%if %{with dpdk}
@@ -438,26 +437,26 @@
%{_libdir}/libopenvswitch.so.*
%{_libdir}/libovsdb.so.*
%{_libdir}/libsflow.so.*
-%{_mandir}/man1/ovs-benchmark.1.gz
-%{_mandir}/man1/ovsdb-client.1.gz
-%{_mandir}/man8/ovs-appctl.8.gz
-%{_mandir}/man8/ovs-bugtool.8.gz
-%{_mandir}/man8/ovs-ofctl.8.gz
-%{_mandir}/man8/ovs-vlan-bug-workaround.8.gz
-%{_mandir}/man8/ovs-parse-backtrace.8.gz
-%{_mandir}/man8/ovs-dpctl-top.8.gz
+%{_mandir}/man1/ovs-benchmark.1%{ext_man}
+%{_mandir}/man1/ovsdb-client.1%{ext_man}
+%{_mandir}/man8/ovs-appctl.8%{ext_man}
+%{_mandir}/man8/ovs-bugtool.8%{ext_man}
+%{_mandir}/man8/ovs-ofctl.8%{ext_man}
+%{_mandir}/man8/ovs-vlan-bug-workaround.8%{ext_man}
+%{_mandir}/man8/ovs-parse-backtrace.8%{ext_man}
+%{_mandir}/man8/ovs-dpctl-top.8%{ext_man}
%{_sysconfdir}/bash_completion.d/ovs-appctl-bashcomp.bash
%files pki
%defattr(-,root,root)
-%{_mandir}/man8/ovs-pki.8.gz
+%{_mandir}/man8/ovs-pki.8%{ext_man}
%{_bindir}/ovs-pki
%files vtep
%defattr(-,root,root)
%{_bindir}/vtep-ctl
-%{_mandir}/man5/vtep.5.gz
-%{_mandir}/man8/vtep-ctl.8.gz
+%{_mandir}/man5/vtep.5%{ext_man}
+%{_mandir}/man8/vtep-ctl.8%{ext_man}
%{_datadir}/openvswitch/scripts/ovs-vtep
%{_datadir}/openvswitch/vtep.ovsschema
%{_libdir}/libvtep.so.*
@@ -489,15 +488,15 @@
%{_datadir}/openvswitch/vswitch.ovsschema
%{_sysconfdir}/bash_completion.d/ovs-vsctl-bashcomp.bash
%config(noreplace) %{_sysconfdir}/logrotate.d/openvswitch-switch
-%{_mandir}/man8/ovs-dpctl.8.gz
-%{_mandir}/man1/ovs-tcpundump.1.gz
-%{_mandir}/man1/ovs-pcap.1.gz
-%{_mandir}/man8/ovs-vsctl.8.gz
-%{_mandir}/man1/ovsdb-tool.1.gz
-%{_mandir}/man8/ovs-vswitchd.8.gz
-%{_mandir}/man1/ovsdb-server.1.gz
-%{_mandir}/man5/ovs-vswitchd.conf.db.5.gz
-%{_mandir}/man8/ovs-ctl.8.gz
+%{_mandir}/man8/ovs-dpctl.8%{ext_man}
+%{_mandir}/man1/ovs-tcpundump.1%{ext_man}
+%{_mandir}/man1/ovs-pcap.1%{ext_man}
+%{_mandir}/man8/ovs-vsctl.8%{ext_man}
+%{_mandir}/man1/ovsdb-tool.1%{ext_man}
+%{_mandir}/man8/ovs-vswitchd.8%{ext_man}
+%{_mandir}/man1/ovsdb-server.1%{ext_man}
+%{_mandir}/man5/ovs-vswitchd.conf.db.5%{ext_man}
+%{_mandir}/man8/ovs-ctl.8%{ext_man}
%{_sbindir}/rcopenvswitch
%{_unitdir}/openvswitch.service
%{_localstatedir}/adm/fillup-templates/sysconfig.openvswitch
@@ -538,10 +537,10 @@
%{_bindir}/ovs-l3ping
%{_bindir}/ovs-vlan-test
%{_bindir}/ovs-testcontroller
-%{_mandir}/man8/ovs-test.8.gz
-%{_mandir}/man8/ovs-l3ping.8.gz
-%{_mandir}/man8/ovs-vlan-test.8.gz
-%{_mandir}/man8/ovs-testcontroller.8.gz
+%{_mandir}/man8/ovs-test.8%{ext_man}
+%{_mandir}/man8/ovs-l3ping.8%{ext_man}
+%{_mandir}/man8/ovs-vlan-test.8%{ext_man}
+%{_mandir}/man8/ovs-testcontroller.8%{ext_man}
%files devel
%defattr(-,root,root)
Index: openvswitch.changes
===================================================================
--- openvswitch.changes (revision 98)
+++ openvswitch.changes (revision 46)
@@ -1,4 +1,11 @@
-------------------------------------------------------------------
+Tue Jul 12 10:41:14 UTC 2016 - mchandras@suse.de
+
+- Add missing licenses (bsc#988513)
+- Misc spec file cleanups highlighted by the spec-cleaner tool.
+- Allow aarch64 builds for openvswitch-dpdk
+
+-------------------------------------------------------------------
Mon Jul 4 12:08:06 UTC 2016 - mchandras@suse.de
- Allow the OvS daemon to run as non-root (bsc#987545)
@@ -197,6 +204,8 @@
- Added: ovn-northd.service
- TODO: Explicit DPDK support not yet added to spec.
- Spec file work and cleanup.
+- Includes fixes (or obsoletes) the following issues:
+ * bsc#948840, bsc#941466, bsc#936780, bnc#935750, bnc#867964
-------------------------------------------------------------------
Tue Mar 1 08:43:19 UTC 2016 - kmroz@suse.com
Index: openvswitch.spec
===================================================================
--- openvswitch.spec (revision 98)
+++ openvswitch.spec (revision 46)
@@ -14,10 +14,9 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-
-
# needssslcertforbuild
+
# Disable building the external kernel datapath by default
%bcond_with kmp
# DPDK build disabled by default. It's enabled in the
@@ -26,12 +25,14 @@
# The testsuite is somewhat fragile for continuous testing in OBS
# but keep it here as an option
%bcond_with check
-
Name: openvswitch
Version: 2.5.0
Release: 0
Summary: An open source, production quality, multilayer virtual switch
-License: Apache-2.0
+# All code is Apache-2.0 except
+# - lib/sflow* which is SISSL
+# - utilities/bugtool which is LGPL-2.1
+License: Apache-2.0 and LGPL-2.1 and SISSL
Group: Productivity/Networking/System
Url: http://openvswitch.org/
Source0: http://openvswitch.org/releases/openvswitch-%{version}.tar.gz
@@ -41,35 +42,26 @@
Source89: Module.supported.updates
# PATCH-FIX-UPSTREAM openvswitch-2.5.0-detect-dpdk-installation.patch
Patch0: openvswitch-%{version}-detect-dpdk-installation.patch
-Patch1: 0001-Remove-broken-pipe-warning-logs-from-ovsdb-server.lo.patch
+Patch1: 0001-Remove-broken-pipe-warning-logs-from-ovsdb-server.lo.patch
BuildRequires: autoconf
BuildRequires: automake
-%if %{with dpdk}
-# We need to be a bit strict with the dpdk version since
-# it's very possible for DPDK to change it's API between
-# releases. OVS currently requires 2.2.0. We may have to
-# provide multiple versions of dpdk if OVS and DPDK get
-# out of sync too often.
-BuildRequires: dpdk-devel = 2.2.0
-ExclusiveArch: x86_64 %ix86
-%endif
BuildRequires: fdupes
BuildRequires: gcc
BuildRequires: glibc-devel
BuildRequires: graphviz
BuildRequires: libcap-ng-devel
-BuildRequires: libopenssl-devel
BuildRequires: libtool
BuildRequires: make
BuildRequires: openssl
BuildRequires: perl
-BuildRequires: pkg-config
+BuildRequires: pkgconfig
# Needed by the testsuite
BuildRequires: procps
BuildRequires: python-devel
BuildRequires: python-xml
+BuildRequires: valgrind-devel
+BuildRequires: pkgconfig(openssl)
Requires: logrotate
-Requires: openssl
Requires: python
Provides: openvswitch-common = %{version}
Obsoletes: openvswitch-common < %{version}
@@ -77,10 +69,16 @@
Obsoletes: openvswitch-controller < %{version}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%py_requires
-BuildRequires: valgrind-devel
-# We can't have openvswitch and openvswitch-dpdk in parallel
%if %{with dpdk}
+# We need to be a bit strict with the dpdk version since
+# it's very possible for DPDK to change it's API between
+# releases. OVS currently requires 2.2.0. We may have to
+# provide multiple versions of dpdk if OVS and DPDK get
+# out of sync too often.
+BuildRequires: dpdk-devel = 2.2.0
+# We can't have openvswitch and openvswitch-dpdk in parallel
Conflicts: openvswitch
+ExclusiveArch: aarch64 x86_64 %{ix86}
%endif
%description
@@ -129,15 +127,15 @@
# ovs-ctl / ovs-pki use /usr/bin/uuidgen:
Requires: util-linux
Requires(post): %fillup_prereq
+Suggests: logrotate
Provides: openvswitch-any-switch = %{version}
+%{?systemd_requires}
%if %{with dpdk}
Conflicts: openvswitch-switch
%endif
-Suggests: logrotate
%if %{with kmp}
Suggests: openvswitch-kmp
%endif
-%{?systemd_requires}
%description switch
openvswitch-switch provides the userspace components and utilities for
@@ -244,7 +242,7 @@
Open vSwitch is a full-featured software-based Ethernet switch.
%prep
-%setup -n openvswitch-%{version} -q
+%setup -q -n openvswitch-%{version}
%patch0 -p1
%patch1 -p1
@@ -288,6 +286,7 @@
--disable-static \
--enable-libcapng \
--enable-shared \
+ --enable-ssl \
${dpdk_opt} \
--with-logdir=%{_localstatedir}/log/openvswitch
make %{?_smp_mflags}
@@ -299,7 +298,7 @@
# 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}" ||
+if make check TESTSUITEFLAGS="%{?_smp_mflags}" ||
make check TESTSUITEFLAGS='--recheck'; then :;
else
cat tests/testsuite.log
@@ -356,7 +355,7 @@
mv %{buildroot}%{_datadir}/openvswitch/python/* %{buildroot}%{py_sitedir}
rmdir %{buildroot}%{_datadir}/openvswitch/python
-rm -f %buildroot/%_libdir/*.la
+find %{buildroot} -type f -name "*.la" -delete -print
# Remove unpackaged files for the dpdk case
%if %{with dpdk}
@@ -436,26 +435,26 @@
%{_libdir}/libopenvswitch.so.*
%{_libdir}/libovsdb.so.*
%{_libdir}/libsflow.so.*
-%{_mandir}/man1/ovs-benchmark.1.gz
-%{_mandir}/man1/ovsdb-client.1.gz
-%{_mandir}/man8/ovs-appctl.8.gz
-%{_mandir}/man8/ovs-bugtool.8.gz
-%{_mandir}/man8/ovs-ofctl.8.gz
-%{_mandir}/man8/ovs-vlan-bug-workaround.8.gz
-%{_mandir}/man8/ovs-parse-backtrace.8.gz
-%{_mandir}/man8/ovs-dpctl-top.8.gz
+%{_mandir}/man1/ovs-benchmark.1%{ext_man}
+%{_mandir}/man1/ovsdb-client.1%{ext_man}
+%{_mandir}/man8/ovs-appctl.8%{ext_man}
+%{_mandir}/man8/ovs-bugtool.8%{ext_man}
+%{_mandir}/man8/ovs-ofctl.8%{ext_man}
+%{_mandir}/man8/ovs-vlan-bug-workaround.8%{ext_man}
+%{_mandir}/man8/ovs-parse-backtrace.8%{ext_man}
+%{_mandir}/man8/ovs-dpctl-top.8%{ext_man}
%{_sysconfdir}/bash_completion.d/ovs-appctl-bashcomp.bash
%files pki
%defattr(-,root,root)
-%{_mandir}/man8/ovs-pki.8.gz
+%{_mandir}/man8/ovs-pki.8%{ext_man}
%{_bindir}/ovs-pki
%files vtep
%defattr(-,root,root)
%{_bindir}/vtep-ctl
-%{_mandir}/man5/vtep.5.gz
-%{_mandir}/man8/vtep-ctl.8.gz
+%{_mandir}/man5/vtep.5%{ext_man}
+%{_mandir}/man8/vtep-ctl.8%{ext_man}
%{_datadir}/openvswitch/scripts/ovs-vtep
%{_datadir}/openvswitch/vtep.ovsschema
%{_libdir}/libvtep.so.*
@@ -487,15 +486,15 @@
%{_datadir}/openvswitch/vswitch.ovsschema
%{_sysconfdir}/bash_completion.d/ovs-vsctl-bashcomp.bash
%config(noreplace) %{_sysconfdir}/logrotate.d/openvswitch-switch
-%{_mandir}/man8/ovs-dpctl.8.gz
-%{_mandir}/man1/ovs-tcpundump.1.gz
-%{_mandir}/man1/ovs-pcap.1.gz
-%{_mandir}/man8/ovs-vsctl.8.gz
-%{_mandir}/man1/ovsdb-tool.1.gz
-%{_mandir}/man8/ovs-vswitchd.8.gz
-%{_mandir}/man1/ovsdb-server.1.gz
-%{_mandir}/man5/ovs-vswitchd.conf.db.5.gz
-%{_mandir}/man8/ovs-ctl.8.gz
+%{_mandir}/man8/ovs-dpctl.8%{ext_man}
+%{_mandir}/man1/ovs-tcpundump.1%{ext_man}
+%{_mandir}/man1/ovs-pcap.1%{ext_man}
+%{_mandir}/man8/ovs-vsctl.8%{ext_man}
+%{_mandir}/man1/ovsdb-tool.1%{ext_man}
+%{_mandir}/man8/ovs-vswitchd.8%{ext_man}
+%{_mandir}/man1/ovsdb-server.1%{ext_man}
+%{_mandir}/man5/ovs-vswitchd.conf.db.5%{ext_man}
+%{_mandir}/man8/ovs-ctl.8%{ext_man}
%{_sbindir}/rcopenvswitch
%{_unitdir}/openvswitch.service
%{_localstatedir}/adm/fillup-templates/sysconfig.openvswitch
@@ -536,10 +535,10 @@
%{_bindir}/ovs-l3ping
%{_bindir}/ovs-vlan-test
%{_bindir}/ovs-testcontroller
-%{_mandir}/man8/ovs-test.8.gz
-%{_mandir}/man8/ovs-l3ping.8.gz
-%{_mandir}/man8/ovs-vlan-test.8.gz
-%{_mandir}/man8/ovs-testcontroller.8.gz
+%{_mandir}/man8/ovs-test.8%{ext_man}
+%{_mandir}/man8/ovs-l3ping.8%{ext_man}
+%{_mandir}/man8/ovs-vlan-test.8%{ext_man}
+%{_mandir}/man8/ovs-testcontroller.8%{ext_man}
%files devel
%defattr(-,root,root)
OBS-URL: https://build.opensuse.org/request/show/408658
OBS-URL: https://build.opensuse.org/package/show/network/openvswitch?expand=0&rev=99
2016-07-18 10:19:36 +02:00
|
|
|
|
if make check TESTSUITEFLAGS="%{?_smp_mflags}" ||
|
2016-06-21 14:24:21 +02:00
|
|
|
|
make check TESTSUITEFLAGS='--recheck'; then :;
|
|
|
|
|
else
|
|
|
|
|
cat tests/testsuite.log
|
|
|
|
|
exit 1
|
|
|
|
|
fi
|
|
|
|
|
popd
|
|
|
|
|
%endif
|
|
|
|
|
|
2010-12-11 17:10:38 +01:00
|
|
|
|
%install
|
2016-06-22 11:27:41 +02:00
|
|
|
|
%if ! %{with dpdk}
|
2013-03-27 13:25:19 +01:00
|
|
|
|
%if %{with kmp}
|
2014-05-20 18:03:31 +02:00
|
|
|
|
export NO_BRP_STALE_LINK_ERROR=yes
|
2011-05-20 21:19:18 +02:00
|
|
|
|
export INSTALL_MOD_PATH=%{buildroot}
|
2010-12-11 17:10:38 +01:00
|
|
|
|
export INSTALL_MOD_DIR=updates
|
2014-05-20 18:03:31 +02:00
|
|
|
|
export BRP_PESIGN_FILES="*.ko /lib/firmware"
|
2016-05-19 12:13:17 +02:00
|
|
|
|
for flavor in %{flavors_to_build}; do
|
2011-08-08 21:19:28 +02:00
|
|
|
|
pushd obj/$flavor/datapath/linux
|
2016-05-19 12:13:17 +02:00
|
|
|
|
make -C %{_prefix}/src/linux-obj/%{_target_cpu}/$flavor modules_install M=$PWD
|
2010-12-11 17:10:38 +01:00
|
|
|
|
popd
|
|
|
|
|
done
|
2011-01-11 16:04:59 +01:00
|
|
|
|
%endif
|
2016-06-22 11:27:41 +02:00
|
|
|
|
%endif
|
2016-05-19 12:13:17 +02:00
|
|
|
|
|
2010-12-11 17:10:38 +01:00
|
|
|
|
pushd source
|
2011-05-20 21:19:18 +02:00
|
|
|
|
|
2016-05-19 12:13:17 +02:00
|
|
|
|
make %{?_smp_mflags} DESTDIR=%{buildroot} install
|
2016-10-07 15:07:43 +02:00
|
|
|
|
for service in openvswitch ovn-controller ovn-controller-vtep \
|
|
|
|
|
ovn-northd ovsdb-server ovs-vswitchd; do
|
2016-05-19 12:13:17 +02:00
|
|
|
|
install -D -m 644 rhel/usr_lib_systemd_system_${service}.service \
|
|
|
|
|
%{buildroot}%{_unitdir}/${service}.service
|
2016-10-07 15:07:43 +02:00
|
|
|
|
ln -sf %{_sbindir}/service %{buildroot}%{_sbindir}/rc${service}
|
2016-05-19 12:13:17 +02:00
|
|
|
|
done
|
|
|
|
|
|
|
|
|
|
install -D -m 644 rhel/usr_share_openvswitch_scripts_systemd_sysconfig.template \
|
|
|
|
|
%{buildroot}/%{_localstatedir}/adm/fillup-templates/sysconfig.openvswitch
|
2012-03-14 11:03:21 +01:00
|
|
|
|
|
2013-03-27 13:25:19 +01:00
|
|
|
|
install -d -m 755 %{buildroot}/%{_sysconfdir}/logrotate.d
|
2016-05-19 12:13:17 +02:00
|
|
|
|
install -d -m 755 %{buildroot}/%{_localstatedir}/log/openvswitch
|
2012-03-14 11:03:21 +01:00
|
|
|
|
|
2016-10-07 15:07:43 +02:00
|
|
|
|
install -m 644 rhel/etc_logrotate.d_openvswitch \
|
2016-06-21 14:24:21 +02:00
|
|
|
|
%{buildroot}/%{_sysconfdir}/logrotate.d/openvswitch-switch
|
2013-03-27 13:25:19 +01:00
|
|
|
|
install -d -m 755 %{buildroot}/%{_sysconfdir}/profile.d
|
2012-03-14 11:03:21 +01:00
|
|
|
|
|
2010-12-11 17:10:38 +01:00
|
|
|
|
install -m 644 vswitchd/vswitch.ovsschema \
|
2016-06-21 14:24:21 +02:00
|
|
|
|
%{buildroot}/%{_datadir}/openvswitch/vswitch.ovsschema
|
2010-12-11 17:10:38 +01:00
|
|
|
|
popd
|
|
|
|
|
|
2013-03-27 13:25:19 +01:00
|
|
|
|
mkdir -p %{buildroot}%{py_sitedir}
|
2016-06-21 14:24:21 +02:00
|
|
|
|
mv %{buildroot}%{_datadir}/openvswitch/python/* %{buildroot}%{py_sitedir}
|
|
|
|
|
rmdir %{buildroot}%{_datadir}/openvswitch/python
|
2012-03-14 11:03:21 +01:00
|
|
|
|
|
Accepting request 408658 from home:markoschandras:network
- Add missing licenses (bsc#988513)
- Misc spec file cleanups highlighted by the spec-cleaner tool.
- Allow aarch64 builds for openvswitch-dpdk
- Add missing bug references to 2.5.0 release.
old: network/openvswitch
new: home:markoschandras:network/openvswitch rev None
Index: openvswitch-dpdk.changes
===================================================================
--- openvswitch-dpdk.changes (revision 98)
+++ openvswitch-dpdk.changes (revision 46)
@@ -1,4 +1,11 @@
-------------------------------------------------------------------
+Tue Jul 12 10:41:14 UTC 2016 - mchandras@suse.de
+
+- Add missing licenses (bsc#988513)
+- Misc spec file cleanups highlighted by the spec-cleaner tool.
+- Allow aarch64 builds for openvswitch-dpdk
+
+-------------------------------------------------------------------
Mon Jul 4 12:08:06 UTC 2016 - mchandras@suse.de
- Allow the OvS daemon to run as non-root (bsc#987545)
@@ -197,6 +204,8 @@
- Added: ovn-northd.service
- TODO: Explicit DPDK support not yet added to spec.
- Spec file work and cleanup.
+- Includes fixes (or obsoletes) the following issues:
+ * bsc#948840, bsc#941466, bsc#936780, bnc#935750, bnc#867964
-------------------------------------------------------------------
Tue Mar 1 08:43:19 UTC 2016 - kmroz@suse.com
Index: openvswitch-dpdk.spec
===================================================================
--- openvswitch-dpdk.spec (revision 98)
+++ openvswitch-dpdk.spec (revision 46)
@@ -14,10 +14,9 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-
-
# needssslcertforbuild
+
# Disable building the external kernel datapath by default
%bcond_with kmp
# DPDK build disabled by default. It's enabled in the
@@ -26,14 +25,16 @@
# The testsuite is somewhat fragile for continuous testing in OBS
# but keep it here as an option
%bcond_with check
-
# Do NOT edit this auto generated file! Edit openvswitch.spec instead
# and run 'pre_checkin.sh' before committing
Name: openvswitch-dpdk
Version: 2.5.0
Release: 0
Summary: An open source, production quality, multilayer virtual switch (DPDK)
-License: Apache-2.0
+# All code is Apache-2.0 except
+# - lib/sflow* which is SISSL
+# - utilities/bugtool which is LGPL-2.1
+License: Apache-2.0 and LGPL-2.1 and SISSL
Group: Productivity/Networking/System
Url: http://openvswitch.org/
Source0: http://openvswitch.org/releases/openvswitch-%{version}.tar.gz
@@ -43,35 +44,26 @@
Source89: Module.supported.updates
# PATCH-FIX-UPSTREAM openvswitch-2.5.0-detect-dpdk-installation.patch
Patch0: openvswitch-%{version}-detect-dpdk-installation.patch
-Patch1: 0001-Remove-broken-pipe-warning-logs-from-ovsdb-server.lo.patch
+Patch1: 0001-Remove-broken-pipe-warning-logs-from-ovsdb-server.lo.patch
BuildRequires: autoconf
BuildRequires: automake
-%if %{with dpdk}
-# We need to be a bit strict with the dpdk version since
-# it's very possible for DPDK to change it's API between
-# releases. OVS currently requires 2.2.0. We may have to
-# provide multiple versions of dpdk if OVS and DPDK get
-# out of sync too often.
-BuildRequires: dpdk-devel = 2.2.0
-ExclusiveArch: x86_64 %ix86
-%endif
BuildRequires: fdupes
BuildRequires: gcc
BuildRequires: glibc-devel
BuildRequires: graphviz
BuildRequires: libcap-ng-devel
-BuildRequires: libopenssl-devel
BuildRequires: libtool
BuildRequires: make
BuildRequires: openssl
BuildRequires: perl
-BuildRequires: pkg-config
+BuildRequires: pkgconfig
# Needed by the testsuite
BuildRequires: procps
BuildRequires: python-devel
BuildRequires: python-xml
+BuildRequires: valgrind-devel
+BuildRequires: pkgconfig(openssl)
Requires: logrotate
-Requires: openssl
Requires: python
Provides: openvswitch-common = %{version}
Obsoletes: openvswitch-common < %{version}
@@ -79,10 +71,16 @@
Obsoletes: openvswitch-controller < %{version}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%py_requires
-BuildRequires: valgrind-devel
-# We can't have openvswitch and openvswitch-dpdk in parallel
%if %{with dpdk}
+# We need to be a bit strict with the dpdk version since
+# it's very possible for DPDK to change it's API between
+# releases. OVS currently requires 2.2.0. We may have to
+# provide multiple versions of dpdk if OVS and DPDK get
+# out of sync too often.
+BuildRequires: dpdk-devel = 2.2.0
+# We can't have openvswitch and openvswitch-dpdk in parallel
Conflicts: openvswitch
+ExclusiveArch: aarch64 x86_64 %{ix86}
%endif
%description
@@ -131,15 +129,15 @@
# ovs-ctl / ovs-pki use /usr/bin/uuidgen:
Requires: util-linux
Requires(post): %fillup_prereq
+Suggests: logrotate
Provides: openvswitch-any-switch = %{version}
+%{?systemd_requires}
%if %{with dpdk}
Conflicts: openvswitch-switch
%endif
-Suggests: logrotate
%if %{with kmp}
Suggests: openvswitch-kmp
%endif
-%{?systemd_requires}
%description switch
openvswitch-switch provides the userspace components and utilities for
@@ -246,7 +244,7 @@
Open vSwitch is a full-featured software-based Ethernet switch.
%prep
-%setup -n openvswitch-%{version} -q
+%setup -q -n openvswitch-%{version}
%patch0 -p1
%patch1 -p1
@@ -290,6 +288,7 @@
--disable-static \
--enable-libcapng \
--enable-shared \
+ --enable-ssl \
${dpdk_opt} \
--with-logdir=%{_localstatedir}/log/openvswitch
make %{?_smp_mflags}
@@ -301,7 +300,7 @@
# 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}" ||
+if make check TESTSUITEFLAGS="%{?_smp_mflags}" ||
make check TESTSUITEFLAGS='--recheck'; then :;
else
cat tests/testsuite.log
@@ -358,7 +357,7 @@
mv %{buildroot}%{_datadir}/openvswitch/python/* %{buildroot}%{py_sitedir}
rmdir %{buildroot}%{_datadir}/openvswitch/python
-rm -f %buildroot/%_libdir/*.la
+find %{buildroot} -type f -name "*.la" -delete -print
# Remove unpackaged files for the dpdk case
%if %{with dpdk}
@@ -438,26 +437,26 @@
%{_libdir}/libopenvswitch.so.*
%{_libdir}/libovsdb.so.*
%{_libdir}/libsflow.so.*
-%{_mandir}/man1/ovs-benchmark.1.gz
-%{_mandir}/man1/ovsdb-client.1.gz
-%{_mandir}/man8/ovs-appctl.8.gz
-%{_mandir}/man8/ovs-bugtool.8.gz
-%{_mandir}/man8/ovs-ofctl.8.gz
-%{_mandir}/man8/ovs-vlan-bug-workaround.8.gz
-%{_mandir}/man8/ovs-parse-backtrace.8.gz
-%{_mandir}/man8/ovs-dpctl-top.8.gz
+%{_mandir}/man1/ovs-benchmark.1%{ext_man}
+%{_mandir}/man1/ovsdb-client.1%{ext_man}
+%{_mandir}/man8/ovs-appctl.8%{ext_man}
+%{_mandir}/man8/ovs-bugtool.8%{ext_man}
+%{_mandir}/man8/ovs-ofctl.8%{ext_man}
+%{_mandir}/man8/ovs-vlan-bug-workaround.8%{ext_man}
+%{_mandir}/man8/ovs-parse-backtrace.8%{ext_man}
+%{_mandir}/man8/ovs-dpctl-top.8%{ext_man}
%{_sysconfdir}/bash_completion.d/ovs-appctl-bashcomp.bash
%files pki
%defattr(-,root,root)
-%{_mandir}/man8/ovs-pki.8.gz
+%{_mandir}/man8/ovs-pki.8%{ext_man}
%{_bindir}/ovs-pki
%files vtep
%defattr(-,root,root)
%{_bindir}/vtep-ctl
-%{_mandir}/man5/vtep.5.gz
-%{_mandir}/man8/vtep-ctl.8.gz
+%{_mandir}/man5/vtep.5%{ext_man}
+%{_mandir}/man8/vtep-ctl.8%{ext_man}
%{_datadir}/openvswitch/scripts/ovs-vtep
%{_datadir}/openvswitch/vtep.ovsschema
%{_libdir}/libvtep.so.*
@@ -489,15 +488,15 @@
%{_datadir}/openvswitch/vswitch.ovsschema
%{_sysconfdir}/bash_completion.d/ovs-vsctl-bashcomp.bash
%config(noreplace) %{_sysconfdir}/logrotate.d/openvswitch-switch
-%{_mandir}/man8/ovs-dpctl.8.gz
-%{_mandir}/man1/ovs-tcpundump.1.gz
-%{_mandir}/man1/ovs-pcap.1.gz
-%{_mandir}/man8/ovs-vsctl.8.gz
-%{_mandir}/man1/ovsdb-tool.1.gz
-%{_mandir}/man8/ovs-vswitchd.8.gz
-%{_mandir}/man1/ovsdb-server.1.gz
-%{_mandir}/man5/ovs-vswitchd.conf.db.5.gz
-%{_mandir}/man8/ovs-ctl.8.gz
+%{_mandir}/man8/ovs-dpctl.8%{ext_man}
+%{_mandir}/man1/ovs-tcpundump.1%{ext_man}
+%{_mandir}/man1/ovs-pcap.1%{ext_man}
+%{_mandir}/man8/ovs-vsctl.8%{ext_man}
+%{_mandir}/man1/ovsdb-tool.1%{ext_man}
+%{_mandir}/man8/ovs-vswitchd.8%{ext_man}
+%{_mandir}/man1/ovsdb-server.1%{ext_man}
+%{_mandir}/man5/ovs-vswitchd.conf.db.5%{ext_man}
+%{_mandir}/man8/ovs-ctl.8%{ext_man}
%{_sbindir}/rcopenvswitch
%{_unitdir}/openvswitch.service
%{_localstatedir}/adm/fillup-templates/sysconfig.openvswitch
@@ -538,10 +537,10 @@
%{_bindir}/ovs-l3ping
%{_bindir}/ovs-vlan-test
%{_bindir}/ovs-testcontroller
-%{_mandir}/man8/ovs-test.8.gz
-%{_mandir}/man8/ovs-l3ping.8.gz
-%{_mandir}/man8/ovs-vlan-test.8.gz
-%{_mandir}/man8/ovs-testcontroller.8.gz
+%{_mandir}/man8/ovs-test.8%{ext_man}
+%{_mandir}/man8/ovs-l3ping.8%{ext_man}
+%{_mandir}/man8/ovs-vlan-test.8%{ext_man}
+%{_mandir}/man8/ovs-testcontroller.8%{ext_man}
%files devel
%defattr(-,root,root)
Index: openvswitch.changes
===================================================================
--- openvswitch.changes (revision 98)
+++ openvswitch.changes (revision 46)
@@ -1,4 +1,11 @@
-------------------------------------------------------------------
+Tue Jul 12 10:41:14 UTC 2016 - mchandras@suse.de
+
+- Add missing licenses (bsc#988513)
+- Misc spec file cleanups highlighted by the spec-cleaner tool.
+- Allow aarch64 builds for openvswitch-dpdk
+
+-------------------------------------------------------------------
Mon Jul 4 12:08:06 UTC 2016 - mchandras@suse.de
- Allow the OvS daemon to run as non-root (bsc#987545)
@@ -197,6 +204,8 @@
- Added: ovn-northd.service
- TODO: Explicit DPDK support not yet added to spec.
- Spec file work and cleanup.
+- Includes fixes (or obsoletes) the following issues:
+ * bsc#948840, bsc#941466, bsc#936780, bnc#935750, bnc#867964
-------------------------------------------------------------------
Tue Mar 1 08:43:19 UTC 2016 - kmroz@suse.com
Index: openvswitch.spec
===================================================================
--- openvswitch.spec (revision 98)
+++ openvswitch.spec (revision 46)
@@ -14,10 +14,9 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-
-
# needssslcertforbuild
+
# Disable building the external kernel datapath by default
%bcond_with kmp
# DPDK build disabled by default. It's enabled in the
@@ -26,12 +25,14 @@
# The testsuite is somewhat fragile for continuous testing in OBS
# but keep it here as an option
%bcond_with check
-
Name: openvswitch
Version: 2.5.0
Release: 0
Summary: An open source, production quality, multilayer virtual switch
-License: Apache-2.0
+# All code is Apache-2.0 except
+# - lib/sflow* which is SISSL
+# - utilities/bugtool which is LGPL-2.1
+License: Apache-2.0 and LGPL-2.1 and SISSL
Group: Productivity/Networking/System
Url: http://openvswitch.org/
Source0: http://openvswitch.org/releases/openvswitch-%{version}.tar.gz
@@ -41,35 +42,26 @@
Source89: Module.supported.updates
# PATCH-FIX-UPSTREAM openvswitch-2.5.0-detect-dpdk-installation.patch
Patch0: openvswitch-%{version}-detect-dpdk-installation.patch
-Patch1: 0001-Remove-broken-pipe-warning-logs-from-ovsdb-server.lo.patch
+Patch1: 0001-Remove-broken-pipe-warning-logs-from-ovsdb-server.lo.patch
BuildRequires: autoconf
BuildRequires: automake
-%if %{with dpdk}
-# We need to be a bit strict with the dpdk version since
-# it's very possible for DPDK to change it's API between
-# releases. OVS currently requires 2.2.0. We may have to
-# provide multiple versions of dpdk if OVS and DPDK get
-# out of sync too often.
-BuildRequires: dpdk-devel = 2.2.0
-ExclusiveArch: x86_64 %ix86
-%endif
BuildRequires: fdupes
BuildRequires: gcc
BuildRequires: glibc-devel
BuildRequires: graphviz
BuildRequires: libcap-ng-devel
-BuildRequires: libopenssl-devel
BuildRequires: libtool
BuildRequires: make
BuildRequires: openssl
BuildRequires: perl
-BuildRequires: pkg-config
+BuildRequires: pkgconfig
# Needed by the testsuite
BuildRequires: procps
BuildRequires: python-devel
BuildRequires: python-xml
+BuildRequires: valgrind-devel
+BuildRequires: pkgconfig(openssl)
Requires: logrotate
-Requires: openssl
Requires: python
Provides: openvswitch-common = %{version}
Obsoletes: openvswitch-common < %{version}
@@ -77,10 +69,16 @@
Obsoletes: openvswitch-controller < %{version}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%py_requires
-BuildRequires: valgrind-devel
-# We can't have openvswitch and openvswitch-dpdk in parallel
%if %{with dpdk}
+# We need to be a bit strict with the dpdk version since
+# it's very possible for DPDK to change it's API between
+# releases. OVS currently requires 2.2.0. We may have to
+# provide multiple versions of dpdk if OVS and DPDK get
+# out of sync too often.
+BuildRequires: dpdk-devel = 2.2.0
+# We can't have openvswitch and openvswitch-dpdk in parallel
Conflicts: openvswitch
+ExclusiveArch: aarch64 x86_64 %{ix86}
%endif
%description
@@ -129,15 +127,15 @@
# ovs-ctl / ovs-pki use /usr/bin/uuidgen:
Requires: util-linux
Requires(post): %fillup_prereq
+Suggests: logrotate
Provides: openvswitch-any-switch = %{version}
+%{?systemd_requires}
%if %{with dpdk}
Conflicts: openvswitch-switch
%endif
-Suggests: logrotate
%if %{with kmp}
Suggests: openvswitch-kmp
%endif
-%{?systemd_requires}
%description switch
openvswitch-switch provides the userspace components and utilities for
@@ -244,7 +242,7 @@
Open vSwitch is a full-featured software-based Ethernet switch.
%prep
-%setup -n openvswitch-%{version} -q
+%setup -q -n openvswitch-%{version}
%patch0 -p1
%patch1 -p1
@@ -288,6 +286,7 @@
--disable-static \
--enable-libcapng \
--enable-shared \
+ --enable-ssl \
${dpdk_opt} \
--with-logdir=%{_localstatedir}/log/openvswitch
make %{?_smp_mflags}
@@ -299,7 +298,7 @@
# 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}" ||
+if make check TESTSUITEFLAGS="%{?_smp_mflags}" ||
make check TESTSUITEFLAGS='--recheck'; then :;
else
cat tests/testsuite.log
@@ -356,7 +355,7 @@
mv %{buildroot}%{_datadir}/openvswitch/python/* %{buildroot}%{py_sitedir}
rmdir %{buildroot}%{_datadir}/openvswitch/python
-rm -f %buildroot/%_libdir/*.la
+find %{buildroot} -type f -name "*.la" -delete -print
# Remove unpackaged files for the dpdk case
%if %{with dpdk}
@@ -436,26 +435,26 @@
%{_libdir}/libopenvswitch.so.*
%{_libdir}/libovsdb.so.*
%{_libdir}/libsflow.so.*
-%{_mandir}/man1/ovs-benchmark.1.gz
-%{_mandir}/man1/ovsdb-client.1.gz
-%{_mandir}/man8/ovs-appctl.8.gz
-%{_mandir}/man8/ovs-bugtool.8.gz
-%{_mandir}/man8/ovs-ofctl.8.gz
-%{_mandir}/man8/ovs-vlan-bug-workaround.8.gz
-%{_mandir}/man8/ovs-parse-backtrace.8.gz
-%{_mandir}/man8/ovs-dpctl-top.8.gz
+%{_mandir}/man1/ovs-benchmark.1%{ext_man}
+%{_mandir}/man1/ovsdb-client.1%{ext_man}
+%{_mandir}/man8/ovs-appctl.8%{ext_man}
+%{_mandir}/man8/ovs-bugtool.8%{ext_man}
+%{_mandir}/man8/ovs-ofctl.8%{ext_man}
+%{_mandir}/man8/ovs-vlan-bug-workaround.8%{ext_man}
+%{_mandir}/man8/ovs-parse-backtrace.8%{ext_man}
+%{_mandir}/man8/ovs-dpctl-top.8%{ext_man}
%{_sysconfdir}/bash_completion.d/ovs-appctl-bashcomp.bash
%files pki
%defattr(-,root,root)
-%{_mandir}/man8/ovs-pki.8.gz
+%{_mandir}/man8/ovs-pki.8%{ext_man}
%{_bindir}/ovs-pki
%files vtep
%defattr(-,root,root)
%{_bindir}/vtep-ctl
-%{_mandir}/man5/vtep.5.gz
-%{_mandir}/man8/vtep-ctl.8.gz
+%{_mandir}/man5/vtep.5%{ext_man}
+%{_mandir}/man8/vtep-ctl.8%{ext_man}
%{_datadir}/openvswitch/scripts/ovs-vtep
%{_datadir}/openvswitch/vtep.ovsschema
%{_libdir}/libvtep.so.*
@@ -487,15 +486,15 @@
%{_datadir}/openvswitch/vswitch.ovsschema
%{_sysconfdir}/bash_completion.d/ovs-vsctl-bashcomp.bash
%config(noreplace) %{_sysconfdir}/logrotate.d/openvswitch-switch
-%{_mandir}/man8/ovs-dpctl.8.gz
-%{_mandir}/man1/ovs-tcpundump.1.gz
-%{_mandir}/man1/ovs-pcap.1.gz
-%{_mandir}/man8/ovs-vsctl.8.gz
-%{_mandir}/man1/ovsdb-tool.1.gz
-%{_mandir}/man8/ovs-vswitchd.8.gz
-%{_mandir}/man1/ovsdb-server.1.gz
-%{_mandir}/man5/ovs-vswitchd.conf.db.5.gz
-%{_mandir}/man8/ovs-ctl.8.gz
+%{_mandir}/man8/ovs-dpctl.8%{ext_man}
+%{_mandir}/man1/ovs-tcpundump.1%{ext_man}
+%{_mandir}/man1/ovs-pcap.1%{ext_man}
+%{_mandir}/man8/ovs-vsctl.8%{ext_man}
+%{_mandir}/man1/ovsdb-tool.1%{ext_man}
+%{_mandir}/man8/ovs-vswitchd.8%{ext_man}
+%{_mandir}/man1/ovsdb-server.1%{ext_man}
+%{_mandir}/man5/ovs-vswitchd.conf.db.5%{ext_man}
+%{_mandir}/man8/ovs-ctl.8%{ext_man}
%{_sbindir}/rcopenvswitch
%{_unitdir}/openvswitch.service
%{_localstatedir}/adm/fillup-templates/sysconfig.openvswitch
@@ -536,10 +535,10 @@
%{_bindir}/ovs-l3ping
%{_bindir}/ovs-vlan-test
%{_bindir}/ovs-testcontroller
-%{_mandir}/man8/ovs-test.8.gz
-%{_mandir}/man8/ovs-l3ping.8.gz
-%{_mandir}/man8/ovs-vlan-test.8.gz
-%{_mandir}/man8/ovs-testcontroller.8.gz
+%{_mandir}/man8/ovs-test.8%{ext_man}
+%{_mandir}/man8/ovs-l3ping.8%{ext_man}
+%{_mandir}/man8/ovs-vlan-test.8%{ext_man}
+%{_mandir}/man8/ovs-testcontroller.8%{ext_man}
%files devel
%defattr(-,root,root)
OBS-URL: https://build.opensuse.org/request/show/408658
OBS-URL: https://build.opensuse.org/package/show/network/openvswitch?expand=0&rev=99
2016-07-18 10:19:36 +02:00
|
|
|
|
find %{buildroot} -type f -name "*.la" -delete -print
|
2016-05-24 07:00:44 +02:00
|
|
|
|
|
2016-06-22 11:27:41 +02:00
|
|
|
|
# Remove unpackaged files for the dpdk case
|
|
|
|
|
%if %{with dpdk}
|
|
|
|
|
rm -rf %{buildroot}%{py_sitedir}
|
|
|
|
|
%else
|
2013-04-09 16:39:09 +02:00
|
|
|
|
%fdupes %{buildroot}%{py_sitedir}
|
2016-06-22 11:27:41 +02:00
|
|
|
|
%endif
|
2013-04-09 16:39:09 +02:00
|
|
|
|
|
2016-01-13 19:17:58 +01:00
|
|
|
|
%post -p /sbin/ldconfig
|
|
|
|
|
%postun -p /sbin/ldconfig
|
2014-05-20 18:03:31 +02:00
|
|
|
|
%pre switch
|
2016-10-07 15:07:43 +02:00
|
|
|
|
%service_add_pre ovsdb-server.service
|
|
|
|
|
%service_add_pre ovs-vswitchd.service
|
2014-05-20 18:03:31 +02:00
|
|
|
|
%service_add_pre openvswitch.service
|
|
|
|
|
|
2012-03-14 11:03:21 +01:00
|
|
|
|
%post switch
|
2016-10-07 15:07:43 +02:00
|
|
|
|
%service_add_post ovsdb-server.service
|
|
|
|
|
%service_add_post ovs-vswitchd.service
|
2014-05-20 18:03:31 +02:00
|
|
|
|
%service_add_post openvswitch.service
|
2016-05-19 12:13:17 +02:00
|
|
|
|
%{fillup_only -n openvswitch}
|
2011-01-11 16:04:59 +01:00
|
|
|
|
|
2012-03-14 11:03:21 +01:00
|
|
|
|
%preun switch
|
2016-10-07 15:07:43 +02:00
|
|
|
|
%service_del_preun ovsdb-server.service
|
|
|
|
|
%service_del_preun ovs-vswitchd.service
|
2014-05-20 18:03:31 +02:00
|
|
|
|
%service_del_preun openvswitch.service
|
2011-01-11 16:04:59 +01:00
|
|
|
|
|
2013-04-09 16:39:09 +02:00
|
|
|
|
%postun switch
|
2016-10-07 15:07:43 +02:00
|
|
|
|
%service_del_postun ovsdb-server.service
|
|
|
|
|
%service_del_postun ovs-vswitchd.service
|
2014-05-20 18:03:31 +02:00
|
|
|
|
%service_del_postun openvswitch.service
|
2013-04-09 16:39:09 +02:00
|
|
|
|
|
2016-03-09 18:19:55 +01:00
|
|
|
|
%pre ovn
|
2016-05-24 07:00:44 +02:00
|
|
|
|
%service_add_pre ovn-controller.service ovn-controller-vtep.service ovn-northd.service
|
2016-03-09 18:19:55 +01:00
|
|
|
|
|
|
|
|
|
%post ovn
|
|
|
|
|
/sbin/ldconfig
|
2016-05-24 07:00:44 +02:00
|
|
|
|
%service_add_post ovn-controller.service ovn-controller-vtep.service ovn-northd.service
|
2016-03-09 18:19:55 +01:00
|
|
|
|
|
|
|
|
|
%preun ovn
|
2016-05-24 07:00:44 +02:00
|
|
|
|
%service_del_preun ovn-controller.service ovn-controller-vtep.service ovn-northd.service
|
2016-03-09 18:19:55 +01:00
|
|
|
|
|
|
|
|
|
%postun ovn
|
2016-05-24 07:00:44 +02:00
|
|
|
|
%service_del_postun ovn-controller.service ovn-controller-vtep.service ovn-northd.service
|
2016-03-09 18:19:55 +01:00
|
|
|
|
/sbin/ldconfig
|
|
|
|
|
|
|
|
|
|
%preun test
|
|
|
|
|
%stop_on_removal openvswitch-testcontroller
|
|
|
|
|
|
|
|
|
|
%postun test
|
|
|
|
|
%restart_on_update openvswitch-testcontroller
|
|
|
|
|
|
Accepting request 361282 from home:k_mroz:branches:network
- Don't install INSTALL.* files.
- Removed: openvswitch-switch.template
- New upstream version 2.4.0
- Flow table modifications are now atomic, meaning that each packet
now sees a coherent version of the OpenFlow pipeline. For
example, if a controller removes all flows with a single OpenFlow
"flow_mod", no packet sees an intermediate version of the OpenFlow
pipeline where only some of the flows have been deleted.
- Added support for SFQ, FQ_CoDel and CoDel qdiscs.
- Add bash command-line completion support for ovs-vsctl Please check
utilities/ovs-command-compgen.INSTALL.md for how to use.
- The MAC learning feature now includes per-port fairness to mitigate
MAC flooding attacks.
- New support for a "conjunctive match" OpenFlow extension, which
allows constructing OpenFlow matches of the form "field1 in
{a,b,c...} AND field2 in {d,e,f...}" and generalizations. For details,
see documentation for the "conjunction" action in ovs-ofctl(8).
- Add bash command-line completion support for ovs-appctl/ovs-dpctl/
ovs-ofctl/ovsdb-tool commands. Please check
utilities/ovs-command-compgen.INSTALL.md for how to use.
- The "learn" action supports a new flag "delete_learned" that causes
the learned flows to be deleted when the flow with the "learn" action
is deleted.
- Basic support for the Geneve tunneling protocol. It is not yet
possible to generate or match options. This is planned for a future
release. The protocol is documented at
http://tools.ietf.org/html/draft-gross-geneve-00
- The OVS database now reports controller rate limiting statistics.
OBS-URL: https://build.opensuse.org/request/show/361282
OBS-URL: https://build.opensuse.org/package/show/network/openvswitch?expand=0&rev=76
2016-02-26 16:24:36 +01:00
|
|
|
|
%post vtep -p /sbin/ldconfig
|
2016-05-19 12:13:17 +02:00
|
|
|
|
%postun vtep -p /sbin/ldconfig
|
2014-09-22 09:24:15 +02:00
|
|
|
|
|
2013-03-08 15:12:33 +01:00
|
|
|
|
%files
|
2012-03-14 11:03:21 +01:00
|
|
|
|
%defattr(-,root,root)
|
|
|
|
|
%dir %{_datadir}/openvswitch
|
Accepting request 361282 from home:k_mroz:branches:network
- Don't install INSTALL.* files.
- Removed: openvswitch-switch.template
- New upstream version 2.4.0
- Flow table modifications are now atomic, meaning that each packet
now sees a coherent version of the OpenFlow pipeline. For
example, if a controller removes all flows with a single OpenFlow
"flow_mod", no packet sees an intermediate version of the OpenFlow
pipeline where only some of the flows have been deleted.
- Added support for SFQ, FQ_CoDel and CoDel qdiscs.
- Add bash command-line completion support for ovs-vsctl Please check
utilities/ovs-command-compgen.INSTALL.md for how to use.
- The MAC learning feature now includes per-port fairness to mitigate
MAC flooding attacks.
- New support for a "conjunctive match" OpenFlow extension, which
allows constructing OpenFlow matches of the form "field1 in
{a,b,c...} AND field2 in {d,e,f...}" and generalizations. For details,
see documentation for the "conjunction" action in ovs-ofctl(8).
- Add bash command-line completion support for ovs-appctl/ovs-dpctl/
ovs-ofctl/ovsdb-tool commands. Please check
utilities/ovs-command-compgen.INSTALL.md for how to use.
- The "learn" action supports a new flag "delete_learned" that causes
the learned flows to be deleted when the flow with the "learn" action
is deleted.
- Basic support for the Geneve tunneling protocol. It is not yet
possible to generate or match options. This is planned for a future
release. The protocol is documented at
http://tools.ietf.org/html/draft-gross-geneve-00
- The OVS database now reports controller rate limiting statistics.
OBS-URL: https://build.opensuse.org/request/show/361282
OBS-URL: https://build.opensuse.org/package/show/network/openvswitch?expand=0&rev=76
2016-02-26 16:24:36 +01:00
|
|
|
|
%doc source/AUTHORS
|
|
|
|
|
%doc source/CONTRIBUTING.md
|
|
|
|
|
%doc source/COPYING
|
|
|
|
|
%doc source/CodingStyle.md
|
|
|
|
|
%doc source/DESIGN.md
|
|
|
|
|
%doc source/FAQ.md
|
|
|
|
|
%doc source/IntegrationGuide.md
|
|
|
|
|
%doc source/NEWS
|
|
|
|
|
%doc source/NOTICE
|
|
|
|
|
%doc source/OPENFLOW-1.1+.md
|
|
|
|
|
%doc source/PORTING.md
|
|
|
|
|
%doc source/README*
|
|
|
|
|
%doc source/SECURITY.md
|
|
|
|
|
%doc source/WHY-OVS.md
|
2012-03-14 11:03:21 +01:00
|
|
|
|
%{_bindir}/ovs-appctl
|
|
|
|
|
%{_bindir}/ovs-ofctl
|
|
|
|
|
%{_bindir}/ovsdb-client
|
2013-03-08 15:12:33 +01:00
|
|
|
|
%{_bindir}/ovs-parse-backtrace
|
2014-05-20 18:03:31 +02:00
|
|
|
|
%{_bindir}/ovs-dpctl-top
|
2012-03-14 11:03:21 +01:00
|
|
|
|
%{_sbindir}/ovs-bugtool
|
|
|
|
|
%{_sbindir}/ovs-vlan-bug-workaround
|
|
|
|
|
%dir %{_datadir}/openvswitch/scripts
|
|
|
|
|
%{_datadir}/openvswitch/bugtool-plugins
|
Accepting request 361282 from home:k_mroz:branches:network
- Don't install INSTALL.* files.
- Removed: openvswitch-switch.template
- New upstream version 2.4.0
- Flow table modifications are now atomic, meaning that each packet
now sees a coherent version of the OpenFlow pipeline. For
example, if a controller removes all flows with a single OpenFlow
"flow_mod", no packet sees an intermediate version of the OpenFlow
pipeline where only some of the flows have been deleted.
- Added support for SFQ, FQ_CoDel and CoDel qdiscs.
- Add bash command-line completion support for ovs-vsctl Please check
utilities/ovs-command-compgen.INSTALL.md for how to use.
- The MAC learning feature now includes per-port fairness to mitigate
MAC flooding attacks.
- New support for a "conjunctive match" OpenFlow extension, which
allows constructing OpenFlow matches of the form "field1 in
{a,b,c...} AND field2 in {d,e,f...}" and generalizations. For details,
see documentation for the "conjunction" action in ovs-ofctl(8).
- Add bash command-line completion support for ovs-appctl/ovs-dpctl/
ovs-ofctl/ovsdb-tool commands. Please check
utilities/ovs-command-compgen.INSTALL.md for how to use.
- The "learn" action supports a new flag "delete_learned" that causes
the learned flows to be deleted when the flow with the "learn" action
is deleted.
- Basic support for the Geneve tunneling protocol. It is not yet
possible to generate or match options. This is planned for a future
release. The protocol is documented at
http://tools.ietf.org/html/draft-gross-geneve-00
- The OVS database now reports controller rate limiting statistics.
OBS-URL: https://build.opensuse.org/request/show/361282
OBS-URL: https://build.opensuse.org/package/show/network/openvswitch?expand=0&rev=76
2016-02-26 16:24:36 +01:00
|
|
|
|
%{_datadir}/openvswitch/scripts/ovs-bugtool-*
|
|
|
|
|
%{_libdir}/libofproto.so.*
|
|
|
|
|
%{_libdir}/libopenvswitch.so.*
|
|
|
|
|
%{_libdir}/libovsdb.so.*
|
|
|
|
|
%{_libdir}/libsflow.so.*
|
Accepting request 408658 from home:markoschandras:network
- Add missing licenses (bsc#988513)
- Misc spec file cleanups highlighted by the spec-cleaner tool.
- Allow aarch64 builds for openvswitch-dpdk
- Add missing bug references to 2.5.0 release.
old: network/openvswitch
new: home:markoschandras:network/openvswitch rev None
Index: openvswitch-dpdk.changes
===================================================================
--- openvswitch-dpdk.changes (revision 98)
+++ openvswitch-dpdk.changes (revision 46)
@@ -1,4 +1,11 @@
-------------------------------------------------------------------
+Tue Jul 12 10:41:14 UTC 2016 - mchandras@suse.de
+
+- Add missing licenses (bsc#988513)
+- Misc spec file cleanups highlighted by the spec-cleaner tool.
+- Allow aarch64 builds for openvswitch-dpdk
+
+-------------------------------------------------------------------
Mon Jul 4 12:08:06 UTC 2016 - mchandras@suse.de
- Allow the OvS daemon to run as non-root (bsc#987545)
@@ -197,6 +204,8 @@
- Added: ovn-northd.service
- TODO: Explicit DPDK support not yet added to spec.
- Spec file work and cleanup.
+- Includes fixes (or obsoletes) the following issues:
+ * bsc#948840, bsc#941466, bsc#936780, bnc#935750, bnc#867964
-------------------------------------------------------------------
Tue Mar 1 08:43:19 UTC 2016 - kmroz@suse.com
Index: openvswitch-dpdk.spec
===================================================================
--- openvswitch-dpdk.spec (revision 98)
+++ openvswitch-dpdk.spec (revision 46)
@@ -14,10 +14,9 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-
-
# needssslcertforbuild
+
# Disable building the external kernel datapath by default
%bcond_with kmp
# DPDK build disabled by default. It's enabled in the
@@ -26,14 +25,16 @@
# The testsuite is somewhat fragile for continuous testing in OBS
# but keep it here as an option
%bcond_with check
-
# Do NOT edit this auto generated file! Edit openvswitch.spec instead
# and run 'pre_checkin.sh' before committing
Name: openvswitch-dpdk
Version: 2.5.0
Release: 0
Summary: An open source, production quality, multilayer virtual switch (DPDK)
-License: Apache-2.0
+# All code is Apache-2.0 except
+# - lib/sflow* which is SISSL
+# - utilities/bugtool which is LGPL-2.1
+License: Apache-2.0 and LGPL-2.1 and SISSL
Group: Productivity/Networking/System
Url: http://openvswitch.org/
Source0: http://openvswitch.org/releases/openvswitch-%{version}.tar.gz
@@ -43,35 +44,26 @@
Source89: Module.supported.updates
# PATCH-FIX-UPSTREAM openvswitch-2.5.0-detect-dpdk-installation.patch
Patch0: openvswitch-%{version}-detect-dpdk-installation.patch
-Patch1: 0001-Remove-broken-pipe-warning-logs-from-ovsdb-server.lo.patch
+Patch1: 0001-Remove-broken-pipe-warning-logs-from-ovsdb-server.lo.patch
BuildRequires: autoconf
BuildRequires: automake
-%if %{with dpdk}
-# We need to be a bit strict with the dpdk version since
-# it's very possible for DPDK to change it's API between
-# releases. OVS currently requires 2.2.0. We may have to
-# provide multiple versions of dpdk if OVS and DPDK get
-# out of sync too often.
-BuildRequires: dpdk-devel = 2.2.0
-ExclusiveArch: x86_64 %ix86
-%endif
BuildRequires: fdupes
BuildRequires: gcc
BuildRequires: glibc-devel
BuildRequires: graphviz
BuildRequires: libcap-ng-devel
-BuildRequires: libopenssl-devel
BuildRequires: libtool
BuildRequires: make
BuildRequires: openssl
BuildRequires: perl
-BuildRequires: pkg-config
+BuildRequires: pkgconfig
# Needed by the testsuite
BuildRequires: procps
BuildRequires: python-devel
BuildRequires: python-xml
+BuildRequires: valgrind-devel
+BuildRequires: pkgconfig(openssl)
Requires: logrotate
-Requires: openssl
Requires: python
Provides: openvswitch-common = %{version}
Obsoletes: openvswitch-common < %{version}
@@ -79,10 +71,16 @@
Obsoletes: openvswitch-controller < %{version}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%py_requires
-BuildRequires: valgrind-devel
-# We can't have openvswitch and openvswitch-dpdk in parallel
%if %{with dpdk}
+# We need to be a bit strict with the dpdk version since
+# it's very possible for DPDK to change it's API between
+# releases. OVS currently requires 2.2.0. We may have to
+# provide multiple versions of dpdk if OVS and DPDK get
+# out of sync too often.
+BuildRequires: dpdk-devel = 2.2.0
+# We can't have openvswitch and openvswitch-dpdk in parallel
Conflicts: openvswitch
+ExclusiveArch: aarch64 x86_64 %{ix86}
%endif
%description
@@ -131,15 +129,15 @@
# ovs-ctl / ovs-pki use /usr/bin/uuidgen:
Requires: util-linux
Requires(post): %fillup_prereq
+Suggests: logrotate
Provides: openvswitch-any-switch = %{version}
+%{?systemd_requires}
%if %{with dpdk}
Conflicts: openvswitch-switch
%endif
-Suggests: logrotate
%if %{with kmp}
Suggests: openvswitch-kmp
%endif
-%{?systemd_requires}
%description switch
openvswitch-switch provides the userspace components and utilities for
@@ -246,7 +244,7 @@
Open vSwitch is a full-featured software-based Ethernet switch.
%prep
-%setup -n openvswitch-%{version} -q
+%setup -q -n openvswitch-%{version}
%patch0 -p1
%patch1 -p1
@@ -290,6 +288,7 @@
--disable-static \
--enable-libcapng \
--enable-shared \
+ --enable-ssl \
${dpdk_opt} \
--with-logdir=%{_localstatedir}/log/openvswitch
make %{?_smp_mflags}
@@ -301,7 +300,7 @@
# 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}" ||
+if make check TESTSUITEFLAGS="%{?_smp_mflags}" ||
make check TESTSUITEFLAGS='--recheck'; then :;
else
cat tests/testsuite.log
@@ -358,7 +357,7 @@
mv %{buildroot}%{_datadir}/openvswitch/python/* %{buildroot}%{py_sitedir}
rmdir %{buildroot}%{_datadir}/openvswitch/python
-rm -f %buildroot/%_libdir/*.la
+find %{buildroot} -type f -name "*.la" -delete -print
# Remove unpackaged files for the dpdk case
%if %{with dpdk}
@@ -438,26 +437,26 @@
%{_libdir}/libopenvswitch.so.*
%{_libdir}/libovsdb.so.*
%{_libdir}/libsflow.so.*
-%{_mandir}/man1/ovs-benchmark.1.gz
-%{_mandir}/man1/ovsdb-client.1.gz
-%{_mandir}/man8/ovs-appctl.8.gz
-%{_mandir}/man8/ovs-bugtool.8.gz
-%{_mandir}/man8/ovs-ofctl.8.gz
-%{_mandir}/man8/ovs-vlan-bug-workaround.8.gz
-%{_mandir}/man8/ovs-parse-backtrace.8.gz
-%{_mandir}/man8/ovs-dpctl-top.8.gz
+%{_mandir}/man1/ovs-benchmark.1%{ext_man}
+%{_mandir}/man1/ovsdb-client.1%{ext_man}
+%{_mandir}/man8/ovs-appctl.8%{ext_man}
+%{_mandir}/man8/ovs-bugtool.8%{ext_man}
+%{_mandir}/man8/ovs-ofctl.8%{ext_man}
+%{_mandir}/man8/ovs-vlan-bug-workaround.8%{ext_man}
+%{_mandir}/man8/ovs-parse-backtrace.8%{ext_man}
+%{_mandir}/man8/ovs-dpctl-top.8%{ext_man}
%{_sysconfdir}/bash_completion.d/ovs-appctl-bashcomp.bash
%files pki
%defattr(-,root,root)
-%{_mandir}/man8/ovs-pki.8.gz
+%{_mandir}/man8/ovs-pki.8%{ext_man}
%{_bindir}/ovs-pki
%files vtep
%defattr(-,root,root)
%{_bindir}/vtep-ctl
-%{_mandir}/man5/vtep.5.gz
-%{_mandir}/man8/vtep-ctl.8.gz
+%{_mandir}/man5/vtep.5%{ext_man}
+%{_mandir}/man8/vtep-ctl.8%{ext_man}
%{_datadir}/openvswitch/scripts/ovs-vtep
%{_datadir}/openvswitch/vtep.ovsschema
%{_libdir}/libvtep.so.*
@@ -489,15 +488,15 @@
%{_datadir}/openvswitch/vswitch.ovsschema
%{_sysconfdir}/bash_completion.d/ovs-vsctl-bashcomp.bash
%config(noreplace) %{_sysconfdir}/logrotate.d/openvswitch-switch
-%{_mandir}/man8/ovs-dpctl.8.gz
-%{_mandir}/man1/ovs-tcpundump.1.gz
-%{_mandir}/man1/ovs-pcap.1.gz
-%{_mandir}/man8/ovs-vsctl.8.gz
-%{_mandir}/man1/ovsdb-tool.1.gz
-%{_mandir}/man8/ovs-vswitchd.8.gz
-%{_mandir}/man1/ovsdb-server.1.gz
-%{_mandir}/man5/ovs-vswitchd.conf.db.5.gz
-%{_mandir}/man8/ovs-ctl.8.gz
+%{_mandir}/man8/ovs-dpctl.8%{ext_man}
+%{_mandir}/man1/ovs-tcpundump.1%{ext_man}
+%{_mandir}/man1/ovs-pcap.1%{ext_man}
+%{_mandir}/man8/ovs-vsctl.8%{ext_man}
+%{_mandir}/man1/ovsdb-tool.1%{ext_man}
+%{_mandir}/man8/ovs-vswitchd.8%{ext_man}
+%{_mandir}/man1/ovsdb-server.1%{ext_man}
+%{_mandir}/man5/ovs-vswitchd.conf.db.5%{ext_man}
+%{_mandir}/man8/ovs-ctl.8%{ext_man}
%{_sbindir}/rcopenvswitch
%{_unitdir}/openvswitch.service
%{_localstatedir}/adm/fillup-templates/sysconfig.openvswitch
@@ -538,10 +537,10 @@
%{_bindir}/ovs-l3ping
%{_bindir}/ovs-vlan-test
%{_bindir}/ovs-testcontroller
-%{_mandir}/man8/ovs-test.8.gz
-%{_mandir}/man8/ovs-l3ping.8.gz
-%{_mandir}/man8/ovs-vlan-test.8.gz
-%{_mandir}/man8/ovs-testcontroller.8.gz
+%{_mandir}/man8/ovs-test.8%{ext_man}
+%{_mandir}/man8/ovs-l3ping.8%{ext_man}
+%{_mandir}/man8/ovs-vlan-test.8%{ext_man}
+%{_mandir}/man8/ovs-testcontroller.8%{ext_man}
%files devel
%defattr(-,root,root)
Index: openvswitch.changes
===================================================================
--- openvswitch.changes (revision 98)
+++ openvswitch.changes (revision 46)
@@ -1,4 +1,11 @@
-------------------------------------------------------------------
+Tue Jul 12 10:41:14 UTC 2016 - mchandras@suse.de
+
+- Add missing licenses (bsc#988513)
+- Misc spec file cleanups highlighted by the spec-cleaner tool.
+- Allow aarch64 builds for openvswitch-dpdk
+
+-------------------------------------------------------------------
Mon Jul 4 12:08:06 UTC 2016 - mchandras@suse.de
- Allow the OvS daemon to run as non-root (bsc#987545)
@@ -197,6 +204,8 @@
- Added: ovn-northd.service
- TODO: Explicit DPDK support not yet added to spec.
- Spec file work and cleanup.
+- Includes fixes (or obsoletes) the following issues:
+ * bsc#948840, bsc#941466, bsc#936780, bnc#935750, bnc#867964
-------------------------------------------------------------------
Tue Mar 1 08:43:19 UTC 2016 - kmroz@suse.com
Index: openvswitch.spec
===================================================================
--- openvswitch.spec (revision 98)
+++ openvswitch.spec (revision 46)
@@ -14,10 +14,9 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-
-
# needssslcertforbuild
+
# Disable building the external kernel datapath by default
%bcond_with kmp
# DPDK build disabled by default. It's enabled in the
@@ -26,12 +25,14 @@
# The testsuite is somewhat fragile for continuous testing in OBS
# but keep it here as an option
%bcond_with check
-
Name: openvswitch
Version: 2.5.0
Release: 0
Summary: An open source, production quality, multilayer virtual switch
-License: Apache-2.0
+# All code is Apache-2.0 except
+# - lib/sflow* which is SISSL
+# - utilities/bugtool which is LGPL-2.1
+License: Apache-2.0 and LGPL-2.1 and SISSL
Group: Productivity/Networking/System
Url: http://openvswitch.org/
Source0: http://openvswitch.org/releases/openvswitch-%{version}.tar.gz
@@ -41,35 +42,26 @@
Source89: Module.supported.updates
# PATCH-FIX-UPSTREAM openvswitch-2.5.0-detect-dpdk-installation.patch
Patch0: openvswitch-%{version}-detect-dpdk-installation.patch
-Patch1: 0001-Remove-broken-pipe-warning-logs-from-ovsdb-server.lo.patch
+Patch1: 0001-Remove-broken-pipe-warning-logs-from-ovsdb-server.lo.patch
BuildRequires: autoconf
BuildRequires: automake
-%if %{with dpdk}
-# We need to be a bit strict with the dpdk version since
-# it's very possible for DPDK to change it's API between
-# releases. OVS currently requires 2.2.0. We may have to
-# provide multiple versions of dpdk if OVS and DPDK get
-# out of sync too often.
-BuildRequires: dpdk-devel = 2.2.0
-ExclusiveArch: x86_64 %ix86
-%endif
BuildRequires: fdupes
BuildRequires: gcc
BuildRequires: glibc-devel
BuildRequires: graphviz
BuildRequires: libcap-ng-devel
-BuildRequires: libopenssl-devel
BuildRequires: libtool
BuildRequires: make
BuildRequires: openssl
BuildRequires: perl
-BuildRequires: pkg-config
+BuildRequires: pkgconfig
# Needed by the testsuite
BuildRequires: procps
BuildRequires: python-devel
BuildRequires: python-xml
+BuildRequires: valgrind-devel
+BuildRequires: pkgconfig(openssl)
Requires: logrotate
-Requires: openssl
Requires: python
Provides: openvswitch-common = %{version}
Obsoletes: openvswitch-common < %{version}
@@ -77,10 +69,16 @@
Obsoletes: openvswitch-controller < %{version}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%py_requires
-BuildRequires: valgrind-devel
-# We can't have openvswitch and openvswitch-dpdk in parallel
%if %{with dpdk}
+# We need to be a bit strict with the dpdk version since
+# it's very possible for DPDK to change it's API between
+# releases. OVS currently requires 2.2.0. We may have to
+# provide multiple versions of dpdk if OVS and DPDK get
+# out of sync too often.
+BuildRequires: dpdk-devel = 2.2.0
+# We can't have openvswitch and openvswitch-dpdk in parallel
Conflicts: openvswitch
+ExclusiveArch: aarch64 x86_64 %{ix86}
%endif
%description
@@ -129,15 +127,15 @@
# ovs-ctl / ovs-pki use /usr/bin/uuidgen:
Requires: util-linux
Requires(post): %fillup_prereq
+Suggests: logrotate
Provides: openvswitch-any-switch = %{version}
+%{?systemd_requires}
%if %{with dpdk}
Conflicts: openvswitch-switch
%endif
-Suggests: logrotate
%if %{with kmp}
Suggests: openvswitch-kmp
%endif
-%{?systemd_requires}
%description switch
openvswitch-switch provides the userspace components and utilities for
@@ -244,7 +242,7 @@
Open vSwitch is a full-featured software-based Ethernet switch.
%prep
-%setup -n openvswitch-%{version} -q
+%setup -q -n openvswitch-%{version}
%patch0 -p1
%patch1 -p1
@@ -288,6 +286,7 @@
--disable-static \
--enable-libcapng \
--enable-shared \
+ --enable-ssl \
${dpdk_opt} \
--with-logdir=%{_localstatedir}/log/openvswitch
make %{?_smp_mflags}
@@ -299,7 +298,7 @@
# 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}" ||
+if make check TESTSUITEFLAGS="%{?_smp_mflags}" ||
make check TESTSUITEFLAGS='--recheck'; then :;
else
cat tests/testsuite.log
@@ -356,7 +355,7 @@
mv %{buildroot}%{_datadir}/openvswitch/python/* %{buildroot}%{py_sitedir}
rmdir %{buildroot}%{_datadir}/openvswitch/python
-rm -f %buildroot/%_libdir/*.la
+find %{buildroot} -type f -name "*.la" -delete -print
# Remove unpackaged files for the dpdk case
%if %{with dpdk}
@@ -436,26 +435,26 @@
%{_libdir}/libopenvswitch.so.*
%{_libdir}/libovsdb.so.*
%{_libdir}/libsflow.so.*
-%{_mandir}/man1/ovs-benchmark.1.gz
-%{_mandir}/man1/ovsdb-client.1.gz
-%{_mandir}/man8/ovs-appctl.8.gz
-%{_mandir}/man8/ovs-bugtool.8.gz
-%{_mandir}/man8/ovs-ofctl.8.gz
-%{_mandir}/man8/ovs-vlan-bug-workaround.8.gz
-%{_mandir}/man8/ovs-parse-backtrace.8.gz
-%{_mandir}/man8/ovs-dpctl-top.8.gz
+%{_mandir}/man1/ovs-benchmark.1%{ext_man}
+%{_mandir}/man1/ovsdb-client.1%{ext_man}
+%{_mandir}/man8/ovs-appctl.8%{ext_man}
+%{_mandir}/man8/ovs-bugtool.8%{ext_man}
+%{_mandir}/man8/ovs-ofctl.8%{ext_man}
+%{_mandir}/man8/ovs-vlan-bug-workaround.8%{ext_man}
+%{_mandir}/man8/ovs-parse-backtrace.8%{ext_man}
+%{_mandir}/man8/ovs-dpctl-top.8%{ext_man}
%{_sysconfdir}/bash_completion.d/ovs-appctl-bashcomp.bash
%files pki
%defattr(-,root,root)
-%{_mandir}/man8/ovs-pki.8.gz
+%{_mandir}/man8/ovs-pki.8%{ext_man}
%{_bindir}/ovs-pki
%files vtep
%defattr(-,root,root)
%{_bindir}/vtep-ctl
-%{_mandir}/man5/vtep.5.gz
-%{_mandir}/man8/vtep-ctl.8.gz
+%{_mandir}/man5/vtep.5%{ext_man}
+%{_mandir}/man8/vtep-ctl.8%{ext_man}
%{_datadir}/openvswitch/scripts/ovs-vtep
%{_datadir}/openvswitch/vtep.ovsschema
%{_libdir}/libvtep.so.*
@@ -487,15 +486,15 @@
%{_datadir}/openvswitch/vswitch.ovsschema
%{_sysconfdir}/bash_completion.d/ovs-vsctl-bashcomp.bash
%config(noreplace) %{_sysconfdir}/logrotate.d/openvswitch-switch
-%{_mandir}/man8/ovs-dpctl.8.gz
-%{_mandir}/man1/ovs-tcpundump.1.gz
-%{_mandir}/man1/ovs-pcap.1.gz
-%{_mandir}/man8/ovs-vsctl.8.gz
-%{_mandir}/man1/ovsdb-tool.1.gz
-%{_mandir}/man8/ovs-vswitchd.8.gz
-%{_mandir}/man1/ovsdb-server.1.gz
-%{_mandir}/man5/ovs-vswitchd.conf.db.5.gz
-%{_mandir}/man8/ovs-ctl.8.gz
+%{_mandir}/man8/ovs-dpctl.8%{ext_man}
+%{_mandir}/man1/ovs-tcpundump.1%{ext_man}
+%{_mandir}/man1/ovs-pcap.1%{ext_man}
+%{_mandir}/man8/ovs-vsctl.8%{ext_man}
+%{_mandir}/man1/ovsdb-tool.1%{ext_man}
+%{_mandir}/man8/ovs-vswitchd.8%{ext_man}
+%{_mandir}/man1/ovsdb-server.1%{ext_man}
+%{_mandir}/man5/ovs-vswitchd.conf.db.5%{ext_man}
+%{_mandir}/man8/ovs-ctl.8%{ext_man}
%{_sbindir}/rcopenvswitch
%{_unitdir}/openvswitch.service
%{_localstatedir}/adm/fillup-templates/sysconfig.openvswitch
@@ -536,10 +535,10 @@
%{_bindir}/ovs-l3ping
%{_bindir}/ovs-vlan-test
%{_bindir}/ovs-testcontroller
-%{_mandir}/man8/ovs-test.8.gz
-%{_mandir}/man8/ovs-l3ping.8.gz
-%{_mandir}/man8/ovs-vlan-test.8.gz
-%{_mandir}/man8/ovs-testcontroller.8.gz
+%{_mandir}/man8/ovs-test.8%{ext_man}
+%{_mandir}/man8/ovs-l3ping.8%{ext_man}
+%{_mandir}/man8/ovs-vlan-test.8%{ext_man}
+%{_mandir}/man8/ovs-testcontroller.8%{ext_man}
%files devel
%defattr(-,root,root)
OBS-URL: https://build.opensuse.org/request/show/408658
OBS-URL: https://build.opensuse.org/package/show/network/openvswitch?expand=0&rev=99
2016-07-18 10:19:36 +02:00
|
|
|
|
%{_mandir}/man1/ovsdb-client.1%{ext_man}
|
|
|
|
|
%{_mandir}/man8/ovs-appctl.8%{ext_man}
|
|
|
|
|
%{_mandir}/man8/ovs-bugtool.8%{ext_man}
|
|
|
|
|
%{_mandir}/man8/ovs-ofctl.8%{ext_man}
|
|
|
|
|
%{_mandir}/man8/ovs-vlan-bug-workaround.8%{ext_man}
|
|
|
|
|
%{_mandir}/man8/ovs-parse-backtrace.8%{ext_man}
|
|
|
|
|
%{_mandir}/man8/ovs-dpctl-top.8%{ext_man}
|
Accepting request 361282 from home:k_mroz:branches:network
- Don't install INSTALL.* files.
- Removed: openvswitch-switch.template
- New upstream version 2.4.0
- Flow table modifications are now atomic, meaning that each packet
now sees a coherent version of the OpenFlow pipeline. For
example, if a controller removes all flows with a single OpenFlow
"flow_mod", no packet sees an intermediate version of the OpenFlow
pipeline where only some of the flows have been deleted.
- Added support for SFQ, FQ_CoDel and CoDel qdiscs.
- Add bash command-line completion support for ovs-vsctl Please check
utilities/ovs-command-compgen.INSTALL.md for how to use.
- The MAC learning feature now includes per-port fairness to mitigate
MAC flooding attacks.
- New support for a "conjunctive match" OpenFlow extension, which
allows constructing OpenFlow matches of the form "field1 in
{a,b,c...} AND field2 in {d,e,f...}" and generalizations. For details,
see documentation for the "conjunction" action in ovs-ofctl(8).
- Add bash command-line completion support for ovs-appctl/ovs-dpctl/
ovs-ofctl/ovsdb-tool commands. Please check
utilities/ovs-command-compgen.INSTALL.md for how to use.
- The "learn" action supports a new flag "delete_learned" that causes
the learned flows to be deleted when the flow with the "learn" action
is deleted.
- Basic support for the Geneve tunneling protocol. It is not yet
possible to generate or match options. This is planned for a future
release. The protocol is documented at
http://tools.ietf.org/html/draft-gross-geneve-00
- The OVS database now reports controller rate limiting statistics.
OBS-URL: https://build.opensuse.org/request/show/361282
OBS-URL: https://build.opensuse.org/package/show/network/openvswitch?expand=0&rev=76
2016-02-26 16:24:36 +01:00
|
|
|
|
%{_sysconfdir}/bash_completion.d/ovs-appctl-bashcomp.bash
|
2013-03-08 15:12:33 +01:00
|
|
|
|
|
2012-03-14 11:03:21 +01:00
|
|
|
|
%files pki
|
2012-04-05 18:51:01 +02:00
|
|
|
|
%defattr(-,root,root)
|
Accepting request 408658 from home:markoschandras:network
- Add missing licenses (bsc#988513)
- Misc spec file cleanups highlighted by the spec-cleaner tool.
- Allow aarch64 builds for openvswitch-dpdk
- Add missing bug references to 2.5.0 release.
old: network/openvswitch
new: home:markoschandras:network/openvswitch rev None
Index: openvswitch-dpdk.changes
===================================================================
--- openvswitch-dpdk.changes (revision 98)
+++ openvswitch-dpdk.changes (revision 46)
@@ -1,4 +1,11 @@
-------------------------------------------------------------------
+Tue Jul 12 10:41:14 UTC 2016 - mchandras@suse.de
+
+- Add missing licenses (bsc#988513)
+- Misc spec file cleanups highlighted by the spec-cleaner tool.
+- Allow aarch64 builds for openvswitch-dpdk
+
+-------------------------------------------------------------------
Mon Jul 4 12:08:06 UTC 2016 - mchandras@suse.de
- Allow the OvS daemon to run as non-root (bsc#987545)
@@ -197,6 +204,8 @@
- Added: ovn-northd.service
- TODO: Explicit DPDK support not yet added to spec.
- Spec file work and cleanup.
+- Includes fixes (or obsoletes) the following issues:
+ * bsc#948840, bsc#941466, bsc#936780, bnc#935750, bnc#867964
-------------------------------------------------------------------
Tue Mar 1 08:43:19 UTC 2016 - kmroz@suse.com
Index: openvswitch-dpdk.spec
===================================================================
--- openvswitch-dpdk.spec (revision 98)
+++ openvswitch-dpdk.spec (revision 46)
@@ -14,10 +14,9 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-
-
# needssslcertforbuild
+
# Disable building the external kernel datapath by default
%bcond_with kmp
# DPDK build disabled by default. It's enabled in the
@@ -26,14 +25,16 @@
# The testsuite is somewhat fragile for continuous testing in OBS
# but keep it here as an option
%bcond_with check
-
# Do NOT edit this auto generated file! Edit openvswitch.spec instead
# and run 'pre_checkin.sh' before committing
Name: openvswitch-dpdk
Version: 2.5.0
Release: 0
Summary: An open source, production quality, multilayer virtual switch (DPDK)
-License: Apache-2.0
+# All code is Apache-2.0 except
+# - lib/sflow* which is SISSL
+# - utilities/bugtool which is LGPL-2.1
+License: Apache-2.0 and LGPL-2.1 and SISSL
Group: Productivity/Networking/System
Url: http://openvswitch.org/
Source0: http://openvswitch.org/releases/openvswitch-%{version}.tar.gz
@@ -43,35 +44,26 @@
Source89: Module.supported.updates
# PATCH-FIX-UPSTREAM openvswitch-2.5.0-detect-dpdk-installation.patch
Patch0: openvswitch-%{version}-detect-dpdk-installation.patch
-Patch1: 0001-Remove-broken-pipe-warning-logs-from-ovsdb-server.lo.patch
+Patch1: 0001-Remove-broken-pipe-warning-logs-from-ovsdb-server.lo.patch
BuildRequires: autoconf
BuildRequires: automake
-%if %{with dpdk}
-# We need to be a bit strict with the dpdk version since
-# it's very possible for DPDK to change it's API between
-# releases. OVS currently requires 2.2.0. We may have to
-# provide multiple versions of dpdk if OVS and DPDK get
-# out of sync too often.
-BuildRequires: dpdk-devel = 2.2.0
-ExclusiveArch: x86_64 %ix86
-%endif
BuildRequires: fdupes
BuildRequires: gcc
BuildRequires: glibc-devel
BuildRequires: graphviz
BuildRequires: libcap-ng-devel
-BuildRequires: libopenssl-devel
BuildRequires: libtool
BuildRequires: make
BuildRequires: openssl
BuildRequires: perl
-BuildRequires: pkg-config
+BuildRequires: pkgconfig
# Needed by the testsuite
BuildRequires: procps
BuildRequires: python-devel
BuildRequires: python-xml
+BuildRequires: valgrind-devel
+BuildRequires: pkgconfig(openssl)
Requires: logrotate
-Requires: openssl
Requires: python
Provides: openvswitch-common = %{version}
Obsoletes: openvswitch-common < %{version}
@@ -79,10 +71,16 @@
Obsoletes: openvswitch-controller < %{version}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%py_requires
-BuildRequires: valgrind-devel
-# We can't have openvswitch and openvswitch-dpdk in parallel
%if %{with dpdk}
+# We need to be a bit strict with the dpdk version since
+# it's very possible for DPDK to change it's API between
+# releases. OVS currently requires 2.2.0. We may have to
+# provide multiple versions of dpdk if OVS and DPDK get
+# out of sync too often.
+BuildRequires: dpdk-devel = 2.2.0
+# We can't have openvswitch and openvswitch-dpdk in parallel
Conflicts: openvswitch
+ExclusiveArch: aarch64 x86_64 %{ix86}
%endif
%description
@@ -131,15 +129,15 @@
# ovs-ctl / ovs-pki use /usr/bin/uuidgen:
Requires: util-linux
Requires(post): %fillup_prereq
+Suggests: logrotate
Provides: openvswitch-any-switch = %{version}
+%{?systemd_requires}
%if %{with dpdk}
Conflicts: openvswitch-switch
%endif
-Suggests: logrotate
%if %{with kmp}
Suggests: openvswitch-kmp
%endif
-%{?systemd_requires}
%description switch
openvswitch-switch provides the userspace components and utilities for
@@ -246,7 +244,7 @@
Open vSwitch is a full-featured software-based Ethernet switch.
%prep
-%setup -n openvswitch-%{version} -q
+%setup -q -n openvswitch-%{version}
%patch0 -p1
%patch1 -p1
@@ -290,6 +288,7 @@
--disable-static \
--enable-libcapng \
--enable-shared \
+ --enable-ssl \
${dpdk_opt} \
--with-logdir=%{_localstatedir}/log/openvswitch
make %{?_smp_mflags}
@@ -301,7 +300,7 @@
# 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}" ||
+if make check TESTSUITEFLAGS="%{?_smp_mflags}" ||
make check TESTSUITEFLAGS='--recheck'; then :;
else
cat tests/testsuite.log
@@ -358,7 +357,7 @@
mv %{buildroot}%{_datadir}/openvswitch/python/* %{buildroot}%{py_sitedir}
rmdir %{buildroot}%{_datadir}/openvswitch/python
-rm -f %buildroot/%_libdir/*.la
+find %{buildroot} -type f -name "*.la" -delete -print
# Remove unpackaged files for the dpdk case
%if %{with dpdk}
@@ -438,26 +437,26 @@
%{_libdir}/libopenvswitch.so.*
%{_libdir}/libovsdb.so.*
%{_libdir}/libsflow.so.*
-%{_mandir}/man1/ovs-benchmark.1.gz
-%{_mandir}/man1/ovsdb-client.1.gz
-%{_mandir}/man8/ovs-appctl.8.gz
-%{_mandir}/man8/ovs-bugtool.8.gz
-%{_mandir}/man8/ovs-ofctl.8.gz
-%{_mandir}/man8/ovs-vlan-bug-workaround.8.gz
-%{_mandir}/man8/ovs-parse-backtrace.8.gz
-%{_mandir}/man8/ovs-dpctl-top.8.gz
+%{_mandir}/man1/ovs-benchmark.1%{ext_man}
+%{_mandir}/man1/ovsdb-client.1%{ext_man}
+%{_mandir}/man8/ovs-appctl.8%{ext_man}
+%{_mandir}/man8/ovs-bugtool.8%{ext_man}
+%{_mandir}/man8/ovs-ofctl.8%{ext_man}
+%{_mandir}/man8/ovs-vlan-bug-workaround.8%{ext_man}
+%{_mandir}/man8/ovs-parse-backtrace.8%{ext_man}
+%{_mandir}/man8/ovs-dpctl-top.8%{ext_man}
%{_sysconfdir}/bash_completion.d/ovs-appctl-bashcomp.bash
%files pki
%defattr(-,root,root)
-%{_mandir}/man8/ovs-pki.8.gz
+%{_mandir}/man8/ovs-pki.8%{ext_man}
%{_bindir}/ovs-pki
%files vtep
%defattr(-,root,root)
%{_bindir}/vtep-ctl
-%{_mandir}/man5/vtep.5.gz
-%{_mandir}/man8/vtep-ctl.8.gz
+%{_mandir}/man5/vtep.5%{ext_man}
+%{_mandir}/man8/vtep-ctl.8%{ext_man}
%{_datadir}/openvswitch/scripts/ovs-vtep
%{_datadir}/openvswitch/vtep.ovsschema
%{_libdir}/libvtep.so.*
@@ -489,15 +488,15 @@
%{_datadir}/openvswitch/vswitch.ovsschema
%{_sysconfdir}/bash_completion.d/ovs-vsctl-bashcomp.bash
%config(noreplace) %{_sysconfdir}/logrotate.d/openvswitch-switch
-%{_mandir}/man8/ovs-dpctl.8.gz
-%{_mandir}/man1/ovs-tcpundump.1.gz
-%{_mandir}/man1/ovs-pcap.1.gz
-%{_mandir}/man8/ovs-vsctl.8.gz
-%{_mandir}/man1/ovsdb-tool.1.gz
-%{_mandir}/man8/ovs-vswitchd.8.gz
-%{_mandir}/man1/ovsdb-server.1.gz
-%{_mandir}/man5/ovs-vswitchd.conf.db.5.gz
-%{_mandir}/man8/ovs-ctl.8.gz
+%{_mandir}/man8/ovs-dpctl.8%{ext_man}
+%{_mandir}/man1/ovs-tcpundump.1%{ext_man}
+%{_mandir}/man1/ovs-pcap.1%{ext_man}
+%{_mandir}/man8/ovs-vsctl.8%{ext_man}
+%{_mandir}/man1/ovsdb-tool.1%{ext_man}
+%{_mandir}/man8/ovs-vswitchd.8%{ext_man}
+%{_mandir}/man1/ovsdb-server.1%{ext_man}
+%{_mandir}/man5/ovs-vswitchd.conf.db.5%{ext_man}
+%{_mandir}/man8/ovs-ctl.8%{ext_man}
%{_sbindir}/rcopenvswitch
%{_unitdir}/openvswitch.service
%{_localstatedir}/adm/fillup-templates/sysconfig.openvswitch
@@ -538,10 +537,10 @@
%{_bindir}/ovs-l3ping
%{_bindir}/ovs-vlan-test
%{_bindir}/ovs-testcontroller
-%{_mandir}/man8/ovs-test.8.gz
-%{_mandir}/man8/ovs-l3ping.8.gz
-%{_mandir}/man8/ovs-vlan-test.8.gz
-%{_mandir}/man8/ovs-testcontroller.8.gz
+%{_mandir}/man8/ovs-test.8%{ext_man}
+%{_mandir}/man8/ovs-l3ping.8%{ext_man}
+%{_mandir}/man8/ovs-vlan-test.8%{ext_man}
+%{_mandir}/man8/ovs-testcontroller.8%{ext_man}
%files devel
%defattr(-,root,root)
Index: openvswitch.changes
===================================================================
--- openvswitch.changes (revision 98)
+++ openvswitch.changes (revision 46)
@@ -1,4 +1,11 @@
-------------------------------------------------------------------
+Tue Jul 12 10:41:14 UTC 2016 - mchandras@suse.de
+
+- Add missing licenses (bsc#988513)
+- Misc spec file cleanups highlighted by the spec-cleaner tool.
+- Allow aarch64 builds for openvswitch-dpdk
+
+-------------------------------------------------------------------
Mon Jul 4 12:08:06 UTC 2016 - mchandras@suse.de
- Allow the OvS daemon to run as non-root (bsc#987545)
@@ -197,6 +204,8 @@
- Added: ovn-northd.service
- TODO: Explicit DPDK support not yet added to spec.
- Spec file work and cleanup.
+- Includes fixes (or obsoletes) the following issues:
+ * bsc#948840, bsc#941466, bsc#936780, bnc#935750, bnc#867964
-------------------------------------------------------------------
Tue Mar 1 08:43:19 UTC 2016 - kmroz@suse.com
Index: openvswitch.spec
===================================================================
--- openvswitch.spec (revision 98)
+++ openvswitch.spec (revision 46)
@@ -14,10 +14,9 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-
-
# needssslcertforbuild
+
# Disable building the external kernel datapath by default
%bcond_with kmp
# DPDK build disabled by default. It's enabled in the
@@ -26,12 +25,14 @@
# The testsuite is somewhat fragile for continuous testing in OBS
# but keep it here as an option
%bcond_with check
-
Name: openvswitch
Version: 2.5.0
Release: 0
Summary: An open source, production quality, multilayer virtual switch
-License: Apache-2.0
+# All code is Apache-2.0 except
+# - lib/sflow* which is SISSL
+# - utilities/bugtool which is LGPL-2.1
+License: Apache-2.0 and LGPL-2.1 and SISSL
Group: Productivity/Networking/System
Url: http://openvswitch.org/
Source0: http://openvswitch.org/releases/openvswitch-%{version}.tar.gz
@@ -41,35 +42,26 @@
Source89: Module.supported.updates
# PATCH-FIX-UPSTREAM openvswitch-2.5.0-detect-dpdk-installation.patch
Patch0: openvswitch-%{version}-detect-dpdk-installation.patch
-Patch1: 0001-Remove-broken-pipe-warning-logs-from-ovsdb-server.lo.patch
+Patch1: 0001-Remove-broken-pipe-warning-logs-from-ovsdb-server.lo.patch
BuildRequires: autoconf
BuildRequires: automake
-%if %{with dpdk}
-# We need to be a bit strict with the dpdk version since
-# it's very possible for DPDK to change it's API between
-# releases. OVS currently requires 2.2.0. We may have to
-# provide multiple versions of dpdk if OVS and DPDK get
-# out of sync too often.
-BuildRequires: dpdk-devel = 2.2.0
-ExclusiveArch: x86_64 %ix86
-%endif
BuildRequires: fdupes
BuildRequires: gcc
BuildRequires: glibc-devel
BuildRequires: graphviz
BuildRequires: libcap-ng-devel
-BuildRequires: libopenssl-devel
BuildRequires: libtool
BuildRequires: make
BuildRequires: openssl
BuildRequires: perl
-BuildRequires: pkg-config
+BuildRequires: pkgconfig
# Needed by the testsuite
BuildRequires: procps
BuildRequires: python-devel
BuildRequires: python-xml
+BuildRequires: valgrind-devel
+BuildRequires: pkgconfig(openssl)
Requires: logrotate
-Requires: openssl
Requires: python
Provides: openvswitch-common = %{version}
Obsoletes: openvswitch-common < %{version}
@@ -77,10 +69,16 @@
Obsoletes: openvswitch-controller < %{version}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%py_requires
-BuildRequires: valgrind-devel
-# We can't have openvswitch and openvswitch-dpdk in parallel
%if %{with dpdk}
+# We need to be a bit strict with the dpdk version since
+# it's very possible for DPDK to change it's API between
+# releases. OVS currently requires 2.2.0. We may have to
+# provide multiple versions of dpdk if OVS and DPDK get
+# out of sync too often.
+BuildRequires: dpdk-devel = 2.2.0
+# We can't have openvswitch and openvswitch-dpdk in parallel
Conflicts: openvswitch
+ExclusiveArch: aarch64 x86_64 %{ix86}
%endif
%description
@@ -129,15 +127,15 @@
# ovs-ctl / ovs-pki use /usr/bin/uuidgen:
Requires: util-linux
Requires(post): %fillup_prereq
+Suggests: logrotate
Provides: openvswitch-any-switch = %{version}
+%{?systemd_requires}
%if %{with dpdk}
Conflicts: openvswitch-switch
%endif
-Suggests: logrotate
%if %{with kmp}
Suggests: openvswitch-kmp
%endif
-%{?systemd_requires}
%description switch
openvswitch-switch provides the userspace components and utilities for
@@ -244,7 +242,7 @@
Open vSwitch is a full-featured software-based Ethernet switch.
%prep
-%setup -n openvswitch-%{version} -q
+%setup -q -n openvswitch-%{version}
%patch0 -p1
%patch1 -p1
@@ -288,6 +286,7 @@
--disable-static \
--enable-libcapng \
--enable-shared \
+ --enable-ssl \
${dpdk_opt} \
--with-logdir=%{_localstatedir}/log/openvswitch
make %{?_smp_mflags}
@@ -299,7 +298,7 @@
# 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}" ||
+if make check TESTSUITEFLAGS="%{?_smp_mflags}" ||
make check TESTSUITEFLAGS='--recheck'; then :;
else
cat tests/testsuite.log
@@ -356,7 +355,7 @@
mv %{buildroot}%{_datadir}/openvswitch/python/* %{buildroot}%{py_sitedir}
rmdir %{buildroot}%{_datadir}/openvswitch/python
-rm -f %buildroot/%_libdir/*.la
+find %{buildroot} -type f -name "*.la" -delete -print
# Remove unpackaged files for the dpdk case
%if %{with dpdk}
@@ -436,26 +435,26 @@
%{_libdir}/libopenvswitch.so.*
%{_libdir}/libovsdb.so.*
%{_libdir}/libsflow.so.*
-%{_mandir}/man1/ovs-benchmark.1.gz
-%{_mandir}/man1/ovsdb-client.1.gz
-%{_mandir}/man8/ovs-appctl.8.gz
-%{_mandir}/man8/ovs-bugtool.8.gz
-%{_mandir}/man8/ovs-ofctl.8.gz
-%{_mandir}/man8/ovs-vlan-bug-workaround.8.gz
-%{_mandir}/man8/ovs-parse-backtrace.8.gz
-%{_mandir}/man8/ovs-dpctl-top.8.gz
+%{_mandir}/man1/ovs-benchmark.1%{ext_man}
+%{_mandir}/man1/ovsdb-client.1%{ext_man}
+%{_mandir}/man8/ovs-appctl.8%{ext_man}
+%{_mandir}/man8/ovs-bugtool.8%{ext_man}
+%{_mandir}/man8/ovs-ofctl.8%{ext_man}
+%{_mandir}/man8/ovs-vlan-bug-workaround.8%{ext_man}
+%{_mandir}/man8/ovs-parse-backtrace.8%{ext_man}
+%{_mandir}/man8/ovs-dpctl-top.8%{ext_man}
%{_sysconfdir}/bash_completion.d/ovs-appctl-bashcomp.bash
%files pki
%defattr(-,root,root)
-%{_mandir}/man8/ovs-pki.8.gz
+%{_mandir}/man8/ovs-pki.8%{ext_man}
%{_bindir}/ovs-pki
%files vtep
%defattr(-,root,root)
%{_bindir}/vtep-ctl
-%{_mandir}/man5/vtep.5.gz
-%{_mandir}/man8/vtep-ctl.8.gz
+%{_mandir}/man5/vtep.5%{ext_man}
+%{_mandir}/man8/vtep-ctl.8%{ext_man}
%{_datadir}/openvswitch/scripts/ovs-vtep
%{_datadir}/openvswitch/vtep.ovsschema
%{_libdir}/libvtep.so.*
@@ -487,15 +486,15 @@
%{_datadir}/openvswitch/vswitch.ovsschema
%{_sysconfdir}/bash_completion.d/ovs-vsctl-bashcomp.bash
%config(noreplace) %{_sysconfdir}/logrotate.d/openvswitch-switch
-%{_mandir}/man8/ovs-dpctl.8.gz
-%{_mandir}/man1/ovs-tcpundump.1.gz
-%{_mandir}/man1/ovs-pcap.1.gz
-%{_mandir}/man8/ovs-vsctl.8.gz
-%{_mandir}/man1/ovsdb-tool.1.gz
-%{_mandir}/man8/ovs-vswitchd.8.gz
-%{_mandir}/man1/ovsdb-server.1.gz
-%{_mandir}/man5/ovs-vswitchd.conf.db.5.gz
-%{_mandir}/man8/ovs-ctl.8.gz
+%{_mandir}/man8/ovs-dpctl.8%{ext_man}
+%{_mandir}/man1/ovs-tcpundump.1%{ext_man}
+%{_mandir}/man1/ovs-pcap.1%{ext_man}
+%{_mandir}/man8/ovs-vsctl.8%{ext_man}
+%{_mandir}/man1/ovsdb-tool.1%{ext_man}
+%{_mandir}/man8/ovs-vswitchd.8%{ext_man}
+%{_mandir}/man1/ovsdb-server.1%{ext_man}
+%{_mandir}/man5/ovs-vswitchd.conf.db.5%{ext_man}
+%{_mandir}/man8/ovs-ctl.8%{ext_man}
%{_sbindir}/rcopenvswitch
%{_unitdir}/openvswitch.service
%{_localstatedir}/adm/fillup-templates/sysconfig.openvswitch
@@ -536,10 +535,10 @@
%{_bindir}/ovs-l3ping
%{_bindir}/ovs-vlan-test
%{_bindir}/ovs-testcontroller
-%{_mandir}/man8/ovs-test.8.gz
-%{_mandir}/man8/ovs-l3ping.8.gz
-%{_mandir}/man8/ovs-vlan-test.8.gz
-%{_mandir}/man8/ovs-testcontroller.8.gz
+%{_mandir}/man8/ovs-test.8%{ext_man}
+%{_mandir}/man8/ovs-l3ping.8%{ext_man}
+%{_mandir}/man8/ovs-vlan-test.8%{ext_man}
+%{_mandir}/man8/ovs-testcontroller.8%{ext_man}
%files devel
%defattr(-,root,root)
OBS-URL: https://build.opensuse.org/request/show/408658
OBS-URL: https://build.opensuse.org/package/show/network/openvswitch?expand=0&rev=99
2016-07-18 10:19:36 +02:00
|
|
|
|
%{_mandir}/man8/ovs-pki.8%{ext_man}
|
2012-03-14 11:03:21 +01:00
|
|
|
|
%{_bindir}/ovs-pki
|
2011-05-20 21:19:18 +02:00
|
|
|
|
|
2014-05-20 18:03:31 +02:00
|
|
|
|
%files vtep
|
|
|
|
|
%defattr(-,root,root)
|
|
|
|
|
%{_bindir}/vtep-ctl
|
Accepting request 408658 from home:markoschandras:network
- Add missing licenses (bsc#988513)
- Misc spec file cleanups highlighted by the spec-cleaner tool.
- Allow aarch64 builds for openvswitch-dpdk
- Add missing bug references to 2.5.0 release.
old: network/openvswitch
new: home:markoschandras:network/openvswitch rev None
Index: openvswitch-dpdk.changes
===================================================================
--- openvswitch-dpdk.changes (revision 98)
+++ openvswitch-dpdk.changes (revision 46)
@@ -1,4 +1,11 @@
-------------------------------------------------------------------
+Tue Jul 12 10:41:14 UTC 2016 - mchandras@suse.de
+
+- Add missing licenses (bsc#988513)
+- Misc spec file cleanups highlighted by the spec-cleaner tool.
+- Allow aarch64 builds for openvswitch-dpdk
+
+-------------------------------------------------------------------
Mon Jul 4 12:08:06 UTC 2016 - mchandras@suse.de
- Allow the OvS daemon to run as non-root (bsc#987545)
@@ -197,6 +204,8 @@
- Added: ovn-northd.service
- TODO: Explicit DPDK support not yet added to spec.
- Spec file work and cleanup.
+- Includes fixes (or obsoletes) the following issues:
+ * bsc#948840, bsc#941466, bsc#936780, bnc#935750, bnc#867964
-------------------------------------------------------------------
Tue Mar 1 08:43:19 UTC 2016 - kmroz@suse.com
Index: openvswitch-dpdk.spec
===================================================================
--- openvswitch-dpdk.spec (revision 98)
+++ openvswitch-dpdk.spec (revision 46)
@@ -14,10 +14,9 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-
-
# needssslcertforbuild
+
# Disable building the external kernel datapath by default
%bcond_with kmp
# DPDK build disabled by default. It's enabled in the
@@ -26,14 +25,16 @@
# The testsuite is somewhat fragile for continuous testing in OBS
# but keep it here as an option
%bcond_with check
-
# Do NOT edit this auto generated file! Edit openvswitch.spec instead
# and run 'pre_checkin.sh' before committing
Name: openvswitch-dpdk
Version: 2.5.0
Release: 0
Summary: An open source, production quality, multilayer virtual switch (DPDK)
-License: Apache-2.0
+# All code is Apache-2.0 except
+# - lib/sflow* which is SISSL
+# - utilities/bugtool which is LGPL-2.1
+License: Apache-2.0 and LGPL-2.1 and SISSL
Group: Productivity/Networking/System
Url: http://openvswitch.org/
Source0: http://openvswitch.org/releases/openvswitch-%{version}.tar.gz
@@ -43,35 +44,26 @@
Source89: Module.supported.updates
# PATCH-FIX-UPSTREAM openvswitch-2.5.0-detect-dpdk-installation.patch
Patch0: openvswitch-%{version}-detect-dpdk-installation.patch
-Patch1: 0001-Remove-broken-pipe-warning-logs-from-ovsdb-server.lo.patch
+Patch1: 0001-Remove-broken-pipe-warning-logs-from-ovsdb-server.lo.patch
BuildRequires: autoconf
BuildRequires: automake
-%if %{with dpdk}
-# We need to be a bit strict with the dpdk version since
-# it's very possible for DPDK to change it's API between
-# releases. OVS currently requires 2.2.0. We may have to
-# provide multiple versions of dpdk if OVS and DPDK get
-# out of sync too often.
-BuildRequires: dpdk-devel = 2.2.0
-ExclusiveArch: x86_64 %ix86
-%endif
BuildRequires: fdupes
BuildRequires: gcc
BuildRequires: glibc-devel
BuildRequires: graphviz
BuildRequires: libcap-ng-devel
-BuildRequires: libopenssl-devel
BuildRequires: libtool
BuildRequires: make
BuildRequires: openssl
BuildRequires: perl
-BuildRequires: pkg-config
+BuildRequires: pkgconfig
# Needed by the testsuite
BuildRequires: procps
BuildRequires: python-devel
BuildRequires: python-xml
+BuildRequires: valgrind-devel
+BuildRequires: pkgconfig(openssl)
Requires: logrotate
-Requires: openssl
Requires: python
Provides: openvswitch-common = %{version}
Obsoletes: openvswitch-common < %{version}
@@ -79,10 +71,16 @@
Obsoletes: openvswitch-controller < %{version}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%py_requires
-BuildRequires: valgrind-devel
-# We can't have openvswitch and openvswitch-dpdk in parallel
%if %{with dpdk}
+# We need to be a bit strict with the dpdk version since
+# it's very possible for DPDK to change it's API between
+# releases. OVS currently requires 2.2.0. We may have to
+# provide multiple versions of dpdk if OVS and DPDK get
+# out of sync too often.
+BuildRequires: dpdk-devel = 2.2.0
+# We can't have openvswitch and openvswitch-dpdk in parallel
Conflicts: openvswitch
+ExclusiveArch: aarch64 x86_64 %{ix86}
%endif
%description
@@ -131,15 +129,15 @@
# ovs-ctl / ovs-pki use /usr/bin/uuidgen:
Requires: util-linux
Requires(post): %fillup_prereq
+Suggests: logrotate
Provides: openvswitch-any-switch = %{version}
+%{?systemd_requires}
%if %{with dpdk}
Conflicts: openvswitch-switch
%endif
-Suggests: logrotate
%if %{with kmp}
Suggests: openvswitch-kmp
%endif
-%{?systemd_requires}
%description switch
openvswitch-switch provides the userspace components and utilities for
@@ -246,7 +244,7 @@
Open vSwitch is a full-featured software-based Ethernet switch.
%prep
-%setup -n openvswitch-%{version} -q
+%setup -q -n openvswitch-%{version}
%patch0 -p1
%patch1 -p1
@@ -290,6 +288,7 @@
--disable-static \
--enable-libcapng \
--enable-shared \
+ --enable-ssl \
${dpdk_opt} \
--with-logdir=%{_localstatedir}/log/openvswitch
make %{?_smp_mflags}
@@ -301,7 +300,7 @@
# 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}" ||
+if make check TESTSUITEFLAGS="%{?_smp_mflags}" ||
make check TESTSUITEFLAGS='--recheck'; then :;
else
cat tests/testsuite.log
@@ -358,7 +357,7 @@
mv %{buildroot}%{_datadir}/openvswitch/python/* %{buildroot}%{py_sitedir}
rmdir %{buildroot}%{_datadir}/openvswitch/python
-rm -f %buildroot/%_libdir/*.la
+find %{buildroot} -type f -name "*.la" -delete -print
# Remove unpackaged files for the dpdk case
%if %{with dpdk}
@@ -438,26 +437,26 @@
%{_libdir}/libopenvswitch.so.*
%{_libdir}/libovsdb.so.*
%{_libdir}/libsflow.so.*
-%{_mandir}/man1/ovs-benchmark.1.gz
-%{_mandir}/man1/ovsdb-client.1.gz
-%{_mandir}/man8/ovs-appctl.8.gz
-%{_mandir}/man8/ovs-bugtool.8.gz
-%{_mandir}/man8/ovs-ofctl.8.gz
-%{_mandir}/man8/ovs-vlan-bug-workaround.8.gz
-%{_mandir}/man8/ovs-parse-backtrace.8.gz
-%{_mandir}/man8/ovs-dpctl-top.8.gz
+%{_mandir}/man1/ovs-benchmark.1%{ext_man}
+%{_mandir}/man1/ovsdb-client.1%{ext_man}
+%{_mandir}/man8/ovs-appctl.8%{ext_man}
+%{_mandir}/man8/ovs-bugtool.8%{ext_man}
+%{_mandir}/man8/ovs-ofctl.8%{ext_man}
+%{_mandir}/man8/ovs-vlan-bug-workaround.8%{ext_man}
+%{_mandir}/man8/ovs-parse-backtrace.8%{ext_man}
+%{_mandir}/man8/ovs-dpctl-top.8%{ext_man}
%{_sysconfdir}/bash_completion.d/ovs-appctl-bashcomp.bash
%files pki
%defattr(-,root,root)
-%{_mandir}/man8/ovs-pki.8.gz
+%{_mandir}/man8/ovs-pki.8%{ext_man}
%{_bindir}/ovs-pki
%files vtep
%defattr(-,root,root)
%{_bindir}/vtep-ctl
-%{_mandir}/man5/vtep.5.gz
-%{_mandir}/man8/vtep-ctl.8.gz
+%{_mandir}/man5/vtep.5%{ext_man}
+%{_mandir}/man8/vtep-ctl.8%{ext_man}
%{_datadir}/openvswitch/scripts/ovs-vtep
%{_datadir}/openvswitch/vtep.ovsschema
%{_libdir}/libvtep.so.*
@@ -489,15 +488,15 @@
%{_datadir}/openvswitch/vswitch.ovsschema
%{_sysconfdir}/bash_completion.d/ovs-vsctl-bashcomp.bash
%config(noreplace) %{_sysconfdir}/logrotate.d/openvswitch-switch
-%{_mandir}/man8/ovs-dpctl.8.gz
-%{_mandir}/man1/ovs-tcpundump.1.gz
-%{_mandir}/man1/ovs-pcap.1.gz
-%{_mandir}/man8/ovs-vsctl.8.gz
-%{_mandir}/man1/ovsdb-tool.1.gz
-%{_mandir}/man8/ovs-vswitchd.8.gz
-%{_mandir}/man1/ovsdb-server.1.gz
-%{_mandir}/man5/ovs-vswitchd.conf.db.5.gz
-%{_mandir}/man8/ovs-ctl.8.gz
+%{_mandir}/man8/ovs-dpctl.8%{ext_man}
+%{_mandir}/man1/ovs-tcpundump.1%{ext_man}
+%{_mandir}/man1/ovs-pcap.1%{ext_man}
+%{_mandir}/man8/ovs-vsctl.8%{ext_man}
+%{_mandir}/man1/ovsdb-tool.1%{ext_man}
+%{_mandir}/man8/ovs-vswitchd.8%{ext_man}
+%{_mandir}/man1/ovsdb-server.1%{ext_man}
+%{_mandir}/man5/ovs-vswitchd.conf.db.5%{ext_man}
+%{_mandir}/man8/ovs-ctl.8%{ext_man}
%{_sbindir}/rcopenvswitch
%{_unitdir}/openvswitch.service
%{_localstatedir}/adm/fillup-templates/sysconfig.openvswitch
@@ -538,10 +537,10 @@
%{_bindir}/ovs-l3ping
%{_bindir}/ovs-vlan-test
%{_bindir}/ovs-testcontroller
-%{_mandir}/man8/ovs-test.8.gz
-%{_mandir}/man8/ovs-l3ping.8.gz
-%{_mandir}/man8/ovs-vlan-test.8.gz
-%{_mandir}/man8/ovs-testcontroller.8.gz
+%{_mandir}/man8/ovs-test.8%{ext_man}
+%{_mandir}/man8/ovs-l3ping.8%{ext_man}
+%{_mandir}/man8/ovs-vlan-test.8%{ext_man}
+%{_mandir}/man8/ovs-testcontroller.8%{ext_man}
%files devel
%defattr(-,root,root)
Index: openvswitch.changes
===================================================================
--- openvswitch.changes (revision 98)
+++ openvswitch.changes (revision 46)
@@ -1,4 +1,11 @@
-------------------------------------------------------------------
+Tue Jul 12 10:41:14 UTC 2016 - mchandras@suse.de
+
+- Add missing licenses (bsc#988513)
+- Misc spec file cleanups highlighted by the spec-cleaner tool.
+- Allow aarch64 builds for openvswitch-dpdk
+
+-------------------------------------------------------------------
Mon Jul 4 12:08:06 UTC 2016 - mchandras@suse.de
- Allow the OvS daemon to run as non-root (bsc#987545)
@@ -197,6 +204,8 @@
- Added: ovn-northd.service
- TODO: Explicit DPDK support not yet added to spec.
- Spec file work and cleanup.
+- Includes fixes (or obsoletes) the following issues:
+ * bsc#948840, bsc#941466, bsc#936780, bnc#935750, bnc#867964
-------------------------------------------------------------------
Tue Mar 1 08:43:19 UTC 2016 - kmroz@suse.com
Index: openvswitch.spec
===================================================================
--- openvswitch.spec (revision 98)
+++ openvswitch.spec (revision 46)
@@ -14,10 +14,9 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-
-
# needssslcertforbuild
+
# Disable building the external kernel datapath by default
%bcond_with kmp
# DPDK build disabled by default. It's enabled in the
@@ -26,12 +25,14 @@
# The testsuite is somewhat fragile for continuous testing in OBS
# but keep it here as an option
%bcond_with check
-
Name: openvswitch
Version: 2.5.0
Release: 0
Summary: An open source, production quality, multilayer virtual switch
-License: Apache-2.0
+# All code is Apache-2.0 except
+# - lib/sflow* which is SISSL
+# - utilities/bugtool which is LGPL-2.1
+License: Apache-2.0 and LGPL-2.1 and SISSL
Group: Productivity/Networking/System
Url: http://openvswitch.org/
Source0: http://openvswitch.org/releases/openvswitch-%{version}.tar.gz
@@ -41,35 +42,26 @@
Source89: Module.supported.updates
# PATCH-FIX-UPSTREAM openvswitch-2.5.0-detect-dpdk-installation.patch
Patch0: openvswitch-%{version}-detect-dpdk-installation.patch
-Patch1: 0001-Remove-broken-pipe-warning-logs-from-ovsdb-server.lo.patch
+Patch1: 0001-Remove-broken-pipe-warning-logs-from-ovsdb-server.lo.patch
BuildRequires: autoconf
BuildRequires: automake
-%if %{with dpdk}
-# We need to be a bit strict with the dpdk version since
-# it's very possible for DPDK to change it's API between
-# releases. OVS currently requires 2.2.0. We may have to
-# provide multiple versions of dpdk if OVS and DPDK get
-# out of sync too often.
-BuildRequires: dpdk-devel = 2.2.0
-ExclusiveArch: x86_64 %ix86
-%endif
BuildRequires: fdupes
BuildRequires: gcc
BuildRequires: glibc-devel
BuildRequires: graphviz
BuildRequires: libcap-ng-devel
-BuildRequires: libopenssl-devel
BuildRequires: libtool
BuildRequires: make
BuildRequires: openssl
BuildRequires: perl
-BuildRequires: pkg-config
+BuildRequires: pkgconfig
# Needed by the testsuite
BuildRequires: procps
BuildRequires: python-devel
BuildRequires: python-xml
+BuildRequires: valgrind-devel
+BuildRequires: pkgconfig(openssl)
Requires: logrotate
-Requires: openssl
Requires: python
Provides: openvswitch-common = %{version}
Obsoletes: openvswitch-common < %{version}
@@ -77,10 +69,16 @@
Obsoletes: openvswitch-controller < %{version}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%py_requires
-BuildRequires: valgrind-devel
-# We can't have openvswitch and openvswitch-dpdk in parallel
%if %{with dpdk}
+# We need to be a bit strict with the dpdk version since
+# it's very possible for DPDK to change it's API between
+# releases. OVS currently requires 2.2.0. We may have to
+# provide multiple versions of dpdk if OVS and DPDK get
+# out of sync too often.
+BuildRequires: dpdk-devel = 2.2.0
+# We can't have openvswitch and openvswitch-dpdk in parallel
Conflicts: openvswitch
+ExclusiveArch: aarch64 x86_64 %{ix86}
%endif
%description
@@ -129,15 +127,15 @@
# ovs-ctl / ovs-pki use /usr/bin/uuidgen:
Requires: util-linux
Requires(post): %fillup_prereq
+Suggests: logrotate
Provides: openvswitch-any-switch = %{version}
+%{?systemd_requires}
%if %{with dpdk}
Conflicts: openvswitch-switch
%endif
-Suggests: logrotate
%if %{with kmp}
Suggests: openvswitch-kmp
%endif
-%{?systemd_requires}
%description switch
openvswitch-switch provides the userspace components and utilities for
@@ -244,7 +242,7 @@
Open vSwitch is a full-featured software-based Ethernet switch.
%prep
-%setup -n openvswitch-%{version} -q
+%setup -q -n openvswitch-%{version}
%patch0 -p1
%patch1 -p1
@@ -288,6 +286,7 @@
--disable-static \
--enable-libcapng \
--enable-shared \
+ --enable-ssl \
${dpdk_opt} \
--with-logdir=%{_localstatedir}/log/openvswitch
make %{?_smp_mflags}
@@ -299,7 +298,7 @@
# 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}" ||
+if make check TESTSUITEFLAGS="%{?_smp_mflags}" ||
make check TESTSUITEFLAGS='--recheck'; then :;
else
cat tests/testsuite.log
@@ -356,7 +355,7 @@
mv %{buildroot}%{_datadir}/openvswitch/python/* %{buildroot}%{py_sitedir}
rmdir %{buildroot}%{_datadir}/openvswitch/python
-rm -f %buildroot/%_libdir/*.la
+find %{buildroot} -type f -name "*.la" -delete -print
# Remove unpackaged files for the dpdk case
%if %{with dpdk}
@@ -436,26 +435,26 @@
%{_libdir}/libopenvswitch.so.*
%{_libdir}/libovsdb.so.*
%{_libdir}/libsflow.so.*
-%{_mandir}/man1/ovs-benchmark.1.gz
-%{_mandir}/man1/ovsdb-client.1.gz
-%{_mandir}/man8/ovs-appctl.8.gz
-%{_mandir}/man8/ovs-bugtool.8.gz
-%{_mandir}/man8/ovs-ofctl.8.gz
-%{_mandir}/man8/ovs-vlan-bug-workaround.8.gz
-%{_mandir}/man8/ovs-parse-backtrace.8.gz
-%{_mandir}/man8/ovs-dpctl-top.8.gz
+%{_mandir}/man1/ovs-benchmark.1%{ext_man}
+%{_mandir}/man1/ovsdb-client.1%{ext_man}
+%{_mandir}/man8/ovs-appctl.8%{ext_man}
+%{_mandir}/man8/ovs-bugtool.8%{ext_man}
+%{_mandir}/man8/ovs-ofctl.8%{ext_man}
+%{_mandir}/man8/ovs-vlan-bug-workaround.8%{ext_man}
+%{_mandir}/man8/ovs-parse-backtrace.8%{ext_man}
+%{_mandir}/man8/ovs-dpctl-top.8%{ext_man}
%{_sysconfdir}/bash_completion.d/ovs-appctl-bashcomp.bash
%files pki
%defattr(-,root,root)
-%{_mandir}/man8/ovs-pki.8.gz
+%{_mandir}/man8/ovs-pki.8%{ext_man}
%{_bindir}/ovs-pki
%files vtep
%defattr(-,root,root)
%{_bindir}/vtep-ctl
-%{_mandir}/man5/vtep.5.gz
-%{_mandir}/man8/vtep-ctl.8.gz
+%{_mandir}/man5/vtep.5%{ext_man}
+%{_mandir}/man8/vtep-ctl.8%{ext_man}
%{_datadir}/openvswitch/scripts/ovs-vtep
%{_datadir}/openvswitch/vtep.ovsschema
%{_libdir}/libvtep.so.*
@@ -487,15 +486,15 @@
%{_datadir}/openvswitch/vswitch.ovsschema
%{_sysconfdir}/bash_completion.d/ovs-vsctl-bashcomp.bash
%config(noreplace) %{_sysconfdir}/logrotate.d/openvswitch-switch
-%{_mandir}/man8/ovs-dpctl.8.gz
-%{_mandir}/man1/ovs-tcpundump.1.gz
-%{_mandir}/man1/ovs-pcap.1.gz
-%{_mandir}/man8/ovs-vsctl.8.gz
-%{_mandir}/man1/ovsdb-tool.1.gz
-%{_mandir}/man8/ovs-vswitchd.8.gz
-%{_mandir}/man1/ovsdb-server.1.gz
-%{_mandir}/man5/ovs-vswitchd.conf.db.5.gz
-%{_mandir}/man8/ovs-ctl.8.gz
+%{_mandir}/man8/ovs-dpctl.8%{ext_man}
+%{_mandir}/man1/ovs-tcpundump.1%{ext_man}
+%{_mandir}/man1/ovs-pcap.1%{ext_man}
+%{_mandir}/man8/ovs-vsctl.8%{ext_man}
+%{_mandir}/man1/ovsdb-tool.1%{ext_man}
+%{_mandir}/man8/ovs-vswitchd.8%{ext_man}
+%{_mandir}/man1/ovsdb-server.1%{ext_man}
+%{_mandir}/man5/ovs-vswitchd.conf.db.5%{ext_man}
+%{_mandir}/man8/ovs-ctl.8%{ext_man}
%{_sbindir}/rcopenvswitch
%{_unitdir}/openvswitch.service
%{_localstatedir}/adm/fillup-templates/sysconfig.openvswitch
@@ -536,10 +535,10 @@
%{_bindir}/ovs-l3ping
%{_bindir}/ovs-vlan-test
%{_bindir}/ovs-testcontroller
-%{_mandir}/man8/ovs-test.8.gz
-%{_mandir}/man8/ovs-l3ping.8.gz
-%{_mandir}/man8/ovs-vlan-test.8.gz
-%{_mandir}/man8/ovs-testcontroller.8.gz
+%{_mandir}/man8/ovs-test.8%{ext_man}
+%{_mandir}/man8/ovs-l3ping.8%{ext_man}
+%{_mandir}/man8/ovs-vlan-test.8%{ext_man}
+%{_mandir}/man8/ovs-testcontroller.8%{ext_man}
%files devel
%defattr(-,root,root)
OBS-URL: https://build.opensuse.org/request/show/408658
OBS-URL: https://build.opensuse.org/package/show/network/openvswitch?expand=0&rev=99
2016-07-18 10:19:36 +02:00
|
|
|
|
%{_mandir}/man5/vtep.5%{ext_man}
|
|
|
|
|
%{_mandir}/man8/vtep-ctl.8%{ext_man}
|
2014-05-20 18:03:31 +02:00
|
|
|
|
%{_datadir}/openvswitch/scripts/ovs-vtep
|
|
|
|
|
%{_datadir}/openvswitch/vtep.ovsschema
|
Accepting request 361282 from home:k_mroz:branches:network
- Don't install INSTALL.* files.
- Removed: openvswitch-switch.template
- New upstream version 2.4.0
- Flow table modifications are now atomic, meaning that each packet
now sees a coherent version of the OpenFlow pipeline. For
example, if a controller removes all flows with a single OpenFlow
"flow_mod", no packet sees an intermediate version of the OpenFlow
pipeline where only some of the flows have been deleted.
- Added support for SFQ, FQ_CoDel and CoDel qdiscs.
- Add bash command-line completion support for ovs-vsctl Please check
utilities/ovs-command-compgen.INSTALL.md for how to use.
- The MAC learning feature now includes per-port fairness to mitigate
MAC flooding attacks.
- New support for a "conjunctive match" OpenFlow extension, which
allows constructing OpenFlow matches of the form "field1 in
{a,b,c...} AND field2 in {d,e,f...}" and generalizations. For details,
see documentation for the "conjunction" action in ovs-ofctl(8).
- Add bash command-line completion support for ovs-appctl/ovs-dpctl/
ovs-ofctl/ovsdb-tool commands. Please check
utilities/ovs-command-compgen.INSTALL.md for how to use.
- The "learn" action supports a new flag "delete_learned" that causes
the learned flows to be deleted when the flow with the "learn" action
is deleted.
- Basic support for the Geneve tunneling protocol. It is not yet
possible to generate or match options. This is planned for a future
release. The protocol is documented at
http://tools.ietf.org/html/draft-gross-geneve-00
- The OVS database now reports controller rate limiting statistics.
OBS-URL: https://build.opensuse.org/request/show/361282
OBS-URL: https://build.opensuse.org/package/show/network/openvswitch?expand=0&rev=76
2016-02-26 16:24:36 +01:00
|
|
|
|
%{_libdir}/libvtep.so.*
|
2014-05-20 18:03:31 +02:00
|
|
|
|
|
2016-06-22 11:27:41 +02:00
|
|
|
|
%if ! %{with dpdk}
|
2016-06-28 16:58:40 +02:00
|
|
|
|
%files -n python-openvswitch
|
2014-09-22 09:24:15 +02:00
|
|
|
|
%defattr(-,root,root)
|
|
|
|
|
%{py_sitedir}/ovs/
|
|
|
|
|
|
2016-06-28 16:58:40 +02:00
|
|
|
|
%files -n python-openvswitch-test
|
2014-09-22 09:24:15 +02:00
|
|
|
|
%defattr(-,root,root)
|
|
|
|
|
%{py_sitedir}/ovstest/
|
2016-06-22 11:27:41 +02:00
|
|
|
|
%endif
|
2014-09-22 09:24:15 +02:00
|
|
|
|
|
2012-03-14 11:03:21 +01:00
|
|
|
|
%files switch
|
|
|
|
|
%defattr(-,root,root)
|
Accepting request 361282 from home:k_mroz:branches:network
- Don't install INSTALL.* files.
- Removed: openvswitch-switch.template
- New upstream version 2.4.0
- Flow table modifications are now atomic, meaning that each packet
now sees a coherent version of the OpenFlow pipeline. For
example, if a controller removes all flows with a single OpenFlow
"flow_mod", no packet sees an intermediate version of the OpenFlow
pipeline where only some of the flows have been deleted.
- Added support for SFQ, FQ_CoDel and CoDel qdiscs.
- Add bash command-line completion support for ovs-vsctl Please check
utilities/ovs-command-compgen.INSTALL.md for how to use.
- The MAC learning feature now includes per-port fairness to mitigate
MAC flooding attacks.
- New support for a "conjunctive match" OpenFlow extension, which
allows constructing OpenFlow matches of the form "field1 in
{a,b,c...} AND field2 in {d,e,f...}" and generalizations. For details,
see documentation for the "conjunction" action in ovs-ofctl(8).
- Add bash command-line completion support for ovs-appctl/ovs-dpctl/
ovs-ofctl/ovsdb-tool commands. Please check
utilities/ovs-command-compgen.INSTALL.md for how to use.
- The "learn" action supports a new flag "delete_learned" that causes
the learned flows to be deleted when the flow with the "learn" action
is deleted.
- Basic support for the Geneve tunneling protocol. It is not yet
possible to generate or match options. This is planned for a future
release. The protocol is documented at
http://tools.ietf.org/html/draft-gross-geneve-00
- The OVS database now reports controller rate limiting statistics.
OBS-URL: https://build.opensuse.org/request/show/361282
OBS-URL: https://build.opensuse.org/package/show/network/openvswitch?expand=0&rev=76
2016-02-26 16:24:36 +01:00
|
|
|
|
%{_bindir}/ovs-docker
|
2012-03-14 11:03:21 +01:00
|
|
|
|
%{_bindir}/ovs-dpctl
|
|
|
|
|
%{_bindir}/ovs-vsctl
|
|
|
|
|
%{_bindir}/ovsdb-tool
|
|
|
|
|
%{_sbindir}/ovs-vswitchd
|
|
|
|
|
%{_sbindir}/ovsdb-server
|
2013-03-08 15:12:33 +01:00
|
|
|
|
%{_datadir}/openvswitch/scripts/ovs-check-dead-ifs
|
2012-03-14 11:03:21 +01:00
|
|
|
|
%{_datadir}/openvswitch/scripts/ovs-ctl
|
|
|
|
|
%{_datadir}/openvswitch/scripts/ovs-lib
|
|
|
|
|
%{_datadir}/openvswitch/scripts/ovs-save
|
|
|
|
|
%{_datadir}/openvswitch/vswitch.ovsschema
|
Accepting request 361282 from home:k_mroz:branches:network
- Don't install INSTALL.* files.
- Removed: openvswitch-switch.template
- New upstream version 2.4.0
- Flow table modifications are now atomic, meaning that each packet
now sees a coherent version of the OpenFlow pipeline. For
example, if a controller removes all flows with a single OpenFlow
"flow_mod", no packet sees an intermediate version of the OpenFlow
pipeline where only some of the flows have been deleted.
- Added support for SFQ, FQ_CoDel and CoDel qdiscs.
- Add bash command-line completion support for ovs-vsctl Please check
utilities/ovs-command-compgen.INSTALL.md for how to use.
- The MAC learning feature now includes per-port fairness to mitigate
MAC flooding attacks.
- New support for a "conjunctive match" OpenFlow extension, which
allows constructing OpenFlow matches of the form "field1 in
{a,b,c...} AND field2 in {d,e,f...}" and generalizations. For details,
see documentation for the "conjunction" action in ovs-ofctl(8).
- Add bash command-line completion support for ovs-appctl/ovs-dpctl/
ovs-ofctl/ovsdb-tool commands. Please check
utilities/ovs-command-compgen.INSTALL.md for how to use.
- The "learn" action supports a new flag "delete_learned" that causes
the learned flows to be deleted when the flow with the "learn" action
is deleted.
- Basic support for the Geneve tunneling protocol. It is not yet
possible to generate or match options. This is planned for a future
release. The protocol is documented at
http://tools.ietf.org/html/draft-gross-geneve-00
- The OVS database now reports controller rate limiting statistics.
OBS-URL: https://build.opensuse.org/request/show/361282
OBS-URL: https://build.opensuse.org/package/show/network/openvswitch?expand=0&rev=76
2016-02-26 16:24:36 +01:00
|
|
|
|
%{_sysconfdir}/bash_completion.d/ovs-vsctl-bashcomp.bash
|
2013-03-08 15:12:33 +01:00
|
|
|
|
%config(noreplace) %{_sysconfdir}/logrotate.d/openvswitch-switch
|
Accepting request 408658 from home:markoschandras:network
- Add missing licenses (bsc#988513)
- Misc spec file cleanups highlighted by the spec-cleaner tool.
- Allow aarch64 builds for openvswitch-dpdk
- Add missing bug references to 2.5.0 release.
old: network/openvswitch
new: home:markoschandras:network/openvswitch rev None
Index: openvswitch-dpdk.changes
===================================================================
--- openvswitch-dpdk.changes (revision 98)
+++ openvswitch-dpdk.changes (revision 46)
@@ -1,4 +1,11 @@
-------------------------------------------------------------------
+Tue Jul 12 10:41:14 UTC 2016 - mchandras@suse.de
+
+- Add missing licenses (bsc#988513)
+- Misc spec file cleanups highlighted by the spec-cleaner tool.
+- Allow aarch64 builds for openvswitch-dpdk
+
+-------------------------------------------------------------------
Mon Jul 4 12:08:06 UTC 2016 - mchandras@suse.de
- Allow the OvS daemon to run as non-root (bsc#987545)
@@ -197,6 +204,8 @@
- Added: ovn-northd.service
- TODO: Explicit DPDK support not yet added to spec.
- Spec file work and cleanup.
+- Includes fixes (or obsoletes) the following issues:
+ * bsc#948840, bsc#941466, bsc#936780, bnc#935750, bnc#867964
-------------------------------------------------------------------
Tue Mar 1 08:43:19 UTC 2016 - kmroz@suse.com
Index: openvswitch-dpdk.spec
===================================================================
--- openvswitch-dpdk.spec (revision 98)
+++ openvswitch-dpdk.spec (revision 46)
@@ -14,10 +14,9 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-
-
# needssslcertforbuild
+
# Disable building the external kernel datapath by default
%bcond_with kmp
# DPDK build disabled by default. It's enabled in the
@@ -26,14 +25,16 @@
# The testsuite is somewhat fragile for continuous testing in OBS
# but keep it here as an option
%bcond_with check
-
# Do NOT edit this auto generated file! Edit openvswitch.spec instead
# and run 'pre_checkin.sh' before committing
Name: openvswitch-dpdk
Version: 2.5.0
Release: 0
Summary: An open source, production quality, multilayer virtual switch (DPDK)
-License: Apache-2.0
+# All code is Apache-2.0 except
+# - lib/sflow* which is SISSL
+# - utilities/bugtool which is LGPL-2.1
+License: Apache-2.0 and LGPL-2.1 and SISSL
Group: Productivity/Networking/System
Url: http://openvswitch.org/
Source0: http://openvswitch.org/releases/openvswitch-%{version}.tar.gz
@@ -43,35 +44,26 @@
Source89: Module.supported.updates
# PATCH-FIX-UPSTREAM openvswitch-2.5.0-detect-dpdk-installation.patch
Patch0: openvswitch-%{version}-detect-dpdk-installation.patch
-Patch1: 0001-Remove-broken-pipe-warning-logs-from-ovsdb-server.lo.patch
+Patch1: 0001-Remove-broken-pipe-warning-logs-from-ovsdb-server.lo.patch
BuildRequires: autoconf
BuildRequires: automake
-%if %{with dpdk}
-# We need to be a bit strict with the dpdk version since
-# it's very possible for DPDK to change it's API between
-# releases. OVS currently requires 2.2.0. We may have to
-# provide multiple versions of dpdk if OVS and DPDK get
-# out of sync too often.
-BuildRequires: dpdk-devel = 2.2.0
-ExclusiveArch: x86_64 %ix86
-%endif
BuildRequires: fdupes
BuildRequires: gcc
BuildRequires: glibc-devel
BuildRequires: graphviz
BuildRequires: libcap-ng-devel
-BuildRequires: libopenssl-devel
BuildRequires: libtool
BuildRequires: make
BuildRequires: openssl
BuildRequires: perl
-BuildRequires: pkg-config
+BuildRequires: pkgconfig
# Needed by the testsuite
BuildRequires: procps
BuildRequires: python-devel
BuildRequires: python-xml
+BuildRequires: valgrind-devel
+BuildRequires: pkgconfig(openssl)
Requires: logrotate
-Requires: openssl
Requires: python
Provides: openvswitch-common = %{version}
Obsoletes: openvswitch-common < %{version}
@@ -79,10 +71,16 @@
Obsoletes: openvswitch-controller < %{version}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%py_requires
-BuildRequires: valgrind-devel
-# We can't have openvswitch and openvswitch-dpdk in parallel
%if %{with dpdk}
+# We need to be a bit strict with the dpdk version since
+# it's very possible for DPDK to change it's API between
+# releases. OVS currently requires 2.2.0. We may have to
+# provide multiple versions of dpdk if OVS and DPDK get
+# out of sync too often.
+BuildRequires: dpdk-devel = 2.2.0
+# We can't have openvswitch and openvswitch-dpdk in parallel
Conflicts: openvswitch
+ExclusiveArch: aarch64 x86_64 %{ix86}
%endif
%description
@@ -131,15 +129,15 @@
# ovs-ctl / ovs-pki use /usr/bin/uuidgen:
Requires: util-linux
Requires(post): %fillup_prereq
+Suggests: logrotate
Provides: openvswitch-any-switch = %{version}
+%{?systemd_requires}
%if %{with dpdk}
Conflicts: openvswitch-switch
%endif
-Suggests: logrotate
%if %{with kmp}
Suggests: openvswitch-kmp
%endif
-%{?systemd_requires}
%description switch
openvswitch-switch provides the userspace components and utilities for
@@ -246,7 +244,7 @@
Open vSwitch is a full-featured software-based Ethernet switch.
%prep
-%setup -n openvswitch-%{version} -q
+%setup -q -n openvswitch-%{version}
%patch0 -p1
%patch1 -p1
@@ -290,6 +288,7 @@
--disable-static \
--enable-libcapng \
--enable-shared \
+ --enable-ssl \
${dpdk_opt} \
--with-logdir=%{_localstatedir}/log/openvswitch
make %{?_smp_mflags}
@@ -301,7 +300,7 @@
# 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}" ||
+if make check TESTSUITEFLAGS="%{?_smp_mflags}" ||
make check TESTSUITEFLAGS='--recheck'; then :;
else
cat tests/testsuite.log
@@ -358,7 +357,7 @@
mv %{buildroot}%{_datadir}/openvswitch/python/* %{buildroot}%{py_sitedir}
rmdir %{buildroot}%{_datadir}/openvswitch/python
-rm -f %buildroot/%_libdir/*.la
+find %{buildroot} -type f -name "*.la" -delete -print
# Remove unpackaged files for the dpdk case
%if %{with dpdk}
@@ -438,26 +437,26 @@
%{_libdir}/libopenvswitch.so.*
%{_libdir}/libovsdb.so.*
%{_libdir}/libsflow.so.*
-%{_mandir}/man1/ovs-benchmark.1.gz
-%{_mandir}/man1/ovsdb-client.1.gz
-%{_mandir}/man8/ovs-appctl.8.gz
-%{_mandir}/man8/ovs-bugtool.8.gz
-%{_mandir}/man8/ovs-ofctl.8.gz
-%{_mandir}/man8/ovs-vlan-bug-workaround.8.gz
-%{_mandir}/man8/ovs-parse-backtrace.8.gz
-%{_mandir}/man8/ovs-dpctl-top.8.gz
+%{_mandir}/man1/ovs-benchmark.1%{ext_man}
+%{_mandir}/man1/ovsdb-client.1%{ext_man}
+%{_mandir}/man8/ovs-appctl.8%{ext_man}
+%{_mandir}/man8/ovs-bugtool.8%{ext_man}
+%{_mandir}/man8/ovs-ofctl.8%{ext_man}
+%{_mandir}/man8/ovs-vlan-bug-workaround.8%{ext_man}
+%{_mandir}/man8/ovs-parse-backtrace.8%{ext_man}
+%{_mandir}/man8/ovs-dpctl-top.8%{ext_man}
%{_sysconfdir}/bash_completion.d/ovs-appctl-bashcomp.bash
%files pki
%defattr(-,root,root)
-%{_mandir}/man8/ovs-pki.8.gz
+%{_mandir}/man8/ovs-pki.8%{ext_man}
%{_bindir}/ovs-pki
%files vtep
%defattr(-,root,root)
%{_bindir}/vtep-ctl
-%{_mandir}/man5/vtep.5.gz
-%{_mandir}/man8/vtep-ctl.8.gz
+%{_mandir}/man5/vtep.5%{ext_man}
+%{_mandir}/man8/vtep-ctl.8%{ext_man}
%{_datadir}/openvswitch/scripts/ovs-vtep
%{_datadir}/openvswitch/vtep.ovsschema
%{_libdir}/libvtep.so.*
@@ -489,15 +488,15 @@
%{_datadir}/openvswitch/vswitch.ovsschema
%{_sysconfdir}/bash_completion.d/ovs-vsctl-bashcomp.bash
%config(noreplace) %{_sysconfdir}/logrotate.d/openvswitch-switch
-%{_mandir}/man8/ovs-dpctl.8.gz
-%{_mandir}/man1/ovs-tcpundump.1.gz
-%{_mandir}/man1/ovs-pcap.1.gz
-%{_mandir}/man8/ovs-vsctl.8.gz
-%{_mandir}/man1/ovsdb-tool.1.gz
-%{_mandir}/man8/ovs-vswitchd.8.gz
-%{_mandir}/man1/ovsdb-server.1.gz
-%{_mandir}/man5/ovs-vswitchd.conf.db.5.gz
-%{_mandir}/man8/ovs-ctl.8.gz
+%{_mandir}/man8/ovs-dpctl.8%{ext_man}
+%{_mandir}/man1/ovs-tcpundump.1%{ext_man}
+%{_mandir}/man1/ovs-pcap.1%{ext_man}
+%{_mandir}/man8/ovs-vsctl.8%{ext_man}
+%{_mandir}/man1/ovsdb-tool.1%{ext_man}
+%{_mandir}/man8/ovs-vswitchd.8%{ext_man}
+%{_mandir}/man1/ovsdb-server.1%{ext_man}
+%{_mandir}/man5/ovs-vswitchd.conf.db.5%{ext_man}
+%{_mandir}/man8/ovs-ctl.8%{ext_man}
%{_sbindir}/rcopenvswitch
%{_unitdir}/openvswitch.service
%{_localstatedir}/adm/fillup-templates/sysconfig.openvswitch
@@ -538,10 +537,10 @@
%{_bindir}/ovs-l3ping
%{_bindir}/ovs-vlan-test
%{_bindir}/ovs-testcontroller
-%{_mandir}/man8/ovs-test.8.gz
-%{_mandir}/man8/ovs-l3ping.8.gz
-%{_mandir}/man8/ovs-vlan-test.8.gz
-%{_mandir}/man8/ovs-testcontroller.8.gz
+%{_mandir}/man8/ovs-test.8%{ext_man}
+%{_mandir}/man8/ovs-l3ping.8%{ext_man}
+%{_mandir}/man8/ovs-vlan-test.8%{ext_man}
+%{_mandir}/man8/ovs-testcontroller.8%{ext_man}
%files devel
%defattr(-,root,root)
Index: openvswitch.changes
===================================================================
--- openvswitch.changes (revision 98)
+++ openvswitch.changes (revision 46)
@@ -1,4 +1,11 @@
-------------------------------------------------------------------
+Tue Jul 12 10:41:14 UTC 2016 - mchandras@suse.de
+
+- Add missing licenses (bsc#988513)
+- Misc spec file cleanups highlighted by the spec-cleaner tool.
+- Allow aarch64 builds for openvswitch-dpdk
+
+-------------------------------------------------------------------
Mon Jul 4 12:08:06 UTC 2016 - mchandras@suse.de
- Allow the OvS daemon to run as non-root (bsc#987545)
@@ -197,6 +204,8 @@
- Added: ovn-northd.service
- TODO: Explicit DPDK support not yet added to spec.
- Spec file work and cleanup.
+- Includes fixes (or obsoletes) the following issues:
+ * bsc#948840, bsc#941466, bsc#936780, bnc#935750, bnc#867964
-------------------------------------------------------------------
Tue Mar 1 08:43:19 UTC 2016 - kmroz@suse.com
Index: openvswitch.spec
===================================================================
--- openvswitch.spec (revision 98)
+++ openvswitch.spec (revision 46)
@@ -14,10 +14,9 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-
-
# needssslcertforbuild
+
# Disable building the external kernel datapath by default
%bcond_with kmp
# DPDK build disabled by default. It's enabled in the
@@ -26,12 +25,14 @@
# The testsuite is somewhat fragile for continuous testing in OBS
# but keep it here as an option
%bcond_with check
-
Name: openvswitch
Version: 2.5.0
Release: 0
Summary: An open source, production quality, multilayer virtual switch
-License: Apache-2.0
+# All code is Apache-2.0 except
+# - lib/sflow* which is SISSL
+# - utilities/bugtool which is LGPL-2.1
+License: Apache-2.0 and LGPL-2.1 and SISSL
Group: Productivity/Networking/System
Url: http://openvswitch.org/
Source0: http://openvswitch.org/releases/openvswitch-%{version}.tar.gz
@@ -41,35 +42,26 @@
Source89: Module.supported.updates
# PATCH-FIX-UPSTREAM openvswitch-2.5.0-detect-dpdk-installation.patch
Patch0: openvswitch-%{version}-detect-dpdk-installation.patch
-Patch1: 0001-Remove-broken-pipe-warning-logs-from-ovsdb-server.lo.patch
+Patch1: 0001-Remove-broken-pipe-warning-logs-from-ovsdb-server.lo.patch
BuildRequires: autoconf
BuildRequires: automake
-%if %{with dpdk}
-# We need to be a bit strict with the dpdk version since
-# it's very possible for DPDK to change it's API between
-# releases. OVS currently requires 2.2.0. We may have to
-# provide multiple versions of dpdk if OVS and DPDK get
-# out of sync too often.
-BuildRequires: dpdk-devel = 2.2.0
-ExclusiveArch: x86_64 %ix86
-%endif
BuildRequires: fdupes
BuildRequires: gcc
BuildRequires: glibc-devel
BuildRequires: graphviz
BuildRequires: libcap-ng-devel
-BuildRequires: libopenssl-devel
BuildRequires: libtool
BuildRequires: make
BuildRequires: openssl
BuildRequires: perl
-BuildRequires: pkg-config
+BuildRequires: pkgconfig
# Needed by the testsuite
BuildRequires: procps
BuildRequires: python-devel
BuildRequires: python-xml
+BuildRequires: valgrind-devel
+BuildRequires: pkgconfig(openssl)
Requires: logrotate
-Requires: openssl
Requires: python
Provides: openvswitch-common = %{version}
Obsoletes: openvswitch-common < %{version}
@@ -77,10 +69,16 @@
Obsoletes: openvswitch-controller < %{version}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%py_requires
-BuildRequires: valgrind-devel
-# We can't have openvswitch and openvswitch-dpdk in parallel
%if %{with dpdk}
+# We need to be a bit strict with the dpdk version since
+# it's very possible for DPDK to change it's API between
+# releases. OVS currently requires 2.2.0. We may have to
+# provide multiple versions of dpdk if OVS and DPDK get
+# out of sync too often.
+BuildRequires: dpdk-devel = 2.2.0
+# We can't have openvswitch and openvswitch-dpdk in parallel
Conflicts: openvswitch
+ExclusiveArch: aarch64 x86_64 %{ix86}
%endif
%description
@@ -129,15 +127,15 @@
# ovs-ctl / ovs-pki use /usr/bin/uuidgen:
Requires: util-linux
Requires(post): %fillup_prereq
+Suggests: logrotate
Provides: openvswitch-any-switch = %{version}
+%{?systemd_requires}
%if %{with dpdk}
Conflicts: openvswitch-switch
%endif
-Suggests: logrotate
%if %{with kmp}
Suggests: openvswitch-kmp
%endif
-%{?systemd_requires}
%description switch
openvswitch-switch provides the userspace components and utilities for
@@ -244,7 +242,7 @@
Open vSwitch is a full-featured software-based Ethernet switch.
%prep
-%setup -n openvswitch-%{version} -q
+%setup -q -n openvswitch-%{version}
%patch0 -p1
%patch1 -p1
@@ -288,6 +286,7 @@
--disable-static \
--enable-libcapng \
--enable-shared \
+ --enable-ssl \
${dpdk_opt} \
--with-logdir=%{_localstatedir}/log/openvswitch
make %{?_smp_mflags}
@@ -299,7 +298,7 @@
# 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}" ||
+if make check TESTSUITEFLAGS="%{?_smp_mflags}" ||
make check TESTSUITEFLAGS='--recheck'; then :;
else
cat tests/testsuite.log
@@ -356,7 +355,7 @@
mv %{buildroot}%{_datadir}/openvswitch/python/* %{buildroot}%{py_sitedir}
rmdir %{buildroot}%{_datadir}/openvswitch/python
-rm -f %buildroot/%_libdir/*.la
+find %{buildroot} -type f -name "*.la" -delete -print
# Remove unpackaged files for the dpdk case
%if %{with dpdk}
@@ -436,26 +435,26 @@
%{_libdir}/libopenvswitch.so.*
%{_libdir}/libovsdb.so.*
%{_libdir}/libsflow.so.*
-%{_mandir}/man1/ovs-benchmark.1.gz
-%{_mandir}/man1/ovsdb-client.1.gz
-%{_mandir}/man8/ovs-appctl.8.gz
-%{_mandir}/man8/ovs-bugtool.8.gz
-%{_mandir}/man8/ovs-ofctl.8.gz
-%{_mandir}/man8/ovs-vlan-bug-workaround.8.gz
-%{_mandir}/man8/ovs-parse-backtrace.8.gz
-%{_mandir}/man8/ovs-dpctl-top.8.gz
+%{_mandir}/man1/ovs-benchmark.1%{ext_man}
+%{_mandir}/man1/ovsdb-client.1%{ext_man}
+%{_mandir}/man8/ovs-appctl.8%{ext_man}
+%{_mandir}/man8/ovs-bugtool.8%{ext_man}
+%{_mandir}/man8/ovs-ofctl.8%{ext_man}
+%{_mandir}/man8/ovs-vlan-bug-workaround.8%{ext_man}
+%{_mandir}/man8/ovs-parse-backtrace.8%{ext_man}
+%{_mandir}/man8/ovs-dpctl-top.8%{ext_man}
%{_sysconfdir}/bash_completion.d/ovs-appctl-bashcomp.bash
%files pki
%defattr(-,root,root)
-%{_mandir}/man8/ovs-pki.8.gz
+%{_mandir}/man8/ovs-pki.8%{ext_man}
%{_bindir}/ovs-pki
%files vtep
%defattr(-,root,root)
%{_bindir}/vtep-ctl
-%{_mandir}/man5/vtep.5.gz
-%{_mandir}/man8/vtep-ctl.8.gz
+%{_mandir}/man5/vtep.5%{ext_man}
+%{_mandir}/man8/vtep-ctl.8%{ext_man}
%{_datadir}/openvswitch/scripts/ovs-vtep
%{_datadir}/openvswitch/vtep.ovsschema
%{_libdir}/libvtep.so.*
@@ -487,15 +486,15 @@
%{_datadir}/openvswitch/vswitch.ovsschema
%{_sysconfdir}/bash_completion.d/ovs-vsctl-bashcomp.bash
%config(noreplace) %{_sysconfdir}/logrotate.d/openvswitch-switch
-%{_mandir}/man8/ovs-dpctl.8.gz
-%{_mandir}/man1/ovs-tcpundump.1.gz
-%{_mandir}/man1/ovs-pcap.1.gz
-%{_mandir}/man8/ovs-vsctl.8.gz
-%{_mandir}/man1/ovsdb-tool.1.gz
-%{_mandir}/man8/ovs-vswitchd.8.gz
-%{_mandir}/man1/ovsdb-server.1.gz
-%{_mandir}/man5/ovs-vswitchd.conf.db.5.gz
-%{_mandir}/man8/ovs-ctl.8.gz
+%{_mandir}/man8/ovs-dpctl.8%{ext_man}
+%{_mandir}/man1/ovs-tcpundump.1%{ext_man}
+%{_mandir}/man1/ovs-pcap.1%{ext_man}
+%{_mandir}/man8/ovs-vsctl.8%{ext_man}
+%{_mandir}/man1/ovsdb-tool.1%{ext_man}
+%{_mandir}/man8/ovs-vswitchd.8%{ext_man}
+%{_mandir}/man1/ovsdb-server.1%{ext_man}
+%{_mandir}/man5/ovs-vswitchd.conf.db.5%{ext_man}
+%{_mandir}/man8/ovs-ctl.8%{ext_man}
%{_sbindir}/rcopenvswitch
%{_unitdir}/openvswitch.service
%{_localstatedir}/adm/fillup-templates/sysconfig.openvswitch
@@ -536,10 +535,10 @@
%{_bindir}/ovs-l3ping
%{_bindir}/ovs-vlan-test
%{_bindir}/ovs-testcontroller
-%{_mandir}/man8/ovs-test.8.gz
-%{_mandir}/man8/ovs-l3ping.8.gz
-%{_mandir}/man8/ovs-vlan-test.8.gz
-%{_mandir}/man8/ovs-testcontroller.8.gz
+%{_mandir}/man8/ovs-test.8%{ext_man}
+%{_mandir}/man8/ovs-l3ping.8%{ext_man}
+%{_mandir}/man8/ovs-vlan-test.8%{ext_man}
+%{_mandir}/man8/ovs-testcontroller.8%{ext_man}
%files devel
%defattr(-,root,root)
OBS-URL: https://build.opensuse.org/request/show/408658
OBS-URL: https://build.opensuse.org/package/show/network/openvswitch?expand=0&rev=99
2016-07-18 10:19:36 +02:00
|
|
|
|
%{_mandir}/man8/ovs-dpctl.8%{ext_man}
|
|
|
|
|
%{_mandir}/man8/ovs-vsctl.8%{ext_man}
|
|
|
|
|
%{_mandir}/man1/ovsdb-tool.1%{ext_man}
|
|
|
|
|
%{_mandir}/man8/ovs-vswitchd.8%{ext_man}
|
|
|
|
|
%{_mandir}/man1/ovsdb-server.1%{ext_man}
|
|
|
|
|
%{_mandir}/man5/ovs-vswitchd.conf.db.5%{ext_man}
|
|
|
|
|
%{_mandir}/man8/ovs-ctl.8%{ext_man}
|
2016-10-07 15:07:43 +02:00
|
|
|
|
%{_sbindir}/rcovsdb-server
|
|
|
|
|
%{_sbindir}/rcovs-vswitchd
|
2016-06-21 14:24:21 +02:00
|
|
|
|
%{_sbindir}/rcopenvswitch
|
2014-05-20 18:03:31 +02:00
|
|
|
|
%{_unitdir}/openvswitch.service
|
2016-10-07 15:07:43 +02:00
|
|
|
|
%{_unitdir}/ovs-vswitchd.service
|
|
|
|
|
%{_unitdir}/ovsdb-server.service
|
2016-05-19 12:13:17 +02:00
|
|
|
|
%{_localstatedir}/adm/fillup-templates/sysconfig.openvswitch
|
2016-05-21 12:04:35 +02:00
|
|
|
|
%dir %{_localstatedir}/log/openvswitch
|
2012-03-14 11:03:21 +01:00
|
|
|
|
|
2016-03-09 18:19:55 +01:00
|
|
|
|
%files ovn
|
2016-03-22 15:18:08 +01:00
|
|
|
|
%defattr(-,root,root)
|
2016-03-09 18:19:55 +01:00
|
|
|
|
%{_bindir}/ovn-controller
|
|
|
|
|
%{_bindir}/ovn-controller-vtep
|
|
|
|
|
%{_bindir}/ovn-docker-overlay-driver
|
|
|
|
|
%{_bindir}/ovn-docker-underlay-driver
|
|
|
|
|
%{_bindir}/ovn-nbctl
|
|
|
|
|
%{_bindir}/ovn-northd
|
|
|
|
|
%{_bindir}/ovn-sbctl
|
2016-10-07 15:07:43 +02:00
|
|
|
|
%{_bindir}/ovn-trace
|
2016-03-09 18:19:55 +01:00
|
|
|
|
%{_datadir}/openvswitch/scripts/ovn-ctl
|
2016-10-07 15:07:43 +02:00
|
|
|
|
%{_datadir}/openvswitch/scripts/ovn-bugtool-nbctl-show
|
|
|
|
|
%{_datadir}/openvswitch/scripts/ovn-bugtool-sbctl-lflow-list
|
|
|
|
|
%{_datadir}/openvswitch/scripts/ovn-bugtool-sbctl-show
|
2016-03-09 18:19:55 +01:00
|
|
|
|
%{_libdir}/libovn.so.*
|
|
|
|
|
%{_mandir}/man5/ovn-nb.5*
|
|
|
|
|
%{_mandir}/man5/ovn-sb.5*
|
|
|
|
|
%{_mandir}/man7/ovn-architecture.7*
|
|
|
|
|
%{_mandir}/man8/ovn-controller.8*
|
|
|
|
|
%{_mandir}/man8/ovn-controller-vtep.8*
|
|
|
|
|
%{_mandir}/man8/ovn-ctl.8*
|
|
|
|
|
%{_mandir}/man8/ovn-nbctl.8*
|
|
|
|
|
%{_mandir}/man8/ovn-northd.8*
|
|
|
|
|
%{_mandir}/man8/ovn-sbctl.8*
|
2016-10-07 15:07:43 +02:00
|
|
|
|
%{_mandir}/man8/ovn-trace.8*
|
2016-03-09 18:19:55 +01:00
|
|
|
|
%config %{_datadir}/openvswitch/ovn-nb.ovsschema
|
|
|
|
|
%config %{_datadir}/openvswitch/ovn-sb.ovsschema
|
2016-05-19 12:13:17 +02:00
|
|
|
|
%{_sbindir}/rcovn-controller
|
|
|
|
|
%{_sbindir}/rcovn-controller-vtep
|
|
|
|
|
%{_sbindir}/rcovn-northd
|
2016-03-09 18:19:55 +01:00
|
|
|
|
%{_unitdir}/ovn-controller.service
|
|
|
|
|
%{_unitdir}/ovn-controller-vtep.service
|
|
|
|
|
%{_unitdir}/ovn-northd.service
|
|
|
|
|
|
2012-03-14 11:03:21 +01:00
|
|
|
|
%files test
|
|
|
|
|
%defattr(-,root,root)
|
2013-03-08 15:12:33 +01:00
|
|
|
|
%{_bindir}/ovs-l3ping
|
2016-10-07 15:07:43 +02:00
|
|
|
|
%{_bindir}/ovs-pcap
|
|
|
|
|
%{_bindir}/ovs-test
|
Accepting request 361282 from home:k_mroz:branches:network
- Don't install INSTALL.* files.
- Removed: openvswitch-switch.template
- New upstream version 2.4.0
- Flow table modifications are now atomic, meaning that each packet
now sees a coherent version of the OpenFlow pipeline. For
example, if a controller removes all flows with a single OpenFlow
"flow_mod", no packet sees an intermediate version of the OpenFlow
pipeline where only some of the flows have been deleted.
- Added support for SFQ, FQ_CoDel and CoDel qdiscs.
- Add bash command-line completion support for ovs-vsctl Please check
utilities/ovs-command-compgen.INSTALL.md for how to use.
- The MAC learning feature now includes per-port fairness to mitigate
MAC flooding attacks.
- New support for a "conjunctive match" OpenFlow extension, which
allows constructing OpenFlow matches of the form "field1 in
{a,b,c...} AND field2 in {d,e,f...}" and generalizations. For details,
see documentation for the "conjunction" action in ovs-ofctl(8).
- Add bash command-line completion support for ovs-appctl/ovs-dpctl/
ovs-ofctl/ovsdb-tool commands. Please check
utilities/ovs-command-compgen.INSTALL.md for how to use.
- The "learn" action supports a new flag "delete_learned" that causes
the learned flows to be deleted when the flow with the "learn" action
is deleted.
- Basic support for the Geneve tunneling protocol. It is not yet
possible to generate or match options. This is planned for a future
release. The protocol is documented at
http://tools.ietf.org/html/draft-gross-geneve-00
- The OVS database now reports controller rate limiting statistics.
OBS-URL: https://build.opensuse.org/request/show/361282
OBS-URL: https://build.opensuse.org/package/show/network/openvswitch?expand=0&rev=76
2016-02-26 16:24:36 +01:00
|
|
|
|
%{_bindir}/ovs-testcontroller
|
2016-10-07 15:07:43 +02:00
|
|
|
|
%{_bindir}/ovs-tcpdump
|
|
|
|
|
%{_bindir}/ovs-tcpundump
|
|
|
|
|
%{_bindir}/ovs-vlan-test
|
|
|
|
|
%{_mandir}/man1/ovs-pcap.1%{ext_man}
|
|
|
|
|
%{_mandir}/man1/ovs-tcpundump.1%{ext_man}
|
Accepting request 408658 from home:markoschandras:network
- Add missing licenses (bsc#988513)
- Misc spec file cleanups highlighted by the spec-cleaner tool.
- Allow aarch64 builds for openvswitch-dpdk
- Add missing bug references to 2.5.0 release.
old: network/openvswitch
new: home:markoschandras:network/openvswitch rev None
Index: openvswitch-dpdk.changes
===================================================================
--- openvswitch-dpdk.changes (revision 98)
+++ openvswitch-dpdk.changes (revision 46)
@@ -1,4 +1,11 @@
-------------------------------------------------------------------
+Tue Jul 12 10:41:14 UTC 2016 - mchandras@suse.de
+
+- Add missing licenses (bsc#988513)
+- Misc spec file cleanups highlighted by the spec-cleaner tool.
+- Allow aarch64 builds for openvswitch-dpdk
+
+-------------------------------------------------------------------
Mon Jul 4 12:08:06 UTC 2016 - mchandras@suse.de
- Allow the OvS daemon to run as non-root (bsc#987545)
@@ -197,6 +204,8 @@
- Added: ovn-northd.service
- TODO: Explicit DPDK support not yet added to spec.
- Spec file work and cleanup.
+- Includes fixes (or obsoletes) the following issues:
+ * bsc#948840, bsc#941466, bsc#936780, bnc#935750, bnc#867964
-------------------------------------------------------------------
Tue Mar 1 08:43:19 UTC 2016 - kmroz@suse.com
Index: openvswitch-dpdk.spec
===================================================================
--- openvswitch-dpdk.spec (revision 98)
+++ openvswitch-dpdk.spec (revision 46)
@@ -14,10 +14,9 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-
-
# needssslcertforbuild
+
# Disable building the external kernel datapath by default
%bcond_with kmp
# DPDK build disabled by default. It's enabled in the
@@ -26,14 +25,16 @@
# The testsuite is somewhat fragile for continuous testing in OBS
# but keep it here as an option
%bcond_with check
-
# Do NOT edit this auto generated file! Edit openvswitch.spec instead
# and run 'pre_checkin.sh' before committing
Name: openvswitch-dpdk
Version: 2.5.0
Release: 0
Summary: An open source, production quality, multilayer virtual switch (DPDK)
-License: Apache-2.0
+# All code is Apache-2.0 except
+# - lib/sflow* which is SISSL
+# - utilities/bugtool which is LGPL-2.1
+License: Apache-2.0 and LGPL-2.1 and SISSL
Group: Productivity/Networking/System
Url: http://openvswitch.org/
Source0: http://openvswitch.org/releases/openvswitch-%{version}.tar.gz
@@ -43,35 +44,26 @@
Source89: Module.supported.updates
# PATCH-FIX-UPSTREAM openvswitch-2.5.0-detect-dpdk-installation.patch
Patch0: openvswitch-%{version}-detect-dpdk-installation.patch
-Patch1: 0001-Remove-broken-pipe-warning-logs-from-ovsdb-server.lo.patch
+Patch1: 0001-Remove-broken-pipe-warning-logs-from-ovsdb-server.lo.patch
BuildRequires: autoconf
BuildRequires: automake
-%if %{with dpdk}
-# We need to be a bit strict with the dpdk version since
-# it's very possible for DPDK to change it's API between
-# releases. OVS currently requires 2.2.0. We may have to
-# provide multiple versions of dpdk if OVS and DPDK get
-# out of sync too often.
-BuildRequires: dpdk-devel = 2.2.0
-ExclusiveArch: x86_64 %ix86
-%endif
BuildRequires: fdupes
BuildRequires: gcc
BuildRequires: glibc-devel
BuildRequires: graphviz
BuildRequires: libcap-ng-devel
-BuildRequires: libopenssl-devel
BuildRequires: libtool
BuildRequires: make
BuildRequires: openssl
BuildRequires: perl
-BuildRequires: pkg-config
+BuildRequires: pkgconfig
# Needed by the testsuite
BuildRequires: procps
BuildRequires: python-devel
BuildRequires: python-xml
+BuildRequires: valgrind-devel
+BuildRequires: pkgconfig(openssl)
Requires: logrotate
-Requires: openssl
Requires: python
Provides: openvswitch-common = %{version}
Obsoletes: openvswitch-common < %{version}
@@ -79,10 +71,16 @@
Obsoletes: openvswitch-controller < %{version}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%py_requires
-BuildRequires: valgrind-devel
-# We can't have openvswitch and openvswitch-dpdk in parallel
%if %{with dpdk}
+# We need to be a bit strict with the dpdk version since
+# it's very possible for DPDK to change it's API between
+# releases. OVS currently requires 2.2.0. We may have to
+# provide multiple versions of dpdk if OVS and DPDK get
+# out of sync too often.
+BuildRequires: dpdk-devel = 2.2.0
+# We can't have openvswitch and openvswitch-dpdk in parallel
Conflicts: openvswitch
+ExclusiveArch: aarch64 x86_64 %{ix86}
%endif
%description
@@ -131,15 +129,15 @@
# ovs-ctl / ovs-pki use /usr/bin/uuidgen:
Requires: util-linux
Requires(post): %fillup_prereq
+Suggests: logrotate
Provides: openvswitch-any-switch = %{version}
+%{?systemd_requires}
%if %{with dpdk}
Conflicts: openvswitch-switch
%endif
-Suggests: logrotate
%if %{with kmp}
Suggests: openvswitch-kmp
%endif
-%{?systemd_requires}
%description switch
openvswitch-switch provides the userspace components and utilities for
@@ -246,7 +244,7 @@
Open vSwitch is a full-featured software-based Ethernet switch.
%prep
-%setup -n openvswitch-%{version} -q
+%setup -q -n openvswitch-%{version}
%patch0 -p1
%patch1 -p1
@@ -290,6 +288,7 @@
--disable-static \
--enable-libcapng \
--enable-shared \
+ --enable-ssl \
${dpdk_opt} \
--with-logdir=%{_localstatedir}/log/openvswitch
make %{?_smp_mflags}
@@ -301,7 +300,7 @@
# 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}" ||
+if make check TESTSUITEFLAGS="%{?_smp_mflags}" ||
make check TESTSUITEFLAGS='--recheck'; then :;
else
cat tests/testsuite.log
@@ -358,7 +357,7 @@
mv %{buildroot}%{_datadir}/openvswitch/python/* %{buildroot}%{py_sitedir}
rmdir %{buildroot}%{_datadir}/openvswitch/python
-rm -f %buildroot/%_libdir/*.la
+find %{buildroot} -type f -name "*.la" -delete -print
# Remove unpackaged files for the dpdk case
%if %{with dpdk}
@@ -438,26 +437,26 @@
%{_libdir}/libopenvswitch.so.*
%{_libdir}/libovsdb.so.*
%{_libdir}/libsflow.so.*
-%{_mandir}/man1/ovs-benchmark.1.gz
-%{_mandir}/man1/ovsdb-client.1.gz
-%{_mandir}/man8/ovs-appctl.8.gz
-%{_mandir}/man8/ovs-bugtool.8.gz
-%{_mandir}/man8/ovs-ofctl.8.gz
-%{_mandir}/man8/ovs-vlan-bug-workaround.8.gz
-%{_mandir}/man8/ovs-parse-backtrace.8.gz
-%{_mandir}/man8/ovs-dpctl-top.8.gz
+%{_mandir}/man1/ovs-benchmark.1%{ext_man}
+%{_mandir}/man1/ovsdb-client.1%{ext_man}
+%{_mandir}/man8/ovs-appctl.8%{ext_man}
+%{_mandir}/man8/ovs-bugtool.8%{ext_man}
+%{_mandir}/man8/ovs-ofctl.8%{ext_man}
+%{_mandir}/man8/ovs-vlan-bug-workaround.8%{ext_man}
+%{_mandir}/man8/ovs-parse-backtrace.8%{ext_man}
+%{_mandir}/man8/ovs-dpctl-top.8%{ext_man}
%{_sysconfdir}/bash_completion.d/ovs-appctl-bashcomp.bash
%files pki
%defattr(-,root,root)
-%{_mandir}/man8/ovs-pki.8.gz
+%{_mandir}/man8/ovs-pki.8%{ext_man}
%{_bindir}/ovs-pki
%files vtep
%defattr(-,root,root)
%{_bindir}/vtep-ctl
-%{_mandir}/man5/vtep.5.gz
-%{_mandir}/man8/vtep-ctl.8.gz
+%{_mandir}/man5/vtep.5%{ext_man}
+%{_mandir}/man8/vtep-ctl.8%{ext_man}
%{_datadir}/openvswitch/scripts/ovs-vtep
%{_datadir}/openvswitch/vtep.ovsschema
%{_libdir}/libvtep.so.*
@@ -489,15 +488,15 @@
%{_datadir}/openvswitch/vswitch.ovsschema
%{_sysconfdir}/bash_completion.d/ovs-vsctl-bashcomp.bash
%config(noreplace) %{_sysconfdir}/logrotate.d/openvswitch-switch
-%{_mandir}/man8/ovs-dpctl.8.gz
-%{_mandir}/man1/ovs-tcpundump.1.gz
-%{_mandir}/man1/ovs-pcap.1.gz
-%{_mandir}/man8/ovs-vsctl.8.gz
-%{_mandir}/man1/ovsdb-tool.1.gz
-%{_mandir}/man8/ovs-vswitchd.8.gz
-%{_mandir}/man1/ovsdb-server.1.gz
-%{_mandir}/man5/ovs-vswitchd.conf.db.5.gz
-%{_mandir}/man8/ovs-ctl.8.gz
+%{_mandir}/man8/ovs-dpctl.8%{ext_man}
+%{_mandir}/man1/ovs-tcpundump.1%{ext_man}
+%{_mandir}/man1/ovs-pcap.1%{ext_man}
+%{_mandir}/man8/ovs-vsctl.8%{ext_man}
+%{_mandir}/man1/ovsdb-tool.1%{ext_man}
+%{_mandir}/man8/ovs-vswitchd.8%{ext_man}
+%{_mandir}/man1/ovsdb-server.1%{ext_man}
+%{_mandir}/man5/ovs-vswitchd.conf.db.5%{ext_man}
+%{_mandir}/man8/ovs-ctl.8%{ext_man}
%{_sbindir}/rcopenvswitch
%{_unitdir}/openvswitch.service
%{_localstatedir}/adm/fillup-templates/sysconfig.openvswitch
@@ -538,10 +537,10 @@
%{_bindir}/ovs-l3ping
%{_bindir}/ovs-vlan-test
%{_bindir}/ovs-testcontroller
-%{_mandir}/man8/ovs-test.8.gz
-%{_mandir}/man8/ovs-l3ping.8.gz
-%{_mandir}/man8/ovs-vlan-test.8.gz
-%{_mandir}/man8/ovs-testcontroller.8.gz
+%{_mandir}/man8/ovs-test.8%{ext_man}
+%{_mandir}/man8/ovs-l3ping.8%{ext_man}
+%{_mandir}/man8/ovs-vlan-test.8%{ext_man}
+%{_mandir}/man8/ovs-testcontroller.8%{ext_man}
%files devel
%defattr(-,root,root)
Index: openvswitch.changes
===================================================================
--- openvswitch.changes (revision 98)
+++ openvswitch.changes (revision 46)
@@ -1,4 +1,11 @@
-------------------------------------------------------------------
+Tue Jul 12 10:41:14 UTC 2016 - mchandras@suse.de
+
+- Add missing licenses (bsc#988513)
+- Misc spec file cleanups highlighted by the spec-cleaner tool.
+- Allow aarch64 builds for openvswitch-dpdk
+
+-------------------------------------------------------------------
Mon Jul 4 12:08:06 UTC 2016 - mchandras@suse.de
- Allow the OvS daemon to run as non-root (bsc#987545)
@@ -197,6 +204,8 @@
- Added: ovn-northd.service
- TODO: Explicit DPDK support not yet added to spec.
- Spec file work and cleanup.
+- Includes fixes (or obsoletes) the following issues:
+ * bsc#948840, bsc#941466, bsc#936780, bnc#935750, bnc#867964
-------------------------------------------------------------------
Tue Mar 1 08:43:19 UTC 2016 - kmroz@suse.com
Index: openvswitch.spec
===================================================================
--- openvswitch.spec (revision 98)
+++ openvswitch.spec (revision 46)
@@ -14,10 +14,9 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-
-
# needssslcertforbuild
+
# Disable building the external kernel datapath by default
%bcond_with kmp
# DPDK build disabled by default. It's enabled in the
@@ -26,12 +25,14 @@
# The testsuite is somewhat fragile for continuous testing in OBS
# but keep it here as an option
%bcond_with check
-
Name: openvswitch
Version: 2.5.0
Release: 0
Summary: An open source, production quality, multilayer virtual switch
-License: Apache-2.0
+# All code is Apache-2.0 except
+# - lib/sflow* which is SISSL
+# - utilities/bugtool which is LGPL-2.1
+License: Apache-2.0 and LGPL-2.1 and SISSL
Group: Productivity/Networking/System
Url: http://openvswitch.org/
Source0: http://openvswitch.org/releases/openvswitch-%{version}.tar.gz
@@ -41,35 +42,26 @@
Source89: Module.supported.updates
# PATCH-FIX-UPSTREAM openvswitch-2.5.0-detect-dpdk-installation.patch
Patch0: openvswitch-%{version}-detect-dpdk-installation.patch
-Patch1: 0001-Remove-broken-pipe-warning-logs-from-ovsdb-server.lo.patch
+Patch1: 0001-Remove-broken-pipe-warning-logs-from-ovsdb-server.lo.patch
BuildRequires: autoconf
BuildRequires: automake
-%if %{with dpdk}
-# We need to be a bit strict with the dpdk version since
-# it's very possible for DPDK to change it's API between
-# releases. OVS currently requires 2.2.0. We may have to
-# provide multiple versions of dpdk if OVS and DPDK get
-# out of sync too often.
-BuildRequires: dpdk-devel = 2.2.0
-ExclusiveArch: x86_64 %ix86
-%endif
BuildRequires: fdupes
BuildRequires: gcc
BuildRequires: glibc-devel
BuildRequires: graphviz
BuildRequires: libcap-ng-devel
-BuildRequires: libopenssl-devel
BuildRequires: libtool
BuildRequires: make
BuildRequires: openssl
BuildRequires: perl
-BuildRequires: pkg-config
+BuildRequires: pkgconfig
# Needed by the testsuite
BuildRequires: procps
BuildRequires: python-devel
BuildRequires: python-xml
+BuildRequires: valgrind-devel
+BuildRequires: pkgconfig(openssl)
Requires: logrotate
-Requires: openssl
Requires: python
Provides: openvswitch-common = %{version}
Obsoletes: openvswitch-common < %{version}
@@ -77,10 +69,16 @@
Obsoletes: openvswitch-controller < %{version}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%py_requires
-BuildRequires: valgrind-devel
-# We can't have openvswitch and openvswitch-dpdk in parallel
%if %{with dpdk}
+# We need to be a bit strict with the dpdk version since
+# it's very possible for DPDK to change it's API between
+# releases. OVS currently requires 2.2.0. We may have to
+# provide multiple versions of dpdk if OVS and DPDK get
+# out of sync too often.
+BuildRequires: dpdk-devel = 2.2.0
+# We can't have openvswitch and openvswitch-dpdk in parallel
Conflicts: openvswitch
+ExclusiveArch: aarch64 x86_64 %{ix86}
%endif
%description
@@ -129,15 +127,15 @@
# ovs-ctl / ovs-pki use /usr/bin/uuidgen:
Requires: util-linux
Requires(post): %fillup_prereq
+Suggests: logrotate
Provides: openvswitch-any-switch = %{version}
+%{?systemd_requires}
%if %{with dpdk}
Conflicts: openvswitch-switch
%endif
-Suggests: logrotate
%if %{with kmp}
Suggests: openvswitch-kmp
%endif
-%{?systemd_requires}
%description switch
openvswitch-switch provides the userspace components and utilities for
@@ -244,7 +242,7 @@
Open vSwitch is a full-featured software-based Ethernet switch.
%prep
-%setup -n openvswitch-%{version} -q
+%setup -q -n openvswitch-%{version}
%patch0 -p1
%patch1 -p1
@@ -288,6 +286,7 @@
--disable-static \
--enable-libcapng \
--enable-shared \
+ --enable-ssl \
${dpdk_opt} \
--with-logdir=%{_localstatedir}/log/openvswitch
make %{?_smp_mflags}
@@ -299,7 +298,7 @@
# 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}" ||
+if make check TESTSUITEFLAGS="%{?_smp_mflags}" ||
make check TESTSUITEFLAGS='--recheck'; then :;
else
cat tests/testsuite.log
@@ -356,7 +355,7 @@
mv %{buildroot}%{_datadir}/openvswitch/python/* %{buildroot}%{py_sitedir}
rmdir %{buildroot}%{_datadir}/openvswitch/python
-rm -f %buildroot/%_libdir/*.la
+find %{buildroot} -type f -name "*.la" -delete -print
# Remove unpackaged files for the dpdk case
%if %{with dpdk}
@@ -436,26 +435,26 @@
%{_libdir}/libopenvswitch.so.*
%{_libdir}/libovsdb.so.*
%{_libdir}/libsflow.so.*
-%{_mandir}/man1/ovs-benchmark.1.gz
-%{_mandir}/man1/ovsdb-client.1.gz
-%{_mandir}/man8/ovs-appctl.8.gz
-%{_mandir}/man8/ovs-bugtool.8.gz
-%{_mandir}/man8/ovs-ofctl.8.gz
-%{_mandir}/man8/ovs-vlan-bug-workaround.8.gz
-%{_mandir}/man8/ovs-parse-backtrace.8.gz
-%{_mandir}/man8/ovs-dpctl-top.8.gz
+%{_mandir}/man1/ovs-benchmark.1%{ext_man}
+%{_mandir}/man1/ovsdb-client.1%{ext_man}
+%{_mandir}/man8/ovs-appctl.8%{ext_man}
+%{_mandir}/man8/ovs-bugtool.8%{ext_man}
+%{_mandir}/man8/ovs-ofctl.8%{ext_man}
+%{_mandir}/man8/ovs-vlan-bug-workaround.8%{ext_man}
+%{_mandir}/man8/ovs-parse-backtrace.8%{ext_man}
+%{_mandir}/man8/ovs-dpctl-top.8%{ext_man}
%{_sysconfdir}/bash_completion.d/ovs-appctl-bashcomp.bash
%files pki
%defattr(-,root,root)
-%{_mandir}/man8/ovs-pki.8.gz
+%{_mandir}/man8/ovs-pki.8%{ext_man}
%{_bindir}/ovs-pki
%files vtep
%defattr(-,root,root)
%{_bindir}/vtep-ctl
-%{_mandir}/man5/vtep.5.gz
-%{_mandir}/man8/vtep-ctl.8.gz
+%{_mandir}/man5/vtep.5%{ext_man}
+%{_mandir}/man8/vtep-ctl.8%{ext_man}
%{_datadir}/openvswitch/scripts/ovs-vtep
%{_datadir}/openvswitch/vtep.ovsschema
%{_libdir}/libvtep.so.*
@@ -487,15 +486,15 @@
%{_datadir}/openvswitch/vswitch.ovsschema
%{_sysconfdir}/bash_completion.d/ovs-vsctl-bashcomp.bash
%config(noreplace) %{_sysconfdir}/logrotate.d/openvswitch-switch
-%{_mandir}/man8/ovs-dpctl.8.gz
-%{_mandir}/man1/ovs-tcpundump.1.gz
-%{_mandir}/man1/ovs-pcap.1.gz
-%{_mandir}/man8/ovs-vsctl.8.gz
-%{_mandir}/man1/ovsdb-tool.1.gz
-%{_mandir}/man8/ovs-vswitchd.8.gz
-%{_mandir}/man1/ovsdb-server.1.gz
-%{_mandir}/man5/ovs-vswitchd.conf.db.5.gz
-%{_mandir}/man8/ovs-ctl.8.gz
+%{_mandir}/man8/ovs-dpctl.8%{ext_man}
+%{_mandir}/man1/ovs-tcpundump.1%{ext_man}
+%{_mandir}/man1/ovs-pcap.1%{ext_man}
+%{_mandir}/man8/ovs-vsctl.8%{ext_man}
+%{_mandir}/man1/ovsdb-tool.1%{ext_man}
+%{_mandir}/man8/ovs-vswitchd.8%{ext_man}
+%{_mandir}/man1/ovsdb-server.1%{ext_man}
+%{_mandir}/man5/ovs-vswitchd.conf.db.5%{ext_man}
+%{_mandir}/man8/ovs-ctl.8%{ext_man}
%{_sbindir}/rcopenvswitch
%{_unitdir}/openvswitch.service
%{_localstatedir}/adm/fillup-templates/sysconfig.openvswitch
@@ -536,10 +535,10 @@
%{_bindir}/ovs-l3ping
%{_bindir}/ovs-vlan-test
%{_bindir}/ovs-testcontroller
-%{_mandir}/man8/ovs-test.8.gz
-%{_mandir}/man8/ovs-l3ping.8.gz
-%{_mandir}/man8/ovs-vlan-test.8.gz
-%{_mandir}/man8/ovs-testcontroller.8.gz
+%{_mandir}/man8/ovs-test.8%{ext_man}
+%{_mandir}/man8/ovs-l3ping.8%{ext_man}
+%{_mandir}/man8/ovs-vlan-test.8%{ext_man}
+%{_mandir}/man8/ovs-testcontroller.8%{ext_man}
%files devel
%defattr(-,root,root)
OBS-URL: https://build.opensuse.org/request/show/408658
OBS-URL: https://build.opensuse.org/package/show/network/openvswitch?expand=0&rev=99
2016-07-18 10:19:36 +02:00
|
|
|
|
%{_mandir}/man8/ovs-l3ping.8%{ext_man}
|
2016-10-07 15:07:43 +02:00
|
|
|
|
%{_mandir}/man8/ovs-tcpdump.8%{ext_man}
|
|
|
|
|
%{_mandir}/man8/ovs-test.8%{ext_man}
|
Accepting request 408658 from home:markoschandras:network
- Add missing licenses (bsc#988513)
- Misc spec file cleanups highlighted by the spec-cleaner tool.
- Allow aarch64 builds for openvswitch-dpdk
- Add missing bug references to 2.5.0 release.
old: network/openvswitch
new: home:markoschandras:network/openvswitch rev None
Index: openvswitch-dpdk.changes
===================================================================
--- openvswitch-dpdk.changes (revision 98)
+++ openvswitch-dpdk.changes (revision 46)
@@ -1,4 +1,11 @@
-------------------------------------------------------------------
+Tue Jul 12 10:41:14 UTC 2016 - mchandras@suse.de
+
+- Add missing licenses (bsc#988513)
+- Misc spec file cleanups highlighted by the spec-cleaner tool.
+- Allow aarch64 builds for openvswitch-dpdk
+
+-------------------------------------------------------------------
Mon Jul 4 12:08:06 UTC 2016 - mchandras@suse.de
- Allow the OvS daemon to run as non-root (bsc#987545)
@@ -197,6 +204,8 @@
- Added: ovn-northd.service
- TODO: Explicit DPDK support not yet added to spec.
- Spec file work and cleanup.
+- Includes fixes (or obsoletes) the following issues:
+ * bsc#948840, bsc#941466, bsc#936780, bnc#935750, bnc#867964
-------------------------------------------------------------------
Tue Mar 1 08:43:19 UTC 2016 - kmroz@suse.com
Index: openvswitch-dpdk.spec
===================================================================
--- openvswitch-dpdk.spec (revision 98)
+++ openvswitch-dpdk.spec (revision 46)
@@ -14,10 +14,9 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-
-
# needssslcertforbuild
+
# Disable building the external kernel datapath by default
%bcond_with kmp
# DPDK build disabled by default. It's enabled in the
@@ -26,14 +25,16 @@
# The testsuite is somewhat fragile for continuous testing in OBS
# but keep it here as an option
%bcond_with check
-
# Do NOT edit this auto generated file! Edit openvswitch.spec instead
# and run 'pre_checkin.sh' before committing
Name: openvswitch-dpdk
Version: 2.5.0
Release: 0
Summary: An open source, production quality, multilayer virtual switch (DPDK)
-License: Apache-2.0
+# All code is Apache-2.0 except
+# - lib/sflow* which is SISSL
+# - utilities/bugtool which is LGPL-2.1
+License: Apache-2.0 and LGPL-2.1 and SISSL
Group: Productivity/Networking/System
Url: http://openvswitch.org/
Source0: http://openvswitch.org/releases/openvswitch-%{version}.tar.gz
@@ -43,35 +44,26 @@
Source89: Module.supported.updates
# PATCH-FIX-UPSTREAM openvswitch-2.5.0-detect-dpdk-installation.patch
Patch0: openvswitch-%{version}-detect-dpdk-installation.patch
-Patch1: 0001-Remove-broken-pipe-warning-logs-from-ovsdb-server.lo.patch
+Patch1: 0001-Remove-broken-pipe-warning-logs-from-ovsdb-server.lo.patch
BuildRequires: autoconf
BuildRequires: automake
-%if %{with dpdk}
-# We need to be a bit strict with the dpdk version since
-# it's very possible for DPDK to change it's API between
-# releases. OVS currently requires 2.2.0. We may have to
-# provide multiple versions of dpdk if OVS and DPDK get
-# out of sync too often.
-BuildRequires: dpdk-devel = 2.2.0
-ExclusiveArch: x86_64 %ix86
-%endif
BuildRequires: fdupes
BuildRequires: gcc
BuildRequires: glibc-devel
BuildRequires: graphviz
BuildRequires: libcap-ng-devel
-BuildRequires: libopenssl-devel
BuildRequires: libtool
BuildRequires: make
BuildRequires: openssl
BuildRequires: perl
-BuildRequires: pkg-config
+BuildRequires: pkgconfig
# Needed by the testsuite
BuildRequires: procps
BuildRequires: python-devel
BuildRequires: python-xml
+BuildRequires: valgrind-devel
+BuildRequires: pkgconfig(openssl)
Requires: logrotate
-Requires: openssl
Requires: python
Provides: openvswitch-common = %{version}
Obsoletes: openvswitch-common < %{version}
@@ -79,10 +71,16 @@
Obsoletes: openvswitch-controller < %{version}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%py_requires
-BuildRequires: valgrind-devel
-# We can't have openvswitch and openvswitch-dpdk in parallel
%if %{with dpdk}
+# We need to be a bit strict with the dpdk version since
+# it's very possible for DPDK to change it's API between
+# releases. OVS currently requires 2.2.0. We may have to
+# provide multiple versions of dpdk if OVS and DPDK get
+# out of sync too often.
+BuildRequires: dpdk-devel = 2.2.0
+# We can't have openvswitch and openvswitch-dpdk in parallel
Conflicts: openvswitch
+ExclusiveArch: aarch64 x86_64 %{ix86}
%endif
%description
@@ -131,15 +129,15 @@
# ovs-ctl / ovs-pki use /usr/bin/uuidgen:
Requires: util-linux
Requires(post): %fillup_prereq
+Suggests: logrotate
Provides: openvswitch-any-switch = %{version}
+%{?systemd_requires}
%if %{with dpdk}
Conflicts: openvswitch-switch
%endif
-Suggests: logrotate
%if %{with kmp}
Suggests: openvswitch-kmp
%endif
-%{?systemd_requires}
%description switch
openvswitch-switch provides the userspace components and utilities for
@@ -246,7 +244,7 @@
Open vSwitch is a full-featured software-based Ethernet switch.
%prep
-%setup -n openvswitch-%{version} -q
+%setup -q -n openvswitch-%{version}
%patch0 -p1
%patch1 -p1
@@ -290,6 +288,7 @@
--disable-static \
--enable-libcapng \
--enable-shared \
+ --enable-ssl \
${dpdk_opt} \
--with-logdir=%{_localstatedir}/log/openvswitch
make %{?_smp_mflags}
@@ -301,7 +300,7 @@
# 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}" ||
+if make check TESTSUITEFLAGS="%{?_smp_mflags}" ||
make check TESTSUITEFLAGS='--recheck'; then :;
else
cat tests/testsuite.log
@@ -358,7 +357,7 @@
mv %{buildroot}%{_datadir}/openvswitch/python/* %{buildroot}%{py_sitedir}
rmdir %{buildroot}%{_datadir}/openvswitch/python
-rm -f %buildroot/%_libdir/*.la
+find %{buildroot} -type f -name "*.la" -delete -print
# Remove unpackaged files for the dpdk case
%if %{with dpdk}
@@ -438,26 +437,26 @@
%{_libdir}/libopenvswitch.so.*
%{_libdir}/libovsdb.so.*
%{_libdir}/libsflow.so.*
-%{_mandir}/man1/ovs-benchmark.1.gz
-%{_mandir}/man1/ovsdb-client.1.gz
-%{_mandir}/man8/ovs-appctl.8.gz
-%{_mandir}/man8/ovs-bugtool.8.gz
-%{_mandir}/man8/ovs-ofctl.8.gz
-%{_mandir}/man8/ovs-vlan-bug-workaround.8.gz
-%{_mandir}/man8/ovs-parse-backtrace.8.gz
-%{_mandir}/man8/ovs-dpctl-top.8.gz
+%{_mandir}/man1/ovs-benchmark.1%{ext_man}
+%{_mandir}/man1/ovsdb-client.1%{ext_man}
+%{_mandir}/man8/ovs-appctl.8%{ext_man}
+%{_mandir}/man8/ovs-bugtool.8%{ext_man}
+%{_mandir}/man8/ovs-ofctl.8%{ext_man}
+%{_mandir}/man8/ovs-vlan-bug-workaround.8%{ext_man}
+%{_mandir}/man8/ovs-parse-backtrace.8%{ext_man}
+%{_mandir}/man8/ovs-dpctl-top.8%{ext_man}
%{_sysconfdir}/bash_completion.d/ovs-appctl-bashcomp.bash
%files pki
%defattr(-,root,root)
-%{_mandir}/man8/ovs-pki.8.gz
+%{_mandir}/man8/ovs-pki.8%{ext_man}
%{_bindir}/ovs-pki
%files vtep
%defattr(-,root,root)
%{_bindir}/vtep-ctl
-%{_mandir}/man5/vtep.5.gz
-%{_mandir}/man8/vtep-ctl.8.gz
+%{_mandir}/man5/vtep.5%{ext_man}
+%{_mandir}/man8/vtep-ctl.8%{ext_man}
%{_datadir}/openvswitch/scripts/ovs-vtep
%{_datadir}/openvswitch/vtep.ovsschema
%{_libdir}/libvtep.so.*
@@ -489,15 +488,15 @@
%{_datadir}/openvswitch/vswitch.ovsschema
%{_sysconfdir}/bash_completion.d/ovs-vsctl-bashcomp.bash
%config(noreplace) %{_sysconfdir}/logrotate.d/openvswitch-switch
-%{_mandir}/man8/ovs-dpctl.8.gz
-%{_mandir}/man1/ovs-tcpundump.1.gz
-%{_mandir}/man1/ovs-pcap.1.gz
-%{_mandir}/man8/ovs-vsctl.8.gz
-%{_mandir}/man1/ovsdb-tool.1.gz
-%{_mandir}/man8/ovs-vswitchd.8.gz
-%{_mandir}/man1/ovsdb-server.1.gz
-%{_mandir}/man5/ovs-vswitchd.conf.db.5.gz
-%{_mandir}/man8/ovs-ctl.8.gz
+%{_mandir}/man8/ovs-dpctl.8%{ext_man}
+%{_mandir}/man1/ovs-tcpundump.1%{ext_man}
+%{_mandir}/man1/ovs-pcap.1%{ext_man}
+%{_mandir}/man8/ovs-vsctl.8%{ext_man}
+%{_mandir}/man1/ovsdb-tool.1%{ext_man}
+%{_mandir}/man8/ovs-vswitchd.8%{ext_man}
+%{_mandir}/man1/ovsdb-server.1%{ext_man}
+%{_mandir}/man5/ovs-vswitchd.conf.db.5%{ext_man}
+%{_mandir}/man8/ovs-ctl.8%{ext_man}
%{_sbindir}/rcopenvswitch
%{_unitdir}/openvswitch.service
%{_localstatedir}/adm/fillup-templates/sysconfig.openvswitch
@@ -538,10 +537,10 @@
%{_bindir}/ovs-l3ping
%{_bindir}/ovs-vlan-test
%{_bindir}/ovs-testcontroller
-%{_mandir}/man8/ovs-test.8.gz
-%{_mandir}/man8/ovs-l3ping.8.gz
-%{_mandir}/man8/ovs-vlan-test.8.gz
-%{_mandir}/man8/ovs-testcontroller.8.gz
+%{_mandir}/man8/ovs-test.8%{ext_man}
+%{_mandir}/man8/ovs-l3ping.8%{ext_man}
+%{_mandir}/man8/ovs-vlan-test.8%{ext_man}
+%{_mandir}/man8/ovs-testcontroller.8%{ext_man}
%files devel
%defattr(-,root,root)
Index: openvswitch.changes
===================================================================
--- openvswitch.changes (revision 98)
+++ openvswitch.changes (revision 46)
@@ -1,4 +1,11 @@
-------------------------------------------------------------------
+Tue Jul 12 10:41:14 UTC 2016 - mchandras@suse.de
+
+- Add missing licenses (bsc#988513)
+- Misc spec file cleanups highlighted by the spec-cleaner tool.
+- Allow aarch64 builds for openvswitch-dpdk
+
+-------------------------------------------------------------------
Mon Jul 4 12:08:06 UTC 2016 - mchandras@suse.de
- Allow the OvS daemon to run as non-root (bsc#987545)
@@ -197,6 +204,8 @@
- Added: ovn-northd.service
- TODO: Explicit DPDK support not yet added to spec.
- Spec file work and cleanup.
+- Includes fixes (or obsoletes) the following issues:
+ * bsc#948840, bsc#941466, bsc#936780, bnc#935750, bnc#867964
-------------------------------------------------------------------
Tue Mar 1 08:43:19 UTC 2016 - kmroz@suse.com
Index: openvswitch.spec
===================================================================
--- openvswitch.spec (revision 98)
+++ openvswitch.spec (revision 46)
@@ -14,10 +14,9 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-
-
# needssslcertforbuild
+
# Disable building the external kernel datapath by default
%bcond_with kmp
# DPDK build disabled by default. It's enabled in the
@@ -26,12 +25,14 @@
# The testsuite is somewhat fragile for continuous testing in OBS
# but keep it here as an option
%bcond_with check
-
Name: openvswitch
Version: 2.5.0
Release: 0
Summary: An open source, production quality, multilayer virtual switch
-License: Apache-2.0
+# All code is Apache-2.0 except
+# - lib/sflow* which is SISSL
+# - utilities/bugtool which is LGPL-2.1
+License: Apache-2.0 and LGPL-2.1 and SISSL
Group: Productivity/Networking/System
Url: http://openvswitch.org/
Source0: http://openvswitch.org/releases/openvswitch-%{version}.tar.gz
@@ -41,35 +42,26 @@
Source89: Module.supported.updates
# PATCH-FIX-UPSTREAM openvswitch-2.5.0-detect-dpdk-installation.patch
Patch0: openvswitch-%{version}-detect-dpdk-installation.patch
-Patch1: 0001-Remove-broken-pipe-warning-logs-from-ovsdb-server.lo.patch
+Patch1: 0001-Remove-broken-pipe-warning-logs-from-ovsdb-server.lo.patch
BuildRequires: autoconf
BuildRequires: automake
-%if %{with dpdk}
-# We need to be a bit strict with the dpdk version since
-# it's very possible for DPDK to change it's API between
-# releases. OVS currently requires 2.2.0. We may have to
-# provide multiple versions of dpdk if OVS and DPDK get
-# out of sync too often.
-BuildRequires: dpdk-devel = 2.2.0
-ExclusiveArch: x86_64 %ix86
-%endif
BuildRequires: fdupes
BuildRequires: gcc
BuildRequires: glibc-devel
BuildRequires: graphviz
BuildRequires: libcap-ng-devel
-BuildRequires: libopenssl-devel
BuildRequires: libtool
BuildRequires: make
BuildRequires: openssl
BuildRequires: perl
-BuildRequires: pkg-config
+BuildRequires: pkgconfig
# Needed by the testsuite
BuildRequires: procps
BuildRequires: python-devel
BuildRequires: python-xml
+BuildRequires: valgrind-devel
+BuildRequires: pkgconfig(openssl)
Requires: logrotate
-Requires: openssl
Requires: python
Provides: openvswitch-common = %{version}
Obsoletes: openvswitch-common < %{version}
@@ -77,10 +69,16 @@
Obsoletes: openvswitch-controller < %{version}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%py_requires
-BuildRequires: valgrind-devel
-# We can't have openvswitch and openvswitch-dpdk in parallel
%if %{with dpdk}
+# We need to be a bit strict with the dpdk version since
+# it's very possible for DPDK to change it's API between
+# releases. OVS currently requires 2.2.0. We may have to
+# provide multiple versions of dpdk if OVS and DPDK get
+# out of sync too often.
+BuildRequires: dpdk-devel = 2.2.0
+# We can't have openvswitch and openvswitch-dpdk in parallel
Conflicts: openvswitch
+ExclusiveArch: aarch64 x86_64 %{ix86}
%endif
%description
@@ -129,15 +127,15 @@
# ovs-ctl / ovs-pki use /usr/bin/uuidgen:
Requires: util-linux
Requires(post): %fillup_prereq
+Suggests: logrotate
Provides: openvswitch-any-switch = %{version}
+%{?systemd_requires}
%if %{with dpdk}
Conflicts: openvswitch-switch
%endif
-Suggests: logrotate
%if %{with kmp}
Suggests: openvswitch-kmp
%endif
-%{?systemd_requires}
%description switch
openvswitch-switch provides the userspace components and utilities for
@@ -244,7 +242,7 @@
Open vSwitch is a full-featured software-based Ethernet switch.
%prep
-%setup -n openvswitch-%{version} -q
+%setup -q -n openvswitch-%{version}
%patch0 -p1
%patch1 -p1
@@ -288,6 +286,7 @@
--disable-static \
--enable-libcapng \
--enable-shared \
+ --enable-ssl \
${dpdk_opt} \
--with-logdir=%{_localstatedir}/log/openvswitch
make %{?_smp_mflags}
@@ -299,7 +298,7 @@
# 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}" ||
+if make check TESTSUITEFLAGS="%{?_smp_mflags}" ||
make check TESTSUITEFLAGS='--recheck'; then :;
else
cat tests/testsuite.log
@@ -356,7 +355,7 @@
mv %{buildroot}%{_datadir}/openvswitch/python/* %{buildroot}%{py_sitedir}
rmdir %{buildroot}%{_datadir}/openvswitch/python
-rm -f %buildroot/%_libdir/*.la
+find %{buildroot} -type f -name "*.la" -delete -print
# Remove unpackaged files for the dpdk case
%if %{with dpdk}
@@ -436,26 +435,26 @@
%{_libdir}/libopenvswitch.so.*
%{_libdir}/libovsdb.so.*
%{_libdir}/libsflow.so.*
-%{_mandir}/man1/ovs-benchmark.1.gz
-%{_mandir}/man1/ovsdb-client.1.gz
-%{_mandir}/man8/ovs-appctl.8.gz
-%{_mandir}/man8/ovs-bugtool.8.gz
-%{_mandir}/man8/ovs-ofctl.8.gz
-%{_mandir}/man8/ovs-vlan-bug-workaround.8.gz
-%{_mandir}/man8/ovs-parse-backtrace.8.gz
-%{_mandir}/man8/ovs-dpctl-top.8.gz
+%{_mandir}/man1/ovs-benchmark.1%{ext_man}
+%{_mandir}/man1/ovsdb-client.1%{ext_man}
+%{_mandir}/man8/ovs-appctl.8%{ext_man}
+%{_mandir}/man8/ovs-bugtool.8%{ext_man}
+%{_mandir}/man8/ovs-ofctl.8%{ext_man}
+%{_mandir}/man8/ovs-vlan-bug-workaround.8%{ext_man}
+%{_mandir}/man8/ovs-parse-backtrace.8%{ext_man}
+%{_mandir}/man8/ovs-dpctl-top.8%{ext_man}
%{_sysconfdir}/bash_completion.d/ovs-appctl-bashcomp.bash
%files pki
%defattr(-,root,root)
-%{_mandir}/man8/ovs-pki.8.gz
+%{_mandir}/man8/ovs-pki.8%{ext_man}
%{_bindir}/ovs-pki
%files vtep
%defattr(-,root,root)
%{_bindir}/vtep-ctl
-%{_mandir}/man5/vtep.5.gz
-%{_mandir}/man8/vtep-ctl.8.gz
+%{_mandir}/man5/vtep.5%{ext_man}
+%{_mandir}/man8/vtep-ctl.8%{ext_man}
%{_datadir}/openvswitch/scripts/ovs-vtep
%{_datadir}/openvswitch/vtep.ovsschema
%{_libdir}/libvtep.so.*
@@ -487,15 +486,15 @@
%{_datadir}/openvswitch/vswitch.ovsschema
%{_sysconfdir}/bash_completion.d/ovs-vsctl-bashcomp.bash
%config(noreplace) %{_sysconfdir}/logrotate.d/openvswitch-switch
-%{_mandir}/man8/ovs-dpctl.8.gz
-%{_mandir}/man1/ovs-tcpundump.1.gz
-%{_mandir}/man1/ovs-pcap.1.gz
-%{_mandir}/man8/ovs-vsctl.8.gz
-%{_mandir}/man1/ovsdb-tool.1.gz
-%{_mandir}/man8/ovs-vswitchd.8.gz
-%{_mandir}/man1/ovsdb-server.1.gz
-%{_mandir}/man5/ovs-vswitchd.conf.db.5.gz
-%{_mandir}/man8/ovs-ctl.8.gz
+%{_mandir}/man8/ovs-dpctl.8%{ext_man}
+%{_mandir}/man1/ovs-tcpundump.1%{ext_man}
+%{_mandir}/man1/ovs-pcap.1%{ext_man}
+%{_mandir}/man8/ovs-vsctl.8%{ext_man}
+%{_mandir}/man1/ovsdb-tool.1%{ext_man}
+%{_mandir}/man8/ovs-vswitchd.8%{ext_man}
+%{_mandir}/man1/ovsdb-server.1%{ext_man}
+%{_mandir}/man5/ovs-vswitchd.conf.db.5%{ext_man}
+%{_mandir}/man8/ovs-ctl.8%{ext_man}
%{_sbindir}/rcopenvswitch
%{_unitdir}/openvswitch.service
%{_localstatedir}/adm/fillup-templates/sysconfig.openvswitch
@@ -536,10 +535,10 @@
%{_bindir}/ovs-l3ping
%{_bindir}/ovs-vlan-test
%{_bindir}/ovs-testcontroller
-%{_mandir}/man8/ovs-test.8.gz
-%{_mandir}/man8/ovs-l3ping.8.gz
-%{_mandir}/man8/ovs-vlan-test.8.gz
-%{_mandir}/man8/ovs-testcontroller.8.gz
+%{_mandir}/man8/ovs-test.8%{ext_man}
+%{_mandir}/man8/ovs-l3ping.8%{ext_man}
+%{_mandir}/man8/ovs-vlan-test.8%{ext_man}
+%{_mandir}/man8/ovs-testcontroller.8%{ext_man}
%files devel
%defattr(-,root,root)
OBS-URL: https://build.opensuse.org/request/show/408658
OBS-URL: https://build.opensuse.org/package/show/network/openvswitch?expand=0&rev=99
2016-07-18 10:19:36 +02:00
|
|
|
|
%{_mandir}/man8/ovs-testcontroller.8%{ext_man}
|
2016-10-07 15:07:43 +02:00
|
|
|
|
%{_mandir}/man8/ovs-vlan-test.8%{ext_man}
|
2012-03-14 11:03:21 +01:00
|
|
|
|
|
2014-05-20 18:03:31 +02:00
|
|
|
|
%files devel
|
|
|
|
|
%defattr(-,root,root)
|
|
|
|
|
%{_libdir}/libofproto.so
|
|
|
|
|
%{_libdir}/libopenvswitch.so
|
2016-03-09 18:19:55 +01:00
|
|
|
|
%{_libdir}/libovn.so
|
2014-05-20 18:03:31 +02:00
|
|
|
|
%{_libdir}/libovsdb.so
|
|
|
|
|
%{_libdir}/libsflow.so
|
Accepting request 361282 from home:k_mroz:branches:network
- Don't install INSTALL.* files.
- Removed: openvswitch-switch.template
- New upstream version 2.4.0
- Flow table modifications are now atomic, meaning that each packet
now sees a coherent version of the OpenFlow pipeline. For
example, if a controller removes all flows with a single OpenFlow
"flow_mod", no packet sees an intermediate version of the OpenFlow
pipeline where only some of the flows have been deleted.
- Added support for SFQ, FQ_CoDel and CoDel qdiscs.
- Add bash command-line completion support for ovs-vsctl Please check
utilities/ovs-command-compgen.INSTALL.md for how to use.
- The MAC learning feature now includes per-port fairness to mitigate
MAC flooding attacks.
- New support for a "conjunctive match" OpenFlow extension, which
allows constructing OpenFlow matches of the form "field1 in
{a,b,c...} AND field2 in {d,e,f...}" and generalizations. For details,
see documentation for the "conjunction" action in ovs-ofctl(8).
- Add bash command-line completion support for ovs-appctl/ovs-dpctl/
ovs-ofctl/ovsdb-tool commands. Please check
utilities/ovs-command-compgen.INSTALL.md for how to use.
- The "learn" action supports a new flag "delete_learned" that causes
the learned flows to be deleted when the flow with the "learn" action
is deleted.
- Basic support for the Geneve tunneling protocol. It is not yet
possible to generate or match options. This is planned for a future
release. The protocol is documented at
http://tools.ietf.org/html/draft-gross-geneve-00
- The OVS database now reports controller rate limiting statistics.
OBS-URL: https://build.opensuse.org/request/show/361282
OBS-URL: https://build.opensuse.org/package/show/network/openvswitch?expand=0&rev=76
2016-02-26 16:24:36 +01:00
|
|
|
|
%{_libdir}/libvtep.so
|
|
|
|
|
%{_includedir}/openflow/
|
2016-10-07 15:07:43 +02:00
|
|
|
|
%{_includedir}/ovn/
|
Accepting request 361282 from home:k_mroz:branches:network
- Don't install INSTALL.* files.
- Removed: openvswitch-switch.template
- New upstream version 2.4.0
- Flow table modifications are now atomic, meaning that each packet
now sees a coherent version of the OpenFlow pipeline. For
example, if a controller removes all flows with a single OpenFlow
"flow_mod", no packet sees an intermediate version of the OpenFlow
pipeline where only some of the flows have been deleted.
- Added support for SFQ, FQ_CoDel and CoDel qdiscs.
- Add bash command-line completion support for ovs-vsctl Please check
utilities/ovs-command-compgen.INSTALL.md for how to use.
- The MAC learning feature now includes per-port fairness to mitigate
MAC flooding attacks.
- New support for a "conjunctive match" OpenFlow extension, which
allows constructing OpenFlow matches of the form "field1 in
{a,b,c...} AND field2 in {d,e,f...}" and generalizations. For details,
see documentation for the "conjunction" action in ovs-ofctl(8).
- Add bash command-line completion support for ovs-appctl/ovs-dpctl/
ovs-ofctl/ovsdb-tool commands. Please check
utilities/ovs-command-compgen.INSTALL.md for how to use.
- The "learn" action supports a new flag "delete_learned" that causes
the learned flows to be deleted when the flow with the "learn" action
is deleted.
- Basic support for the Geneve tunneling protocol. It is not yet
possible to generate or match options. This is planned for a future
release. The protocol is documented at
http://tools.ietf.org/html/draft-gross-geneve-00
- The OVS database now reports controller rate limiting statistics.
OBS-URL: https://build.opensuse.org/request/show/361282
OBS-URL: https://build.opensuse.org/package/show/network/openvswitch?expand=0&rev=76
2016-02-26 16:24:36 +01:00
|
|
|
|
%{_includedir}/openvswitch/
|
|
|
|
|
%{_libdir}/pkgconfig/*.pc
|
2011-05-20 21:19:18 +02:00
|
|
|
|
|
2010-12-11 17:10:38 +01:00
|
|
|
|
%changelog
|