From 7a0f6135501cfe1dfdf88e05422ceba57006f781 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@gmail.com>
Date: Jul 09 2020 12:16:29 +0000
Subject: Merge branch 'f32' into f31


---

diff --git a/.gitignore b/.gitignore
index 94ded99..8519670 100644
--- a/.gitignore
+++ b/.gitignore
@@ -51,3 +51,11 @@
 /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
+/ksysguard-5.18.4.1.tar.xz
+/ksysguard-5.18.5.tar.xz
diff --git a/ksysguard.spec b/ksysguard.spec
index 98cad5d..11bd95b 100644
--- a/ksysguard.spec
+++ b/ksysguard.spec
@@ -1,5 +1,5 @@
 Name:    ksysguard
-Version: 5.17.5
+Version: 5.18.5
 Release: 1%{?dist}
 Summary: KDE Process Management application
 
@@ -81,6 +81,7 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/org.kde.ksysguard.des
 %{_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,33 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/org.kde.ksysguard.des
 
 
 %changelog
+* Tue May 05 2020 Jan Grulich <jgrulich@redhat.com> - 5.18.5-1
+- 5.18.5
+
+* Sat Apr 04 2020 Rex Dieter <rdieter@fedoraproject.org> - 5.18.4.1-1
+- 5.18.4.1
+
+* 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
 
diff --git a/sources b/sources
index 3618524..6e98e8a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (ksysguard-5.17.5.tar.xz) = 65c66d469487fafec4eec80ab9fb55e48520d87742b64819eeadd659d7ad43b87f647ef3031aa73f348d5716aa416089012bfb125d44fed01f3fec836d5ef549
+SHA512 (ksysguard-5.18.5.tar.xz) = 2cfb82caef5d074b945f0a7478b32af86d49e174d4d294dfe6a54acdb0b1d335e151828a4f239b52cf767ba04d9e93bf1632f2a37e2b1d611128543e0e0008a3