KDE Frameworks 5.8.0

.gitignore

@@ -8,3 +8,4 @@
 /kglobalaccel-5.5.0.tar.xz
 /kglobalaccel-5.6.0.tar.xz
 /kglobalaccel-5.7.0.tar.xz
+/kglobalaccel-5.8.0.tar.xz

kf5-kglobalaccel.spec

@@ -1,8 +1,8 @@
 %global framework kglobalaccel
 
 Name:           kf5-%{framework}
-Version:        5.7.0
-Release:        2%{?dist}
+Version:        5.8.0
+Release:        1%{?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,8 +102,16 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
 
 %changelog
+* Mon Mar 16 2015 Daniel Vrátil <dvratil@redhat.com> - 5.8.0-1
+- KDE Frameworks 5.8.0
+
+<<<<<<< HEAD
 * Fri Feb 27 2015 Daniel Vrátil <dvratil@redhat.com> - 5.7.0-2
 - Rebuild (GCC 5)
+=======
+* Fri Feb 20 2015 Rex Dieter <rdieter@fedoraproject.org> 5.7.0-2
+- Conflicts: plasma-workspace < 5.2.0-8
+>>>>>>> e3c533b0923f53ea9d1bad2cd37bf5720147998d
 
 * Mon Feb 16 2015 Daniel Vrátil <dvratil@redhat.com> - 5.7.0-1
 - KDE Frameworks 5.7.0

sources

@@ -1 +1 @@
-a54ad9ea7f1ed3eb5d8f3f3708e1d78c  kglobalaccel-5.7.0.tar.xz
+e3b6e3965f9777489fce066627611d50  kglobalaccel-5.8.0.tar.xz