From 3b4aec0d995ffef23ccafbb3390d351734b6285b1a1af0bcbf253f9e7942cc5f Mon Sep 17 00:00:00 2001 From: Luigi Baldoni Date: Wed, 5 Jun 2019 15:56:29 +0000 Subject: [PATCH] Accepting request 707884 from home:alois:branches:devel:libraries:c_c++ - Fixed conflict with Qwt 5. OBS-URL: https://build.opensuse.org/request/show/707884 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/qwt6?expand=0&rev=9 --- qwt6.changes | 5 +++++ qwt6.spec | 1 + 2 files changed, 6 insertions(+) diff --git a/qwt6.changes b/qwt6.changes index 9c71d54..5f33b71 100644 --- a/qwt6.changes +++ b/qwt6.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Jun 5 15:46:53 UTC 2019 - Luigi Baldoni + +- Fixed conflict with Qwt 5. + ------------------------------------------------------------------- Fri May 24 09:22:23 UTC 2019 - Luigi Baldoni diff --git a/qwt6.spec b/qwt6.spec index 8ea1da1..b2c37b9 100644 --- a/qwt6.spec +++ b/qwt6.spec @@ -76,6 +76,7 @@ Recommends: %{name}-designer Recommends: %{name}-devel-doc Recommends: %{name}-examples Conflicts: otherproviders(qwt-qt5-devel) +Conflicts: qwt-devel Provides: qwt-qt5-devel = %{version} Obsoletes: qwt6-qt5-devel < %{version} Provides: qwt6-qt5-devel = %{version}