From acaf03786eb51ca86c91792354b1f73f22f5f71125ce039b712603e9b7d12b65 Mon Sep 17 00:00:00 2001 From: Raymond Wooninck Date: Fri, 22 Apr 2016 08:53:51 +0000 Subject: [PATCH] Accepting request 391147 from home:wolfi323:branches:KDE:Applications - Conflict with kactivities5 5.19.0 and earlier to prevent file conflicts. The activities fileitem_linking_plugin and kio slave have been moved from kactivities5 to kio-extras5 in 16.04 (boo#976592) OBS-URL: https://build.opensuse.org/request/show/391147 OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/kio-extras5?expand=0&rev=20 --- kio-extras5.changes | 8 ++++++++ kio-extras5.spec | 2 ++ 2 files changed, 10 insertions(+) diff --git a/kio-extras5.changes b/kio-extras5.changes index 279d50d..59cb035 100644 --- a/kio-extras5.changes +++ b/kio-extras5.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Thu Apr 21 11:57:45 UTC 2016 - wbauer@tmo.at + +- Conflict with kactivities5 5.19.0 and earlier to prevent file + conflicts. The activities fileitem_linking_plugin and kio slave + have been moved from kactivities5 to kio-extras5 in 16.04 + (boo#976592) + ------------------------------------------------------------------- Sun Apr 17 06:05:50 UTC 2016 - tittiatcoke@gmail.com diff --git a/kio-extras5.spec b/kio-extras5.spec index 3ce6eea..9ffaf13 100644 --- a/kio-extras5.spec +++ b/kio-extras5.spec @@ -63,6 +63,8 @@ Recommends: kimageformats #BuildRequires: update-desktop-files Provides: kfileaudiopreview = 4.100.0 Obsoletes: kfileaudiopreview <= 4.100.0 +# the activities fileitem_linking_plugin and kio slave have been moved over here in 16.04 (boo#976592) +Conflicts: kactivities5 <= 5.19.0 BuildRoot: %{_tmppath}/%{name}-%{version}-build %description