From 9f374b2b970bc5aa5af8d0d6c054138c5d68a017 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Fri, 4 Sep 2015 11:55:36 -0500 Subject: [PATCH] Conflicts: kio-extras < 5.4.0 --- plasma-workspace.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/plasma-workspace.spec b/plasma-workspace.spec index f9af38e..d02ac34 100644 --- a/plasma-workspace.spec +++ b/plasma-workspace.spec @@ -6,7 +6,7 @@ Name: plasma-workspace Version: 5.4.0 -Release: 6%{?dist}.1 +Release: 7%{?dist} Summary: Plasma workspace, applications and applets License: GPLv2+ URL: https://projects.kde.org/projects/kde/workspace/plasma-workspace @@ -125,6 +125,9 @@ BuildRequires: desktop-file-utils # Optional BuildRequires: kf5-kactivities-devel +# when kded_desktopnotifier.so moved here +Conflicts: kio-extras < 5.4.0 + # for libkdeinit5_* %{?kf5_kinit_requires} Requires: kf5-kactivities @@ -410,6 +413,9 @@ fi %changelog +* Fri Sep 04 2015 Rex Dieter 5.4.0-7 +- Conflicts: kio-extras < 5.4.0 + * Wed Sep 02 2015 Rex Dieter 5.4.0-6.1 - make plasma-pa f23+ only