rdieter pushed to kf5-kglobalaccel (master). "KDE Frameworks 5.8.0"

[notifications at fedoraproject.org]

>From 6e646a80ae1bdaf450dbdc6909f500b4d96dd158 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at gmail.com>
Date: Fri, 20 Feb 2015 21:23:09 -0600
Subject: Conflicts: plasma-workspace < plasma-workspace-5.2.0-8


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 <rdieter at fedoraproject.org> 5.7.0-2
+- Conflicts: plasma-workspace < plasma-workspace-5.2.0-8
+
 * Mon Feb 16 2015 Daniel Vrátil <dvratil at redhat.com> - 5.7.0-1
 - KDE Frameworks 5.7.0
 
-- 
cgit v0.10.2


>From e3c533b0923f53ea9d1bad2cd37bf5720147998d Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at gmail.com>
Date: Fri, 20 Feb 2015 21:23:33 -0600
Subject: fix changelog


diff --git a/kf5-kglobalaccel.spec b/kf5-kglobalaccel.spec
index 5d5523a..2ef0a17 100644
--- a/kf5-kglobalaccel.spec
+++ b/kf5-kglobalaccel.spec
@@ -103,7 +103,7 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
 %changelog
 * Fri Feb 20 2015 Rex Dieter <rdieter at fedoraproject.org> 5.7.0-2
-- Conflicts: plasma-workspace < plasma-workspace-5.2.0-8
+- Conflicts: plasma-workspace < 5.2.0-8
 
 * Mon Feb 16 2015 Daniel Vrátil <dvratil at redhat.com> - 5.7.0-1
 - KDE Frameworks 5.7.0
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/kf5-kglobalaccel.git/commit/?h=master&id=2e1baa3751b82b9034985277b532c85c5445db39