forked from pool/openvswitch
Accepting request 406691 from home:markoschandras:network
Fixing my last commit to add conflicts to all subpackages OBS-URL: https://build.opensuse.org/request/show/406691 OBS-URL: https://build.opensuse.org/package/show/network/openvswitch?expand=0&rev=97
This commit is contained in:
Markos Chandras
Git OBS Bridge
parent
9e7428fee8
commit
358bfa9806
@ -2,7 +2,7 @@
|
||||
Mon Jul 4 12:08:06 UTC 2016 - mchandras@suse.de
|
||||
|
||||
- Allow the OvS daemon to run as non-root (bsc#987545)
|
||||
- Add missing 'Conflicts' statements in the devel subpackage as
|
||||
- Add missing 'Conflicts' statements to all the subpackages as
|
||||
required by the Factory review tools.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
|
||||
@ -74,16 +74,16 @@ Requires: logrotate
|
||||
Requires: openssl
|
||||
Requires: python
|
||||
Provides: openvswitch-common = %{version}
|
||||
# We can't have openvswitch and openvswitch-dpdk in parallel
|
||||
%if %{with dpdk}
|
||||
Conflicts: openvswitch
|
||||
%endif
|
||||
Obsoletes: openvswitch-common < %{version}
|
||||
Provides: openvswitch-controller = %{version}
|
||||
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}
|
||||
Conflicts: openvswitch
|
||||
%endif
|
||||
|
||||
%description
|
||||
Open vSwitch is a production quality, multilayer virtual switch licensed under
|
||||
@ -112,10 +112,10 @@ Summary: Open vSwitch Devel Libraries (DPDK)
|
||||
License: Apache-2.0
|
||||
Group: Development/Libraries/C and C++
|
||||
Requires: %{name} = %{version}
|
||||
Provides: openvswitch-any-devel = %{version}
|
||||
%if %{with dpdk}
|
||||
Conflicts: openvswitch-devel
|
||||
%endif
|
||||
Provides: openvswitch-any-devel = %{version}
|
||||
|
||||
%description devel
|
||||
Devel libraries and headers for Open vSwitch.
|
||||
@ -132,6 +132,9 @@ Requires: python
|
||||
Requires: util-linux
|
||||
Requires(post): %fillup_prereq
|
||||
Provides: openvswitch-any-switch = %{version}
|
||||
%if %{with dpdk}
|
||||
Conflicts: openvswitch-switch
|
||||
%endif
|
||||
Suggests: logrotate
|
||||
%if %{with kmp}
|
||||
Suggests: openvswitch-kmp
|
||||
@ -152,6 +155,9 @@ Requires: %{name} = %{version}
|
||||
Requires: %{name}-switch = %{version}
|
||||
Requires: %{name}-vtep = %{version}
|
||||
Provides: openvswitch-any-ovn = %{version}
|
||||
%if %{with dpdk}
|
||||
Conflicts: openvswitch-ovn
|
||||
%endif
|
||||
|
||||
%description ovn
|
||||
OVN, the Open Virtual Network, is a system to support virtual network
|
||||
@ -165,6 +171,9 @@ License: Apache-2.0
|
||||
Group: Productivity/Networking/System
|
||||
Requires: %{name} = %{version}
|
||||
Provides: openvswitch-any-pki = %{version}
|
||||
%if %{with dpdk}
|
||||
Conflicts: openvswitch-pki
|
||||
%endif
|
||||
|
||||
%description pki
|
||||
openvswitch-pki provides PKI (public key infrastructure) support for
|
||||
@ -182,6 +191,9 @@ Requires: %{name}-switch = %{version}
|
||||
# Since openvswitch/scripts/ovs-vtep requires various ovs python modules.
|
||||
Requires: python-openvswitch = %{version}
|
||||
Provides: openvswitch-any-vtep = %{version}
|
||||
%if %{with dpdk}
|
||||
Conflicts: openvswitch-vtep
|
||||
%endif
|
||||
|
||||
%description vtep
|
||||
A VTEP (VXLAN Tunnel EndPoint) emulator that uses Open vSwitch for
|
||||
@ -223,6 +235,9 @@ Requires: python-argparse
|
||||
Requires: python-openvswitch-test = %{version}
|
||||
Requires: python-twisted
|
||||
Provides: openvswitch-any-test = %{version}
|
||||
%if %{with dpdk}
|
||||
Conflicts: openvswitch-test
|
||||
%endif
|
||||
|
||||
%description test
|
||||
This package contains utilities that are useful to diagnose
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
Mon Jul 4 12:08:06 UTC 2016 - mchandras@suse.de
|
||||
|
||||
- Allow the OvS daemon to run as non-root (bsc#987545)
|
||||
- Add missing 'Conflicts' statements in the devel subpackage as
|
||||
- Add missing 'Conflicts' statements to all the subpackages as
|
||||
required by the Factory review tools.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
|
||||
@ -72,16 +72,16 @@ Requires: logrotate
|
||||
Requires: openssl
|
||||
Requires: python
|
||||
Provides: openvswitch-common = %{version}
|
||||
# We can't have openvswitch and openvswitch-dpdk in parallel
|
||||
%if %{with dpdk}
|
||||
Conflicts: openvswitch
|
||||
%endif
|
||||
Obsoletes: openvswitch-common < %{version}
|
||||
Provides: openvswitch-controller = %{version}
|
||||
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}
|
||||
Conflicts: openvswitch
|
||||
%endif
|
||||
|
||||
%description
|
||||
Open vSwitch is a production quality, multilayer virtual switch licensed under
|
||||
@ -110,10 +110,10 @@ Summary: Open vSwitch Devel Libraries
|
||||
License: Apache-2.0
|
||||
Group: Development/Libraries/C and C++
|
||||
Requires: %{name} = %{version}
|
||||
Provides: openvswitch-any-devel = %{version}
|
||||
%if %{with dpdk}
|
||||
Conflicts: openvswitch-devel
|
||||
%endif
|
||||
Provides: openvswitch-any-devel = %{version}
|
||||
|
||||
%description devel
|
||||
Devel libraries and headers for Open vSwitch.
|
||||
@ -130,6 +130,9 @@ Requires: python
|
||||
Requires: util-linux
|
||||
Requires(post): %fillup_prereq
|
||||
Provides: openvswitch-any-switch = %{version}
|
||||
%if %{with dpdk}
|
||||
Conflicts: openvswitch-switch
|
||||
%endif
|
||||
Suggests: logrotate
|
||||
%if %{with kmp}
|
||||
Suggests: openvswitch-kmp
|
||||
@ -150,6 +153,9 @@ Requires: %{name} = %{version}
|
||||
Requires: %{name}-switch = %{version}
|
||||
Requires: %{name}-vtep = %{version}
|
||||
Provides: openvswitch-any-ovn = %{version}
|
||||
%if %{with dpdk}
|
||||
Conflicts: openvswitch-ovn
|
||||
%endif
|
||||
|
||||
%description ovn
|
||||
OVN, the Open Virtual Network, is a system to support virtual network
|
||||
@ -163,6 +169,9 @@ License: Apache-2.0
|
||||
Group: Productivity/Networking/System
|
||||
Requires: %{name} = %{version}
|
||||
Provides: openvswitch-any-pki = %{version}
|
||||
%if %{with dpdk}
|
||||
Conflicts: openvswitch-pki
|
||||
%endif
|
||||
|
||||
%description pki
|
||||
openvswitch-pki provides PKI (public key infrastructure) support for
|
||||
@ -180,6 +189,9 @@ Requires: %{name}-switch = %{version}
|
||||
# Since openvswitch/scripts/ovs-vtep requires various ovs python modules.
|
||||
Requires: python-openvswitch = %{version}
|
||||
Provides: openvswitch-any-vtep = %{version}
|
||||
%if %{with dpdk}
|
||||
Conflicts: openvswitch-vtep
|
||||
%endif
|
||||
|
||||
%description vtep
|
||||
A VTEP (VXLAN Tunnel EndPoint) emulator that uses Open vSwitch for
|
||||
@ -221,6 +233,9 @@ Requires: python-argparse
|
||||
Requires: python-openvswitch-test = %{version}
|
||||
Requires: python-twisted
|
||||
Provides: openvswitch-any-test = %{version}
|
||||
%if %{with dpdk}
|
||||
Conflicts: openvswitch-test
|
||||
%endif
|
||||
|
||||
%description test
|
||||
This package contains utilities that are useful to diagnose
|
||||
|
||||
Loading…
Reference in New Issue
Block a user