From 63572033bdcfae82066cdc54c4cefe7e56149e22 Mon Sep 17 00:00:00 2001
From: Troy Dawson <tdawson@redhat.com>
Date: May 05 2020 16:25:33 +0000
Subject: Merge branch f32 into epel8


---

diff --git a/.gitignore b/.gitignore
index c0fc709..907a964 100644
--- a/.gitignore
+++ b/.gitignore
@@ -37,3 +37,23 @@
 /ksysguard-5.15.3.tar.xz
 /ksysguard-5.15.4.tar.xz
 /ksysguard-5.15.5.tar.xz
+/ksysguard-5.15.90.tar.xz
+/ksysguard-5.16.0.tar.xz
+/ksysguard-5.16.1.tar.xz
+/ksysguard-5.16.2.tar.xz
+/ksysguard-5.16.3.tar.xz
+/ksysguard-5.16.4.tar.xz
+/ksysguard-5.16.5.tar.xz
+/ksysguard-5.16.90.tar.xz
+/ksysguard-5.17.0.tar.xz
+/ksysguard-5.17.1.tar.xz
+/ksysguard-5.17.2.tar.xz
+/ksysguard-5.17.3.tar.xz
+/ksysguard-5.17.4.tar.xz
+/ksysguard-5.17.5.tar.xz
+/ksysguard-5.17.90.tar.xz
+/ksysguard-5.18.0.tar.xz
+/ksysguard-5.18.1.tar.xz
+/ksysguard-5.18.2.tar.xz
+/ksysguard-5.18.3.tar.xz
+/ksysguard-5.18.4.tar.xz
diff --git a/ksysguard.spec b/ksysguard.spec
index 8e627fd..75e276a 100644
--- a/ksysguard.spec
+++ b/ksysguard.spec
@@ -1,5 +1,5 @@
 Name:    ksysguard
-Version: 5.15.5
+Version: 5.18.4
 Release: 1%{?dist}
 Summary: KDE Process Management application
 
@@ -76,11 +76,12 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/org.kde.ksysguard.des
 %{_kf5_libdir}/libkdeinit5_ksysguard.so
 %{_datadir}/ksysguard
 %{_datadir}/metainfo/org.kde.ksysguard.appdata.xml
-%config %{_sysconfdir}/xdg/ksysguard.knsrc
+%{_datadir}/knsrcfiles/ksysguard.knsrc
 %{_datadir}/applications/org.kde.ksysguard.desktop
 %{_datadir}/icons/hicolor/*/apps/*
 %{_kf5_datadir}/knotifications5/ksysguard.notifyrc
 %{_kf5_datadir}/kxmlgui5/ksysguard/
+%{_qt5_plugindir}/ksysguard/process/ksysguard_plugin_nvidia.so
 
 %files -n ksysguardd
 %license COPYING
@@ -89,6 +90,75 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/org.kde.ksysguard.des
 
 
 %changelog
+* Tue Mar 31 2020 Jan Grulich <jgrulich@redhat.com> - 5.18.4-1
+- 5.18.4
+
+* Tue Mar 10 2020 Jan Grulich <jgrulich@redhat.com> - 5.18.3-1
+- 5.18.3
+
+* Tue Feb 25 2020 Jan Grulich <jgrulich@redhat.com> - 5.18.2-1
+- 5.18.2
+
+* Tue Feb 18 2020 Jan Grulich <jgrulich@redhat.com> - 5.18.1-1
+- 5.18.1
+
+* Tue Feb 11 2020 Jan Grulich <jgrulich@redhat.com> - 5.18.0-1
+- 5.18.0
+
+* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 5.17.90-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Thu Jan 16 2020 Jan Grulich <jgrulich@redhat.com> - 5.17.90-1
+- 5.17.90
+
+* Wed Jan 08 2020 Jan Grulich <jgrulich@redhat.com> - 5.17.5-1
+- 5.17.5
+
+* Thu Dec 05 2019 Jan Grulich <jgrulich@redhat.com> - 5.17.4-1
+- 5.17.4
+
+* Wed Nov 13 2019 Martin Kyral <martin.kyral@gmail.com> - 5.17.3-1
+- 5.17.3
+
+* Wed Oct 30 2019 Jan Grulich <jgrulich@redhat.com> - 5.17.2-1
+- 5.17.2
+
+* Wed Oct 23 2019 Jan Grulich <jgrulich@redhat.com> - 5.17.1-1
+- 5.17.1
+
+* Wed Oct 16 2019 Jan Grulich <jgrulich@redhat.com> - 5.17.0-2
+- Updated tarball
+
+* Thu Oct 10 2019 Jan Grulich <jgrulich@redhat.com> - 5.17.0-1
+- 5.17.0
+
+* Fri Sep 20 2019 Martin Kyral <martin.kyral@gmail.com> - 5.16.90-1
+- 5.16.90
+
+* Fri Sep 06 2019 Martin Kyral <martin.kyral@gmail.com> - 5.16.5-1
+- 5.16.5
+
+* Tue Jul 30 2019 Martin Kyral <martin.kyral@gmail.com> - 5.16.4-1
+- 5.16.4
+
+* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 5.16.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Wed Jul 10 2019 Martin Kyral <martin.kyral@gmail.com> - 5.16.3-1
+- 5.16.3
+
+* Wed Jun 26 2019 Martin Kyral <martin.kyral@gmail.com> - 5.16.2-1
+- 5.16.2
+
+* Tue Jun 18 2019 Rex Dieter <rdieter@fedoraproject.org> - 5.16.1-1
+- 5.16.1
+
+* Tue Jun 11 2019 Martin Kyral <martin.kyral@gmail.com> - 5.16.0-1
+- 5.16.0
+
+* Thu May 16 2019 Martin Kyral <martin.kyral@gmail.com> - 5.15.90-1
+- 5.15.90
+
 * Thu May 09 2019 Martin Kyral <martin.kyral@gmail.com> - 5.15.5-1
 - 5.15.5
 
diff --git a/sources b/sources
index 0a2e5d4..4011792 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (ksysguard-5.15.5.tar.xz) = ae74adac0a4b20d9ddcf9b172542a3c96de46adb66b2f6c1d4e5f97562572e365f777d1daffd82e677ca1be37e868425112f69bd6e85e51118dc557f66ab5b8e
+SHA512 (ksysguard-5.18.4.tar.xz) = be1631ee1b03f2084c71fc390a7aff9ab1f7136e0645e49b34dcf82751238ccdbc4ba45c97cc92f1736eba5e8f6a6f7f756f4aede2c1f0ef29d845635afa63a8