From f1124fc91b89ae1782dcc69d8e21f48d6098a4a5a27bbf4bb51b4320b6de4bcb Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Tue, 28 Jun 2016 14:58:40 +0000 Subject: [PATCH] Accepting request 405257 from home:markoschandras:network - Fix subpackage dependencies to not require the non-existent python DPDK subpackages (bsc#986835). We do not provide DPDK versions of the python bindings so nothing should depend on these subpackages. OBS-URL: https://build.opensuse.org/request/show/405257 OBS-URL: https://build.opensuse.org/package/show/network/openvswitch?expand=0&rev=94 --- openvswitch-dpdk.changes | 7 +++++++ openvswitch-dpdk.spec | 18 +++++++++--------- openvswitch.changes | 7 +++++++ openvswitch.spec | 18 +++++++++--------- 4 files changed, 32 insertions(+), 18 deletions(-) diff --git a/openvswitch-dpdk.changes b/openvswitch-dpdk.changes index b31bb33..9a5f2ad 100644 --- a/openvswitch-dpdk.changes +++ b/openvswitch-dpdk.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Jun 28 13:21:12 UTC 2016 - mchandras@suse.de + +- Fix subpackage dependencies to not require the non-existent python + DPDK subpackages (bsc#986835). We do not provide DPDK versions of + the python bindings so nothing should depend on these subpackages. + ------------------------------------------------------------------- Wed Jun 22 15:07:01 UTC 2016 - jengelh@inai.de diff --git a/openvswitch-dpdk.spec b/openvswitch-dpdk.spec index 3cb067a..394b1a1 100644 --- a/openvswitch-dpdk.spec +++ b/openvswitch-dpdk.spec @@ -176,7 +176,7 @@ Group: Productivity/Networking/System Requires: %{name} = %{version} Requires: %{name}-switch = %{version} # Since openvswitch/scripts/ovs-vtep requires various ovs python modules. -Requires: python-%{name} = %{version} +Requires: python-openvswitch = %{version} Provides: openvswitch-any-vtep = %{version} %description vtep @@ -186,26 +186,26 @@ forwarding. Open vSwitch is a full-featured software-based Ethernet switch. %if ! %{with dpdk} -%package -n python-%{name} +%package -n python-openvswitch Summary: Python bindings for Open vSwitch (DPDK) License: Python-2.0 Group: Productivity/Networking/System Requires: openvswitch-common = %{version} Requires: python -%description -n python-%{name} +%description -n python-openvswitch This package contains the full Python bindings for Open vSwitch database. -%package -n python-%{name}-test +%package -n python-openvswitch-test Summary: Python bindings for Open vSwitch (DPDK) License: Python-2.0 Group: Productivity/Networking/System Requires: openvswitch-common = %{version} Requires: python -Requires: python-%{name} = %{version} +Requires: python-openvswitch = %{version} Requires: python-twisted -%description -n python-%{name}-test +%description -n python-openvswitch-test This package contains the full Python bindings for Open vSwitch database. %endif @@ -215,8 +215,8 @@ License: Apache-2.0 Group: Productivity/Networking/System Requires: %{name} = %{version} Requires: python -Requires: python-%{name}-test = %{version} Requires: python-argparse +Requires: python-openvswitch-test = %{version} Requires: python-twisted Provides: openvswitch-any-test = %{version} @@ -439,11 +439,11 @@ rm -rf %{buildroot}%{py_sitedir} %{_libdir}/libvtep.so.* %if ! %{with dpdk} -%files -n python-%{name} +%files -n python-openvswitch %defattr(-,root,root) %{py_sitedir}/ovs/ -%files -n python-%{name}-test +%files -n python-openvswitch-test %defattr(-,root,root) %{py_sitedir}/ovstest/ %endif diff --git a/openvswitch.changes b/openvswitch.changes index b31bb33..9a5f2ad 100644 --- a/openvswitch.changes +++ b/openvswitch.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Jun 28 13:21:12 UTC 2016 - mchandras@suse.de + +- Fix subpackage dependencies to not require the non-existent python + DPDK subpackages (bsc#986835). We do not provide DPDK versions of + the python bindings so nothing should depend on these subpackages. + ------------------------------------------------------------------- Wed Jun 22 15:07:01 UTC 2016 - jengelh@inai.de diff --git a/openvswitch.spec b/openvswitch.spec index 82986a4..ac3c577 100644 --- a/openvswitch.spec +++ b/openvswitch.spec @@ -174,7 +174,7 @@ Group: Productivity/Networking/System Requires: %{name} = %{version} Requires: %{name}-switch = %{version} # Since openvswitch/scripts/ovs-vtep requires various ovs python modules. -Requires: python-%{name} = %{version} +Requires: python-openvswitch = %{version} Provides: openvswitch-any-vtep = %{version} %description vtep @@ -184,26 +184,26 @@ forwarding. Open vSwitch is a full-featured software-based Ethernet switch. %if ! %{with dpdk} -%package -n python-%{name} +%package -n python-openvswitch Summary: Python bindings for Open vSwitch License: Python-2.0 Group: Productivity/Networking/System Requires: openvswitch-common = %{version} Requires: python -%description -n python-%{name} +%description -n python-openvswitch This package contains the full Python bindings for Open vSwitch database. -%package -n python-%{name}-test +%package -n python-openvswitch-test Summary: Python bindings for Open vSwitch License: Python-2.0 Group: Productivity/Networking/System Requires: openvswitch-common = %{version} Requires: python -Requires: python-%{name} = %{version} +Requires: python-openvswitch = %{version} Requires: python-twisted -%description -n python-%{name}-test +%description -n python-openvswitch-test This package contains the full Python bindings for Open vSwitch database. %endif @@ -213,8 +213,8 @@ License: Apache-2.0 Group: Productivity/Networking/System Requires: %{name} = %{version} Requires: python -Requires: python-%{name}-test = %{version} Requires: python-argparse +Requires: python-openvswitch-test = %{version} Requires: python-twisted Provides: openvswitch-any-test = %{version} @@ -437,11 +437,11 @@ rm -rf %{buildroot}%{py_sitedir} %{_libdir}/libvtep.so.* %if ! %{with dpdk} -%files -n python-%{name} +%files -n python-openvswitch %defattr(-,root,root) %{py_sitedir}/ovs/ -%files -n python-%{name}-test +%files -n python-openvswitch-test %defattr(-,root,root) %{py_sitedir}/ovstest/ %endif