From 600fc4d98cac777d5ed88f615c6af58346c6e15f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 10:01:45 +0000 Subject: [PATCH 01/10] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 27e8ed8d0cb1e720d645d261a78c552a704d0bc0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Wed, 4 Sep 2024 22:54:01 +0200 Subject: [PATCH 02/10] convert license to SPDX This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4 --- xfce4-systemload-plugin.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/xfce4-systemload-plugin.spec b/xfce4-systemload-plugin.spec index 11b7733..6eb1e78 100644 --- a/xfce4-systemload-plugin.spec +++ b/xfce4-systemload-plugin.spec @@ -8,7 +8,8 @@ Version: 1.3.1 Release: %autorelease Summary: Systemload monitor for the Xfce panel -License: BSD +# Automatically converted from old format: BSD - review is highly recommended. +License: LicenseRef-Callaway-BSD URL: http://goodies.xfce.org/projects/panel-plugins/%{name} #VCS: git:git://git.xfce.org/panel-plugins/xfce4-systemload-plugin Source0: http://archive.xfce.org/src/panel-plugins/%{name}/%{minorversion}/%{name}-%{version}.tar.bz2 From 59e7d319021d9bf48c54155da3648506a4a835a5 Mon Sep 17 00:00:00 2001 From: Mukundan Ragavan Date: Sun, 22 Dec 2024 16:24:42 -0600 Subject: [PATCH 03/10] rebuild for xfce-4.20 From 45acfdf531f045dfb5bad9cf7d62b386891ddb8d Mon Sep 17 00:00:00 2001 From: Mukundan Ragavan Date: Sun, 22 Dec 2024 16:52:05 -0600 Subject: [PATCH 04/10] Exclude x86 --- xfce4-systemload-plugin.spec | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/xfce4-systemload-plugin.spec b/xfce4-systemload-plugin.spec index 6eb1e78..2e5619a 100644 --- a/xfce4-systemload-plugin.spec +++ b/xfce4-systemload-plugin.spec @@ -14,6 +14,12 @@ URL: http://goodies.xfce.org/projects/panel-plugins/%{name} #VCS: git:git://git.xfce.org/panel-plugins/xfce4-systemload-plugin Source0: http://archive.xfce.org/src/panel-plugins/%{name}/%{minorversion}/%{name}-%{version}.tar.bz2 +%if 0%{?fedora} >= 39 +ExcludeArch: %{ix86} +%endif + + + BuildRequires: make BuildRequires: gcc-c++ BuildRequires: libxfce4ui-devel >= %{xfceversion} From 23e0560ab85237c1fd3c68def281f5010db9f177 Mon Sep 17 00:00:00 2001 From: Mukundan Ragavan Date: Wed, 25 Dec 2024 08:47:36 -0600 Subject: [PATCH 05/10] Update to v1.3.3 --- .gitignore | 1 + sources | 2 +- xfce4-systemload-plugin.spec | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 3236a83..d7faf27 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ xfce4-systemload-plugin-0.4.2.tar.bz2 /xfce4-systemload-plugin-1.2.4.tar.bz2 /xfce4-systemload-plugin-1.3.0.tar.bz2 /xfce4-systemload-plugin-1.3.1.tar.bz2 +/xfce4-systemload-plugin-1.3.3.tar.bz2 diff --git a/sources b/sources index 83c3871..e5dd37d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xfce4-systemload-plugin-1.3.1.tar.bz2) = 2b2285c5960a5728dd7818f90605848e462fe5fef8643ff5be64b7087225399395ace5ec8013f6795d410b0acf79ec77c14e2ed0e56007cfe6f13133ba708876 +SHA512 (xfce4-systemload-plugin-1.3.3.tar.bz2) = 5dd74af41df01af1cf064effd33e13f26f530ffe0a043cce7b6519187393099a4da7e8c8e035c50796d1d19f09e38d2d75966e1e4fa5d1db8cb44d0e020a802c diff --git a/xfce4-systemload-plugin.spec b/xfce4-systemload-plugin.spec index 2e5619a..d4b68be 100644 --- a/xfce4-systemload-plugin.spec +++ b/xfce4-systemload-plugin.spec @@ -4,7 +4,7 @@ %global xfceversion 4.16 Name: xfce4-systemload-plugin -Version: 1.3.1 +Version: 1.3.3 Release: %autorelease Summary: Systemload monitor for the Xfce panel From 2318d78c787613e03a925df4e728d156ccbae177 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 15:47:21 +0000 Subject: [PATCH 06/10] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From e47efa871047657b49b89935249fc589dccc3090 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 20:48:51 +0000 Subject: [PATCH 07/10] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 7afad317fca93cb29c018e363ab09cc16a568077 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 17 Jan 2026 20:38:53 +0000 Subject: [PATCH 08/10] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild From 600a4f0f98bdd3a5f2f432e3106510e253dacaf5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jul 2026 09:12:00 +0000 Subject: [PATCH 09/10] Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild From 69b9b6921ea859fc6e2833412feebe1f9f79f9f0 Mon Sep 17 00:00:00 2001 From: Filipe Rosset Date: Fri, 31 Jul 2026 21:26:33 -0300 Subject: [PATCH 10/10] Update to 1.4.0 + switch to meson build system + spec cleanup --- .gitignore | 15 ++--------- sources | 2 +- xfce4-systemload-plugin.spec | 52 +++++++++++++++++++----------------- 3 files changed, 30 insertions(+), 39 deletions(-) diff --git a/.gitignore b/.gitignore index d7faf27..9fd9b88 100644 --- a/.gitignore +++ b/.gitignore @@ -1,13 +1,2 @@ -xfce4-systemload-plugin-0.4.2.tar.bz2 -/xfce4-systemload-plugin-1.0.0.tar.bz2 -/xfce4-systemload-plugin-1.1.0.tar.bz2 -/xfce4-systemload-plugin-1.1.1.tar.bz2 -/xfce4-systemload-plugin-1.1.2.tar.bz2 -/xfce4-systemload-plugin-1.2.0.tar.bz2 -/xfce4-systemload-plugin-1.2.1.tar.bz2 -/xfce4-systemload-plugin-1.2.2.tar.bz2 -/xfce4-systemload-plugin-1.2.3.tar.bz2 -/xfce4-systemload-plugin-1.2.4.tar.bz2 -/xfce4-systemload-plugin-1.3.0.tar.bz2 -/xfce4-systemload-plugin-1.3.1.tar.bz2 -/xfce4-systemload-plugin-1.3.3.tar.bz2 +/xfce4-systemload-plugin-*.tar.bz2 +/xfce4-systemload-plugin-*.tar.xz diff --git a/sources b/sources index e5dd37d..897b246 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xfce4-systemload-plugin-1.3.3.tar.bz2) = 5dd74af41df01af1cf064effd33e13f26f530ffe0a043cce7b6519187393099a4da7e8c8e035c50796d1d19f09e38d2d75966e1e4fa5d1db8cb44d0e020a802c +SHA512 (xfce4-systemload-plugin-1.4.0.tar.xz) = ebb444eb91f032eb64f5b38e14d1a6e9e23ac0c38f41705d389e48878540663556435d26997de88a3116351bd72db8b02718cdd525961f8e35c62a3980438e68 diff --git a/xfce4-systemload-plugin.spec b/xfce4-systemload-plugin.spec index d4b68be..c96988e 100644 --- a/xfce4-systemload-plugin.spec +++ b/xfce4-systemload-plugin.spec @@ -1,32 +1,31 @@ # Review: https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=173668 +# VCS https://gitlab.xfce.org/panel-plugins/xfce4-systemload-plugin -%global minorversion 1.3 -%global xfceversion 4.16 +%global minorversion 1.4 +%global xfceversion 4.20 Name: xfce4-systemload-plugin -Version: 1.3.3 +Version: 1.4.0 Release: %autorelease Summary: Systemload monitor for the Xfce panel -# Automatically converted from old format: BSD - review is highly recommended. -License: LicenseRef-Callaway-BSD -URL: http://goodies.xfce.org/projects/panel-plugins/%{name} -#VCS: git:git://git.xfce.org/panel-plugins/xfce4-systemload-plugin -Source0: http://archive.xfce.org/src/panel-plugins/%{name}/%{minorversion}/%{name}-%{version}.tar.bz2 +License: BSD-2-Clause +URL: https://docs.xfce.org/panel-plugins/xfce4-systemload-plugin +Source0: https://archive.xfce.org/src/panel-plugins/%{name}/%{minorversion}/%{name}-%{version}.tar.xz %if 0%{?fedora} >= 39 ExcludeArch: %{ix86} %endif - - -BuildRequires: make BuildRequires: gcc-c++ -BuildRequires: libxfce4ui-devel >= %{xfceversion} -BuildRequires: xfce4-panel-devel >= %{xfceversion} -BuildRequires: upower-devel BuildRequires: gettext -BuildRequires: intltool +BuildRequires: libgtop2-devel +BuildRequires: libxfce4ui-devel >= %{xfceversion} +BuildRequires: libxfce4util-devel +BuildRequires: meson +BuildRequires: upower-devel +BuildRequires: xfce4-panel-devel >= %{xfceversion} +BuildRequires: xfconf-devel Requires: xfce4-panel >= %{xfceversion} @@ -36,29 +35,32 @@ load, the memory in use, the swap space and the system uptime. %prep -%setup -q +%autosetup %build -%configure --disable-static -%make_build +%meson +%meson_build + + +%check +%meson_test %install -%make_install +%meson_install -# remove la file -find %{buildroot} -name '*.la' -exec rm -f {} ';' - -# FIXME: make sure debuginfo is generated properly (#795107) -chmod -c +x %{buildroot}%{_libdir}/xfce4/panel/plugins/*.so +# Rename non-standard hye locale to hy +if [ -d %{buildroot}%{_datadir}/locale/hye ]; then + mv %{buildroot}%{_datadir}/locale/hye %{buildroot}%{_datadir}/locale/hy +fi %find_lang %{name} %files -f %{name}.lang %license COPYING -%doc AUTHORS ChangeLog NEWS +%doc AUTHORS NEWS README.md %{_libdir}/xfce4/panel/plugins/*.so %{_datadir}/xfce4/panel/plugins/*.desktop %{_datadir}/icons/hicolor/*/apps/org.xfce.panel.systemload.*