From b70d2d6455ad6d06fd4c045db0d84b8023583d59 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@math.unl.edu>
Date: Sep 09 2016 17:42:09 +0000
Subject: Merge branch 'master' into f23


---

diff --git a/.gitignore b/.gitignore
index 41bc6c9..eabc305 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@
 /kactivitymanagerd-5.7.1.tar.xz
 /kactivitymanagerd-5.7.2.tar.xz
 /kactivitymanagerd-5.7.3.tar.xz
+/kactivitymanagerd-5.7.4.tar.xz
diff --git a/kactivitymanagerd.spec b/kactivitymanagerd.spec
index 1160911..0e5475f 100644
--- a/kactivitymanagerd.spec
+++ b/kactivitymanagerd.spec
@@ -1,6 +1,6 @@
 Name:           kactivitymanagerd
 Summary:        Plasma service to manage user's activities
-Version: 5.7.3
+Version: 5.7.4
 Release: 1%{?dist}
 
 License:        GPLv2+
@@ -34,7 +34,6 @@ BuildRequires:  boost-devel
 # but thanks to our clever packaging kf5-kactivities package
 # already contained only the kactivitymanagerd files
 Obsoletes:      kf5-kactivities < 5.21.0
-Provides:       kf5-kactivities = 1:%{version}-%{release}
 
 # older ones (previously in kf5-kactivities)
 Obsoletes:      kactivities < 4.90.0
@@ -78,6 +77,12 @@ rm -fv %{buildroot}%{_kf5_qmldir}/org/kde/activities/{libkactivitiesextensionplu
 
 
 %changelog
+* Tue Aug 23 2016 Rex Dieter <rdieter@fedoraproject.org> - 5.7.4-1
+- 5.7.4
+
+* Mon Aug 15 2016 Rex Dieter <rdieter@fedoraproject.org> - 5.7.3-2
+- drop Provides: kf5-kactivities
+
 * Tue Aug 02 2016 Rex Dieter <rdieter@fedoraproject.org> - 5.7.3-1
 - 5.7.3
 
diff --git a/sources b/sources
index c61075a..9440895 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9ec5c70fd1e5fdc12bf35e1511948543  kactivitymanagerd-5.7.3.tar.xz
+06cc5aca4431fe62214bc6009959375a  kactivitymanagerd-5.7.4.tar.xz