From ac118ab8ea2ac2cb37827c1aea423aea8989e34f Mon Sep 17 00:00:00 2001
From: Jan Grulich <jgrulich@redhat.com>
Date: Nov 24 2017 13:02:02 +0000
Subject: :wqerge branch 'f27' into f26


---

diff --git a/.gitignore b/.gitignore
index 02f0a97..1614fce 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,3 +27,4 @@
 /kdevelop-5.1.2.tar.xz
 /kdevelop-5.1.80.tar.xz
 /kdevelop-5.2.0.tar.xz
+/kdevelop-5.2.1.tar.xz
diff --git a/kdevelop.spec b/kdevelop.spec
index 66b3006..9485f59 100644
--- a/kdevelop.spec
+++ b/kdevelop.spec
@@ -2,8 +2,8 @@
 Name:           kdevelop
 Summary:        Integrated Development Environment for C++/C
 Epoch:          9
-Version:        5.2.0
-Release:        2%{?dist}
+Version:        5.2.1
+Release:        1%{?dist}
 License:        GPLv2
 URL:            http://www.kdevelop.org/
 Source0:        http://download.kde.org/stable/kdevelop/%{version}/src/kdevelop-%{version}.tar.xz
@@ -198,7 +198,7 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
 %{_datadir}/plasma/services/org.kde.plasma.dataengine.kdevelopsessions.operations
 %{_datadir}/knotifications5/kdevelop.notifyrc
 %{_datadir}/icons/hicolor/*/*/*
-%{_datadir}/appdata/org.kde.kdevelop.appdata.xml
+%{_datadir}/metainfo/org.kde.kdevelop.appdata.xml
 %{_docdir}/HTML/*/kdevelop/
 %{_kf5_datadir}/kservicetypes5/kdevelopplugin.desktop
 %{_sysconfdir}/xdg/kdevelop.categories
@@ -229,6 +229,9 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
 %{rpm_macros_dir}/macros.kdevelop
 
 %changelog
+* Fri Nov 24 2017 Jan Grulich <jgrulich@redhat.com> - 5.2.1-1
+- Update to 5.2.1
+
 * Tue Nov 14 2017 Jan Grulich <jgrulich@redhat.com> - 5.2.0-1
 - Update to 5.2.0
 
diff --git a/sources b/sources
index fec9102..e14cb90 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (kdevelop-5.2.0.tar.xz) = 5908ed1e2e66f1c589a9cbd323b4e5cf8cfbf6574cc52557b52ba2ea0e41eb8bab8947f9e8ef66fe815d6cf408fbf2e1a435480a6a9b90bad4330b6f5d0787ac
+SHA512 (kdevelop-5.2.1.tar.xz) = ee4a7f93c4f5168e6c63ca415a1f757cb7d2615370201700db16abdf1799e5c12421e382f5937be4a65af026a00df679b745fc4dab4d73974275d95d53173cd0