From fc0c088f0a3b4007b15cb4ffd8cf7c636d636b1b Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@gmail.com>
Date: Mar 01 2021 16:53:57 +0000
Subject: rename -libs to -plugins (avoid conflicts with legacy ksysguard-libs)

.spec cleanup, use cmake-style deps

---

diff --git a/ksysguard.spec b/ksysguard.spec
index 9fa9a7f..20d8fdd 100644
--- a/ksysguard.spec
+++ b/ksysguard.spec
@@ -1,12 +1,10 @@
-%undefine __cmake_in_source_build
-
 Name:    ksysguard
 Version: 5.21.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: KDE Process Management application
 
 License: GPLv2
-URL:     https://cgit.kde.org/%{name}.git
+URL:     https://invent.kde.org/plasma%{name}
 
 %global revision %(echo %{version} | cut -d. -f3)
 %if %{revision} >= 50
@@ -16,62 +14,65 @@ 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/%{version}/%{name}-%{version}.tar.xz
+
+BuildRequires: desktop-file-utils
+BuildRequires: libappstream-glib
 
-BuildRequires:  qt5-qtbase-devel
-BuildRequires:  qt5-qtscript-devel
+BuildRequires: libksysguard-devel >= %{majmin_ver}
 
-BuildRequires:  kf5-rpm-macros
-BuildRequires:  extra-cmake-modules
+BuildRequires: kf5-rpm-macros
+BuildRequires: extra-cmake-modules
+BuildRequires: cmake(KF5Config)
+BuildRequires: cmake(KF5CoreAddons)
+BuildRequires: cmake(KF5DBusAddons)
+BuildRequires: cmake(KF5DocTools)
+BuildRequires: cmake(KF5I18n)
+BuildRequires: cmake(KF5IconThemes)
+BuildRequires: cmake(KF5Init)
+BuildRequires: cmake(KF5ItemViews)
+BuildRequires: cmake(KF5KIO)
+BuildRequires: cmake(KF5NewStuff)
+BuildRequires: cmake(KF5Notifications)
+BuildRequires: cmake(KF5Solid)
+BuildRequires: cmake(KF5WindowSystem)
 
-BuildRequires:  kf5-kcoreaddons-devel
-BuildRequires:  kf5-ki18n-devel
-BuildRequires:  kf5-kitemviews-devel
-BuildRequires:  kf5-knewstuff-devel
-BuildRequires:  kf5-kconfig-devel
-BuildRequires:  kf5-kiconthemes-devel
-BuildRequires:  kf5-kdelibs4support-devel
-BuildRequires:  kf5-kdoctools-devel
-BuildRequires:  kf5-networkmanager-qt-devel
+# libkdeinit5_*
+%{?kf5_kinit_requires}
 
-BuildRequires:  libksysguard-devel >= %{majmin_ver}
+BuildRequires: cmake(KF5NetworkManagerQt)
+
+BuildRequires: cmake(Qt5Widgets)
 
 BuildRequires:  libnl3-devel
 BuildRequires:  lm_sensors-devel
-BuildRequires:  desktop-file-utils
+BuildRequires:  pkgconfig(libpcap)
 
 Requires:       ksysguardd = %{version}-%{release}
 Requires:       ksystemstats = %{version}-%{release}
 
-# Deal with the split of libraries and ksystemstats
-Conflicts:      %{name} < 5.21.1-2
-Obsoletes:      %{name} < 5.21.1-2
-
 %description
 %{summary}.
 
-%package libs
-Summary: KDE Process Manager libraries
+%package plugins
+Summary: KDE Process Manager Plugins
 # Deal with the split of libraries and ksystemstats
 Conflicts: %{name} < 5.21.1-2
 Obsoletes: %{name} < 5.21.1-2
 
-%description libs
+%description plugins
 %{summary}.
 
-%package -n    ksysguardd
+%package -n   ksysguardd
 Summary: Performance monitor daemon
 
 %description -n ksysguardd
 %{summary}.
 
-%package -n    ksystemstats
+%package -n  ksystemstats
 Summary: System statistics daemon
-Requires: %{name}-libs%{?_isa} = %{version}-%{release}
+Requires: %{name}-plugins%{?_isa} = %{version}-%{release}
 Requires: ksysguardd = %{version}-%{release}
-# Deal with the split of libraries and ksystemstats
-Conflicts: %{name} < 5.21.1-2
-Obsoletes: %{name} < 5.21.1-2
 
 %description -n ksystemstats
 %{summary}.
@@ -82,49 +83,60 @@ Obsoletes: %{name} < 5.21.1-2
 
 
 %build
-%{cmake_kf5}
+%cmake_kf5
+
 %cmake_build
 
 
 %install
 %cmake_install
+
 %find_lang ksysguard5 --with-html --with-qt --all-name
 
 
 %check
-desktop-file-validate %{buildroot}%{_datadir}/applications/org.kde.ksysguard.desktop
+# appdata validation provisional, for now, until it can be fixed properly -- rex
+#./org.kde.ksysguard.appdata.xml: FAILED:
+#• tag-invalid           : <icon> not allowed in desktop appdata
+appstream-util validate-relax --nonet %{buildroot}%{_kf5_metainfodir}/org.kde.ksysguard.appdata.xml ||:
+desktop-file-validate %{buildroot}%{_kf5_datadir}/applications/org.kde.ksysguard.desktop
+
 
 %files -f ksysguard5.lang
 %license COPYING*
 %doc README
-%{_bindir}/ksysguard
-%{_datadir}/ksysguard
-%{_datadir}/metainfo/org.kde.ksysguard.appdata.xml
-%{_datadir}/knsrcfiles/ksysguard.knsrc
-%{_datadir}/applications/org.kde.ksysguard.desktop
-%{_datadir}/icons/hicolor/*/apps/*
+%{_kf5_bindir}/ksysguard
+%{_kf5_libdir}/libkdeinit5_ksysguard.so
+%{_kf5_datadir}/ksysguard
+%{_kf5_metainfodir}/org.kde.ksysguard.appdata.xml
+%{_kf5_datadir}/knsrcfiles/ksysguard.knsrc
+%{_kf5_datadir}/applications/org.kde.ksysguard.desktop
+%{_kf5_datadir}/icons/hicolor/*/apps/*
 %{_kf5_datadir}/knotifications5/ksysguard.notifyrc
 %{_kf5_datadir}/kxmlgui5/ksysguard/
 
-%files libs
+%files plugins
 %license COPYING
-%{_kf5_libdir}/libkdeinit5_ksysguard.so
 %{_kf5_libdir}/libksgrdbackend.so
-%{_qt5_plugindir}/ksysguard/*.so
-%{_qt5_plugindir}/ksysguard/process/ksysguard_plugin_nvidia.so
+%{_qt5_plugindir}/ksysguard/
 
 %files -n ksysguardd
 %license COPYING
-%{_bindir}/ksysguardd
 %config %{_sysconfdir}/ksysguarddrc
+%{_kf5_bindir}/ksysguardd
 
 %files -n ksystemstats
 %license COPYING
-%{_bindir}/ksystemstats
-%{_bindir}/kstatsviewer
+%{_kf5_bindir}/ksystemstats
+%{_kf5_bindir}/kstatsviewer
 %{_datadir}/dbus-1/services/org.kde.ksystemstats.service
 
+
 %changelog
+* Mon Mar 01 2021 Rex Dieter <rdieter@fedoraproject.org> - 5.21.1-3
+- rename -libs to -plugins (avoid conflicts with legacy ksysguard-libs)
+- .spec cleanup, use cmake-style deps
+
 * Sun Feb 28 2021 Neal Gompa <ngompa13@gmail.com> - 5.21.1-2
 - Split out ksystemstats for plasma-systemmonitor (rhbz#1930514)