From 6ea3b628c3a5420f86402c41898f8a2120e50903a89a22d8fd32fe55afa14792 Mon Sep 17 00:00:00 2001 From: Guillaume GARDET Date: Mon, 28 Oct 2019 13:08:08 +0000 Subject: [PATCH] Accepting request 743495 from home:Guillaume_G:branches:science:machinelearning - Add a conflict between armnn-devel and armnn-opencl-devel OBS-URL: https://build.opensuse.org/request/show/743495 OBS-URL: https://build.opensuse.org/package/show/science:machinelearning/armnn?expand=0&rev=10 --- armnn.changes | 5 +++++ armnn.spec | 6 ++++++ 2 files changed, 11 insertions(+) diff --git a/armnn.changes b/armnn.changes index 2d4d3df..36f6ead 100644 --- a/armnn.changes +++ b/armnn.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Oct 28 13:06:56 UTC 2019 - Guillaume GARDET + +- Add a conflict between armnn-devel and armnn-opencl-devel + ------------------------------------------------------------------- Mon Oct 28 09:56:16 UTC 2019 - Guillaume GARDET diff --git a/armnn.spec b/armnn.spec index b604ba3..b478995 100644 --- a/armnn.spec +++ b/armnn.spec @@ -191,6 +191,12 @@ modification – across Arm Cortex CPUs and Arm Mali GPUs. %package devel Summary: Development headers and libraries for armnn Group: Development/Libraries/C and C++ +# Make sure we do not install both openCL and non-openCL (CPU only) versions. +%if "%{target}" == "opencl" +Conflicts: armnn-devel +%else +Conflicts: armnn-opencl-devel +%endif Requires: %{name} = %{version} Requires: libarmnn%{version_major}%{?package_suffix} = %{version} %if %{with armnn_flatbuffers}