rpm/openvswitch
SHA256
1
0
Fork 0
forked from pool/openvswitch
Code Pull Requests Activity

This fixes some conflict issues reported in https://build.opensuse.org/request/show/479083

Browse Source 
and also removes the openvswitch-any-ovn-* and openvswitch-any-switch symbols which are not
necessary.

OBS-URL: https://build.opensuse.org/package/show/network/openvswitch?expand=0&rev=112
This commit is contained in:
Markos Chandras 2017-03-13 23:45:12 +00:00 committed by Git OBS Bridge
parent e6bd8f037c
commit f374ec9122
1 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
openvswitch.spec
View File

@ -63,7 +63,6 @@ Requires: python
Requires: util-linux Requires: util-linux
Requires(post): %fillup_prereq Requires(post): %fillup_prereq
Suggests: logrotate Suggests: logrotate
Conflicts: otherproviders(openvswitch-any-switch)
Provides: openvswitch-common = %{version} Provides: openvswitch-common = %{version}
Obsoletes: openvswitch-common < %{version} Obsoletes: openvswitch-common < %{version}
Provides: openvswitch-controller = %{version} Provides: openvswitch-controller = %{version}
@ -133,9 +132,8 @@ License: Apache-2.0
Group: Productivity/Networking/System Group: Productivity/Networking/System
Requires: %{name} = %{version} Requires: %{name} = %{version}
Requires: %{name}-ovn-common Requires: %{name}-ovn-common
Conflicts: otherproviders(openvswitch-any-ovn-central)
Provides: openvswitch-any-ovn-central = %{version}
# openvswitch-ovn has been split into openvswitch-ovn-{central,common,docker,host,vtep} # openvswitch-ovn has been split into openvswitch-ovn-{central,common,docker,host,vtep}
Provides: %{name}-dpdk-ovn:%{_bindir}/ovn-northd
Provides: %{name}-ovn:%{_bindir}/ovn-northd Provides: %{name}-ovn:%{_bindir}/ovn-northd
%description ovn-central %description ovn-central
@ -150,9 +148,8 @@ License: Apache-2.0
Group: Productivity/Networking/System Group: Productivity/Networking/System
Requires: %{name} = %{version} Requires: %{name} = %{version}
Requires: %{name}-ovn-common Requires: %{name}-ovn-common
Conflicts: otherproviders(openvswitch-any-ovn-host)
Provides: openvswitch-any-ovn-host = %{version}
# openvswitch-ovn has been split into openvswitch-ovn-{central,common,docker,host,vtep} # openvswitch-ovn has been split into openvswitch-ovn-{central,common,docker,host,vtep}
Provides: %{name}-dpdk-ovn:%{_bindir}/ovn-controller
Provides: %{name}-ovn:%{_bindir}/ovn-controller Provides: %{name}-ovn:%{_bindir}/ovn-controller
%description ovn-host %description ovn-host
@ -167,9 +164,8 @@ License: Apache-2.0
Group: Productivity/Networking/System Group: Productivity/Networking/System
Requires: %{name} = %{version} Requires: %{name} = %{version}
Requires: %{name}-ovn-common Requires: %{name}-ovn-common
Conflicts: otherproviders(openvswitch-any-ovn-vtep)
Provides: openvswitch-any-ovn-vtep = %{version}
# openvswitch-ovn has been split into openvswitch-ovn-{central,common,docker,host,vtep} # openvswitch-ovn has been split into openvswitch-ovn-{central,common,docker,host,vtep}
Provides: %{name}-dpdk-ovn:%{_bindir}/ovn-controller-vtep
Provides: %{name}-ovn:%{_bindir}/ovn-controller-vtep Provides: %{name}-ovn:%{_bindir}/ovn-controller-vtep
%description ovn-vtep %description ovn-vtep
@ -180,8 +176,6 @@ Summary: Open vSwitch - Open Virtual Network support
License: Apache-2.0 License: Apache-2.0
Group: Productivity/Networking/System Group: Productivity/Networking/System
Requires: %{name} = %{version} Requires: %{name} = %{version}
Conflicts: otherproviders(openvswitch-any-ovn-common)
Provides: openvswitch-any-ovn-common = %{version}
# openvswitch-ovn has been split into openvswitch-ovn-{central,common,docker,host,vtep} # openvswitch-ovn has been split into openvswitch-ovn-{central,common,docker,host,vtep}
Provides: %{name}-dpdk-ovn = %{version} Provides: %{name}-dpdk-ovn = %{version}
Provides: %{name}-ovn = %{version} Provides: %{name}-ovn = %{version}
@ -198,9 +192,8 @@ Group: Productivity/Networking/System
Requires: %{name} = %{version} Requires: %{name} = %{version}
Requires: %{name}-ovn-common = %{version} Requires: %{name}-ovn-common = %{version}
Requires: python-openvswitch = %{version} Requires: python-openvswitch = %{version}
Conflicts: otherproviders(openvswitch-any-ovn-docker)
Provides: openvswitch-any-ovn-docker = %{version}
# openvswitch-ovn has been split into openvswitch-ovn-{central,common,docker,host,vtep} # openvswitch-ovn has been split into openvswitch-ovn-{central,common,docker,host,vtep}
Provides: %{name}-dpdk-ovn:%{_bindir}/ovn-docker-overlay-driver
Provides: %{name}-ovn:%{_bindir}/ovn-docker-overlay-driver Provides: %{name}-ovn:%{_bindir}/ovn-docker-overlay-driver
%description ovn-docker %description ovn-docker