From 6e646a80ae1bdaf450dbdc6909f500b4d96dd158 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Fri, 20 Feb 2015 21:23:09 -0600 Subject: [PATCH] Conflicts: plasma-workspace < plasma-workspace-5.2.0-8 --- kf5-kglobalaccel.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/kf5-kglobalaccel.spec b/kf5-kglobalaccel.spec index cc71745..5d5523a 100644 --- a/kf5-kglobalaccel.spec +++ b/kf5-kglobalaccel.spec @@ -2,7 +2,7 @@ Name: kf5-%{framework} Version: 5.7.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: KDE Frameworks 5 Tier 3 integration module for global shortcuts License: LGPLv2+ @@ -39,6 +39,8 @@ Requires: kf5-filesystem Requires: %{name}-libs%{?_isa} = %{version}-%{release} +Conflicts: plasma-workspace < 5.2.0-8 + %description KDE Framework 5 Tier 1 integration module for global shortcuts. @@ -100,6 +102,9 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform} %changelog +* Fri Feb 20 2015 Rex Dieter 5.7.0-2 +- Conflicts: plasma-workspace < plasma-workspace-5.2.0-8 + * Mon Feb 16 2015 Daniel Vrátil - 5.7.0-1 - KDE Frameworks 5.7.0