From 904dff136585df5348dbee58eee3d7faaeb7997b Mon Sep 17 00:00:00 2001
From: Jan Grulich <jgrulich@redhat.com>
Date: Jul 16 2018 06:13:09 +0000
Subject: Merge branch 'master'


---

diff --git a/.gitignore b/.gitignore
index 1ef23cb..8b2a186 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,8 @@
-/plasma-desktop-5.12.3.tar.xz
-/plasma-desktop-5.12.4.tar.xz
 /plasma-desktop-5.12.5.tar.xz
 /plasma-desktop-5.12.6.tar.xz
+/plasma-desktop-5.12.90.1.tar.xz
+/plasma-desktop-5.13.0.tar.xz
+/plasma-desktop-5.13.1.tar.xz
+/plasma-desktop-5.13.1.1.tar.xz
+/plasma-desktop-5.13.2.tar.xz
+/plasma-desktop-5.13.3.tar.xz
diff --git a/plasma-desktop.spec b/plasma-desktop.spec
index f34dcce..fb4c751 100644
--- a/plasma-desktop.spec
+++ b/plasma-desktop.spec
@@ -3,12 +3,13 @@
 
 Name:    plasma-desktop
 Summary: Plasma Desktop shell
-Version: 5.12.6
-Release: 1%{?dist}
+Version: 5.13.3
+Release: 2%{?dist}
 
 License: GPLv2+ and (GPLv2 or GPLv3)
 URL:     https://cgit.kde.org/%{name}.git
 
+%global verdir %(echo %{version} | cut -d. -f1-3)
 %global revision %(echo %{version} | cut -d. -f3)
 %if %{revision} >= 50
 %global majmin_ver %(echo %{version} | cut -d. -f1,2).50
@@ -17,7 +18,7 @@ URL:     https://cgit.kde.org/%{name}.git
 %global majmin_ver %(echo %{version} | cut -d. -f1,2)
 %global stable stable
 %endif
-Source0: http://download.kde.org/%{stable}/plasma/%{version}/%{name}-%{version}.tar.xz
+Source0: http://download.kde.org/%{stable}/plasma/%{verdir}/%{name}-%{version}.tar.xz
 
 ## downstream patches
 # default kickoff favorites: +konsole +apper
@@ -262,9 +263,10 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/org.kde.{kfontview,k
 %{_datadir}/config.kcfg/touchpad.kcfg
 %{_datadir}/config.kcfg/touchpaddaemon.kcfg
 %{_datadir}/dbus-1/interfaces/org.kde.touchpad.xml
+%{_datadir}/kservices5/kded/touchpad.desktop
 # kcminput
 %{_kf5_bindir}/kapplymousetheme
-%{_kf5_datadir}/kcminput/
+%{_kf5_datadir}/kcmmouse/
 %endif
 %{_kf5_qtplugindir}/plasma/dataengine/plasma_engine_kimpanel.so
 %{_kf5_datadir}/color-schemes
@@ -282,6 +284,7 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/org.kde.{kfontview,k
 %{_kf5_datadir}/kcmsolidactions/
 %{_kf5_datadir}/solid/devices/*.desktop
 %config %{_sysconfdir}/dbus-1/system.d/*.conf
+%config %{_sysconfdir}/xdg/*.categories
 %config %{_sysconfdir}/xdg/*.knsrc
 %{_kf5_datadir}/kservices5/*.desktop
 %{_kf5_datadir}/kservices5/ServiceMenus/installfont.desktop
@@ -305,8 +308,30 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/org.kde.{kfontview,k
 
 
 %changelog
-* Wed Jun 27 2018 Rex Dieter <rdieter@fedoraproject.org> - 5.12.6-1
-- 5.12.6
+* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 5.13.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Wed Jul 11 2018 Martin Kyral <martin.kyral@gmail.com> - 5.13.3-1
+- 5.13.3
+
+* Mon Jul 09 2018 Martin Kyral <martin.kyral@gmail.com> - 5.13.2-1
+- 5.13.2
+
+* Wed Jun 20 2018 Martin Kyral <martin.kyral@gmail.com> - 5.13.1.1-1
+- 5.13.1.1
+
+* Tue Jun 19 2018 Martin Kyral <martin.kyral@gmail.com> - 5.13.1-1
+- 5.13.1
+
+* Sat Jun 09 2018 Rex Dieter <rdieter@fedoraproject.org> - 5.13.0-1
+- 5.13.0
+
+* Thu May 31 2018 Rex Dieter <rdieter@fedoraproject.org> - 5.12.90.1-1
+- 5.12.90.1
+- kickoff crashes when click on categories (#1584515)
+
+* Fri May 18 2018 Martin Kyral <martin.kyral@gmail.com> - 5.12.90-1
+- 5.12.90
 
 * Tue May 01 2018 Rex Dieter <rdieter@fedoraproject.org> - 5.12.5-1
 - 5.12.5
diff --git a/sources b/sources
index caa8c4f..f506b68 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (plasma-desktop-5.12.6.tar.xz) = 435add4f2133f3e54023ad42b1360dc3ea3c44789692a38e5d95fcc825a1b7a9e3bdc05d03a375c687f3f0544c8f2ea4ccf047ec099ea3da32ed539ca57c8d76
+SHA512 (plasma-desktop-5.13.3.tar.xz) = 2909d91c9d01e93d569644489e461a8b95b321754b550fb3b3cbc3d151fea53b58e557dbd6e50c41c64f12ac07a4fee205dea4002ee35fd7c9c1b26d8f03a02f