diff --git a/openvswitch.spec b/openvswitch.spec index 9b816d4..f7ff4f3 100644 --- a/openvswitch.spec +++ b/openvswitch.spec @@ -63,7 +63,6 @@ Requires: python Requires: util-linux Requires(post): %fillup_prereq Suggests: logrotate -Conflicts: otherproviders(openvswitch-any-switch) Provides: openvswitch-common = %{version} Obsoletes: openvswitch-common < %{version} Provides: openvswitch-controller = %{version} @@ -133,9 +132,8 @@ License: Apache-2.0 Group: Productivity/Networking/System Requires: %{name} = %{version} 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} +Provides: %{name}-dpdk-ovn:%{_bindir}/ovn-northd Provides: %{name}-ovn:%{_bindir}/ovn-northd %description ovn-central @@ -150,9 +148,8 @@ License: Apache-2.0 Group: Productivity/Networking/System Requires: %{name} = %{version} 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} +Provides: %{name}-dpdk-ovn:%{_bindir}/ovn-controller Provides: %{name}-ovn:%{_bindir}/ovn-controller %description ovn-host @@ -167,9 +164,8 @@ License: Apache-2.0 Group: Productivity/Networking/System Requires: %{name} = %{version} 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} +Provides: %{name}-dpdk-ovn:%{_bindir}/ovn-controller-vtep Provides: %{name}-ovn:%{_bindir}/ovn-controller-vtep %description ovn-vtep @@ -180,8 +176,6 @@ Summary: Open vSwitch - Open Virtual Network support License: Apache-2.0 Group: Productivity/Networking/System 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} Provides: %{name}-dpdk-ovn = %{version} Provides: %{name}-ovn = %{version} @@ -198,9 +192,8 @@ Group: Productivity/Networking/System Requires: %{name} = %{version} Requires: %{name}-ovn-common = %{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} +Provides: %{name}-dpdk-ovn:%{_bindir}/ovn-docker-overlay-driver Provides: %{name}-ovn:%{_bindir}/ovn-docker-overlay-driver %description ovn-docker