From 9e33cfa358e4a92de4a00d6a927d44115a953643a0de94a8baef4a1b889fe72d Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Sat, 15 May 2021 16:17:04 +0000 Subject: [PATCH 1/2] Plasma 5.22 Beta, tested a bit more. Now with cmake >= 3.16 and duplicates in .changes removed (now using git log a..b instead of a...b) OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/libksysguard5?expand=0&rev=302 --- libksysguard-5.21.5.tar.xz | 3 - libksysguard-5.21.5.tar.xz.sig | 11 ---- libksysguard-5.21.90.tar.xz | 3 + libksysguard-5.21.90.tar.xz.sig | 11 ++++ libksysguard5.changes | 9 +++ libksysguard5.spec | 102 +++++++++++++++++++++++++------- 6 files changed, 103 insertions(+), 36 deletions(-) delete mode 100644 libksysguard-5.21.5.tar.xz delete mode 100644 libksysguard-5.21.5.tar.xz.sig create mode 100644 libksysguard-5.21.90.tar.xz create mode 100644 libksysguard-5.21.90.tar.xz.sig diff --git a/libksysguard-5.21.5.tar.xz b/libksysguard-5.21.5.tar.xz deleted file mode 100644 index 5941d73..0000000 --- a/libksysguard-5.21.5.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5ff8c687a9d245d28ec4b92c019d2234cd931796c619ebb096de6e49cd18ebe8 -size 706172 diff --git a/libksysguard-5.21.5.tar.xz.sig b/libksysguard-5.21.5.tar.xz.sig deleted file mode 100644 index 52e84a7..0000000 --- a/libksysguard-5.21.5.tar.xz.sig +++ /dev/null @@ -1,11 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQEzBAABCAAdFiEEs8s2ZVJUC+Bu6a2XEZaMRJKMrvwFAmCRPO8ACgkQEZaMRJKM -rvy8ZAf/QsoIKFlSe0iBmy14ykrrqKFY6aIbu8V+VqQvVQ9Rz+T55qAZOu82dREo -BHD0exhDSn9VRy5+yU8nqWy3FXq/BDhTxFaRdEkvYB193uRFqtZIi43bds/nMc/c -OT/ntdWlwcGQQOzNdteoegeM/gcb9s0r7NVBe0hBLnhp2+ueDuJu6DorYqqjKHkT -QvBU5Jbi3eVT3txcNYnJd8LYMQx+XaEkwpZGTA508PMKaOqRi8PmB76iU5qptX5o -f57MhsWWVxCsxr/Kp1OingFyY8d1R3n7754rjOXmXnJekj+WPJUdoRDqwtcKCrf1 -zsQRnTfFE0F8qag6naGwWQpKP9PHWw== -=eG0x ------END PGP SIGNATURE----- diff --git a/libksysguard-5.21.90.tar.xz b/libksysguard-5.21.90.tar.xz new file mode 100644 index 0000000..e927a75 --- /dev/null +++ b/libksysguard-5.21.90.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9dd73ff7389e03b86cb15bede0dff81e68e2d7844478daa504fb60e2165a9273 +size 736412 diff --git a/libksysguard-5.21.90.tar.xz.sig b/libksysguard-5.21.90.tar.xz.sig new file mode 100644 index 0000000..abf502d --- /dev/null +++ b/libksysguard-5.21.90.tar.xz.sig @@ -0,0 +1,11 @@ +-----BEGIN PGP SIGNATURE----- + +iQEzBAABCgAdFiEELR1bBYg1d4fenuIl7JTRj38FmX4FAmCdJlAACgkQ7JTRj38F +mX4qEwf+OjOEoLkzvMTx2KARE0XLmq+JKj3grh7bZa2eIHPGIe+WebgK8akEXvCC +wBJe4g+sGJZq+8Bp7FVpuE0kBDqpg8udptR+x4WDei8/tepdPJhKVQtnbBqbfP5L +Sa/VAwID5Bw3CGUBXbJtY24zMiFY1QHnt1lFhAWX/hSMoRwMbRtUOtujuFn2SX1C +8hVT7jEBI1RKCmzCbnU3d0IL+rUcJUpRPvXdaDKiuUB7Att439y41v1uplJ7w3ZT +KP6liUGMpF+hvuGqHkwECpDM5JSjYNEqym50Tl3CxG2qU5VMLE/DroEq7CqtEDWu +yg697TnaRFIH+aQKw+thAZs/JiWI1w== +=wg5K +-----END PGP SIGNATURE----- diff --git a/libksysguard5.changes b/libksysguard5.changes index 446df1b..7e85781 100644 --- a/libksysguard5.changes +++ b/libksysguard5.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Thu May 13 18:15:40 UTC 2021 - Fabian Vogt + +- Update to 5.21.90 + * New feature release + * For more details please see: + * https://kde.org/announcements/plasma/5/5.21.90 +- Too many changes to list here + ------------------------------------------------------------------- Tue May 4 14:15:40 UTC 2021 - Fabian Vogt diff --git a/libksysguard5.spec b/libksysguard5.spec index b154d88..78574f1 100644 --- a/libksysguard5.spec +++ b/libksysguard5.spec @@ -17,16 +17,21 @@ %bcond_without lang +%global systemstatssover 1 Name: libksysguard5 -Version: 5.21.5 +Version: 5.21.90 Release: 0 +# Full Plasma 5 version (e.g. 5.8.95) +%{!?_plasma5_bugfix: %define _plasma5_bugfix %{version}} +# Latest ABI-stable Plasma (e.g. 5.8 in KF5, but 5.8.95 in KUF) +%{!?_plasma5_version: %define _plasma5_version %(echo %{_plasma5_bugfix} | awk -F. '{print $1"."$2}')} Summary: Task management and system monitoring library License: GPL-2.0-or-later Group: Development/Libraries/C and C++ URL: http://www.kde.org -Source: https://download.kde.org/stable/plasma/%{version}/libksysguard-%{version}.tar.xz +Source: https://download.kde.org/unstable/plasma/%{version}/libksysguard-%{version}.tar.xz %if %{with lang} -Source1: https://download.kde.org/stable/plasma/%{version}/libksysguard-%{version}.tar.xz.sig +Source1: https://download.kde.org/unstable/plasma/%{version}/libksysguard-%{version}.tar.xz.sig Source2: plasma.keyring %endif BuildRequires: extra-cmake-modules >= 1.2.0 @@ -51,15 +56,20 @@ BuildRequires: cmake(KF5Plasma) BuildRequires: cmake(KF5Service) BuildRequires: cmake(KF5WidgetsAddons) BuildRequires: cmake(KF5WindowSystem) -BuildRequires: cmake(Qt5DBus) >= 5.4.0 -BuildRequires: cmake(Qt5Network) >= 5.4.0 +BuildRequires: cmake(Qt5DBus) >= 5.15.0 +BuildRequires: cmake(Qt5Network) %ifnarch ppc ppc64 ppc64le s390 s390x riscv64 -BuildRequires: cmake(Qt5WebChannel) >= 5.4.0 -BuildRequires: cmake(Qt5WebEngineWidgets) >= 5.4.0 +BuildRequires: cmake(Qt5WebChannel) +BuildRequires: cmake(Qt5WebEngineWidgets) %endif -BuildRequires: cmake(Qt5UiPlugin) >= 5.14.0 -BuildRequires: cmake(Qt5Widgets) >= 5.4.0 -BuildRequires: cmake(Qt5X11Extras) >= 5.4.0 +BuildRequires: cmake(Qt5UiPlugin) +BuildRequires: cmake(Qt5Widgets) +BuildRequires: cmake(Qt5X11Extras) +# Has no effect, we use set_permissions +#BuildRequires: libcap-progs +# No pkgconfig(pcap) in Leap <= 15.3 yet +BuildRequires: libpcap-devel +BuildRequires: pkgconfig(libnl-3.0) BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(xres) BuildRequires: pkgconfig(zlib) @@ -69,30 +79,53 @@ Recommends: %{name}-imports %description Task management and system monitoring library. +%package -n libKSysGuardSystemStats%{systemstatssover} +Summary: Library for system monitoring plugins for KSystemStats +Group: System/Libraries +Requires: ksysguardsystemstats-data >= %{version} + +%description -n libKSysGuardSystemStats%{systemstatssover} +This library is used by plugins for KSystemStats, a system monitoring daemon. + +%package -n ksysguardsystemstats-data +Summary: Data needed by libKSysGuardSystemStats +Group: System/Libraries + +%description -n ksysguardsystemstats-data +Contains the unversioned D-Bus interface definition for KSystemStats plugins. + %package devel Summary: Task management and system monitoring library -- devel files Group: Development/Libraries/C and C++ Requires: %{name} = %{version} +Requires: libKSysGuardSystemStats%{systemstatssover} = %{version} Requires: cmake(KF5Config) Requires: cmake(KF5I18n) Requires: cmake(KF5IconThemes) -Requires: cmake(Qt5Core) >= 5.4.0 -Requires: cmake(Qt5Network) >= 5.4.0 -Requires: cmake(Qt5Widgets) >= 5.4.0 +Requires: cmake(Qt5Core) >= 5.15.0 +Requires: cmake(Qt5DBus) +Requires: cmake(Qt5Network) +Requires: cmake(Qt5Widgets) Conflicts: kdebase4-workspace-devel %description devel Task management and system monitoring library. This package contains development files. -%package helper -Summary: Task management and system monitoring library -- helper files +%package plugins +Summary: Task management and system monitoring library -- plugins Group: Development/Libraries/C and C++ Conflicts: kdebase4-workspace < 5.3.0 +Requires: %{name} = %{version} +Provides: %{name}-helper = %{version} +Obsoletes: %{name}-helper <= %{version} +Conflicts: ksysguard5 < 5.21.80 +# For post and verifyscript +Requires(post): permissions +Requires(verify): permissions -%description helper -Task management and system monitoring library. This package contains helper files -for actions that require elevated privileges. +%description plugins +Task management and system monitoring library. This package contains plugins. %package imports Summary: Task management and system monitoring library -- QML bindings @@ -121,9 +154,16 @@ QML applications. %kf5_find_lang %endif -%post -p /sbin/ldconfig +%post plugins +%set_permissions %{_kf5_libdir}/libexec/ksysguard/ksgrd_network_helper +%verifyscript plugins +%verify_permissions -e %{_kf5_libdir}/libexec/ksysguard/ksgrd_network_helper + +%post -p /sbin/ldconfig %postun -p /sbin/ldconfig +%post -n libKSysGuardSystemStats%{systemstatssover} -p /sbin/ldconfig +%postun -n libKSysGuardSystemStats%{systemstatssover} -p /sbin/ldconfig %files %license COPYING* @@ -143,12 +183,29 @@ QML applications. %{_kf5_plugindir}/kpackage/packagestructure/sensorface_packagestructure.so %{_kf5_sharedir}/ksysguard/ -%files helper +%files -n libKSysGuardSystemStats%{systemstatssover} %license COPYING* -%{_kf5_dbuspolicydir}/org.kde.ksysguard.processlisthelper.conf -%{_kf5_libdir}/libexec/ +%{_kf5_libdir}/libKSysGuardSystemStats.so.%{systemstatssover} +%{_kf5_libdir}/libKSysGuardSystemStats.so.%{_plasma5_bugfix} + +%files -n ksysguardsystemstats-data +%license COPYING* +%{_kf5_sharedir}/dbus-1/interfaces/org.kde.ksystemstats.xml + +%files plugins +%license COPYING* +%dir %{_kf5_plugindir}/ksysguard/ +%dir %{_kf5_plugindir}/ksysguard/process +%{_kf5_plugindir}/ksysguard/process/ksysguard_plugin_network.so +%{_kf5_plugindir}/ksysguard/process/ksysguard_plugin_nvidia.so %{_kf5_sharedir}/dbus-1/system-services/org.kde.ksysguard.processlisthelper.service %{_kf5_sharedir}/polkit-1/actions/org.kde.ksysguard.processlisthelper.policy +%{_kf5_dbuspolicydir}/org.kde.ksysguard.processlisthelper.conf +%dir %{_kf5_libdir}/libexec/ +%dir %{_kf5_libdir}/libexec/kauth/ +%{_kf5_libdir}/libexec/kauth/ksysguardprocesslist_helper +%dir %{_kf5_libdir}/libexec/ksysguard/ +%{_kf5_libdir}/libexec/ksysguard/ksgrd_network_helper %files imports %license COPYING* @@ -177,6 +234,7 @@ QML applications. %{_kf5_plugindir}/designer/ksignalplotter5widgets.so %{_kf5_plugindir}/designer/ksysguard5widgets.so %{_kf5_plugindir}/designer/ksysguardlsof5widgets.so +%{_kf5_libdir}/libKSysGuardSystemStats.so %{_kf5_libdir}/libKSysGuardFormatter.so %{_kf5_libdir}/libKSysGuardSensorFaces.so %{_kf5_libdir}/libKSysGuardSensors.so From 43f9d3e1cafe09116937e7e8e0aaf200748c0b29af07e91e8b9c1d73a1839060 Mon Sep 17 00:00:00 2001 From: Wolfgang Bauer Date: Fri, 4 Jun 2021 12:42:09 +0000 Subject: [PATCH 2/2] Plasma 5.22.0, disable publishing before accepting. ksystemstats5 link fixed, cherry-picked revert removed from .changes OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/libksysguard5?expand=0&rev=303 --- libksysguard-5.21.90.tar.xz | 3 --- libksysguard-5.21.90.tar.xz.sig | 11 ----------- libksysguard-5.22.0.tar.xz | 3 +++ libksysguard-5.22.0.tar.xz.sig | 11 +++++++++++ libksysguard5.changes | 12 ++++++++++++ libksysguard5.spec | 6 +++--- 6 files changed, 29 insertions(+), 17 deletions(-) delete mode 100644 libksysguard-5.21.90.tar.xz delete mode 100644 libksysguard-5.21.90.tar.xz.sig create mode 100644 libksysguard-5.22.0.tar.xz create mode 100644 libksysguard-5.22.0.tar.xz.sig diff --git a/libksysguard-5.21.90.tar.xz b/libksysguard-5.21.90.tar.xz deleted file mode 100644 index e927a75..0000000 --- a/libksysguard-5.21.90.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9dd73ff7389e03b86cb15bede0dff81e68e2d7844478daa504fb60e2165a9273 -size 736412 diff --git a/libksysguard-5.21.90.tar.xz.sig b/libksysguard-5.21.90.tar.xz.sig deleted file mode 100644 index abf502d..0000000 --- a/libksysguard-5.21.90.tar.xz.sig +++ /dev/null @@ -1,11 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQEzBAABCgAdFiEELR1bBYg1d4fenuIl7JTRj38FmX4FAmCdJlAACgkQ7JTRj38F -mX4qEwf+OjOEoLkzvMTx2KARE0XLmq+JKj3grh7bZa2eIHPGIe+WebgK8akEXvCC -wBJe4g+sGJZq+8Bp7FVpuE0kBDqpg8udptR+x4WDei8/tepdPJhKVQtnbBqbfP5L -Sa/VAwID5Bw3CGUBXbJtY24zMiFY1QHnt1lFhAWX/hSMoRwMbRtUOtujuFn2SX1C -8hVT7jEBI1RKCmzCbnU3d0IL+rUcJUpRPvXdaDKiuUB7Att439y41v1uplJ7w3ZT -KP6liUGMpF+hvuGqHkwECpDM5JSjYNEqym50Tl3CxG2qU5VMLE/DroEq7CqtEDWu -yg697TnaRFIH+aQKw+thAZs/JiWI1w== -=wg5K ------END PGP SIGNATURE----- diff --git a/libksysguard-5.22.0.tar.xz b/libksysguard-5.22.0.tar.xz new file mode 100644 index 0000000..8f94fed --- /dev/null +++ b/libksysguard-5.22.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a2d3973aaf7d5c4a1cb6dd463ec8183dd4e9a6c6b851df4b8824f8dd562607a9 +size 737056 diff --git a/libksysguard-5.22.0.tar.xz.sig b/libksysguard-5.22.0.tar.xz.sig new file mode 100644 index 0000000..be5eabe --- /dev/null +++ b/libksysguard-5.22.0.tar.xz.sig @@ -0,0 +1,11 @@ +-----BEGIN PGP SIGNATURE----- + +iQEzBAABCgAdFiEELR1bBYg1d4fenuIl7JTRj38FmX4FAmC44uEACgkQ7JTRj38F +mX6HCQf9Htc0ZApSoqgo8jUghlD4KDu0AsWSNx1mUqlA2H6677OFJrZx4g2shRc4 +akW7Ludu+3BLhXdMiJOnUG9JFdi0jtNLq2fzoKv6S8Pf5BhhLL2obDrGxXwUqGy0 +B6YK5fJ9qTf8WaB0x+10zGpug2tOHfMK5QlUEIR/uWDayGMErEAsYwUVXsNM3Mir +9khGHVPN74AIfOWYLI0YISGItEjG2Ih8GAo5gFExJA1os8zHkBuTFK5cxcfnSc+6 +KcXauHJr9qLL3WJxI6+LjeUvIz4tmtwEfhWIjzJkIYDbv3woflr/a8zIljQroesy +VkOWvdcbRDA5TTnO2djHgeFOnFXtuA== +=jlj4 +-----END PGP SIGNATURE----- diff --git a/libksysguard5.changes b/libksysguard5.changes index 7e85781..ec4b8ec 100644 --- a/libksysguard5.changes +++ b/libksysguard5.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Thu Jun 3 13:06:15 UTC 2021 - Fabian Vogt + +- Update to 5.22.0 + * New bugfix release + * For more details please see: + * https://kde.org/announcements/plasma/5/5.22.0 +- Changes since 5.21.90: + * Remove sensors from AggregateSensor which are no longer part of our container (kde#436300) + * Do not crash when a filesystem error is encountered (kde#437607) + * Use translated strings for process state + ------------------------------------------------------------------- Thu May 13 18:15:40 UTC 2021 - Fabian Vogt diff --git a/libksysguard5.spec b/libksysguard5.spec index 78574f1..a8baddc 100644 --- a/libksysguard5.spec +++ b/libksysguard5.spec @@ -19,7 +19,7 @@ %bcond_without lang %global systemstatssover 1 Name: libksysguard5 -Version: 5.21.90 +Version: 5.22.0 Release: 0 # Full Plasma 5 version (e.g. 5.8.95) %{!?_plasma5_bugfix: %define _plasma5_bugfix %{version}} @@ -29,9 +29,9 @@ Summary: Task management and system monitoring library License: GPL-2.0-or-later Group: Development/Libraries/C and C++ URL: http://www.kde.org -Source: https://download.kde.org/unstable/plasma/%{version}/libksysguard-%{version}.tar.xz +Source: libksysguard-%{version}.tar.xz %if %{with lang} -Source1: https://download.kde.org/unstable/plasma/%{version}/libksysguard-%{version}.tar.xz.sig +Source1: libksysguard-%{version}.tar.xz.sig Source2: plasma.keyring %endif BuildRequires: extra-cmake-modules >= 1.2.0