From 31daa3efce5826d264300a88eaa977928dd701d0 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Fri, 13 Dec 2019 09:05:54 -0600 Subject: [PATCH 1/5] "Adding package.cfg file" --- package.cfg | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 package.cfg diff --git a/package.cfg b/package.cfg new file mode 100644 index 0000000..66ea79d --- /dev/null +++ b/package.cfg @@ -0,0 +1,2 @@ +[koji] +targets = epel8 epel8-playground \ No newline at end of file From e30dc925fd9000acc67e09d67bf2f704294c8f73 Mon Sep 17 00:00:00 2001 From: Mukundan Ragavan Date: Sat, 14 Dec 2019 16:22:17 -0500 Subject: [PATCH 2/5] Exclude s390x and aarch64 until we have upower --- xfce4-systemload-plugin.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/xfce4-systemload-plugin.spec b/xfce4-systemload-plugin.spec index dd68d33..d4468bf 100644 --- a/xfce4-systemload-plugin.spec +++ b/xfce4-systemload-plugin.spec @@ -9,7 +9,7 @@ Name: xfce4-systemload-plugin Version: 1.2.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Systemload monitor for the Xfce panel License: BSD @@ -24,6 +24,8 @@ BuildRequires: upower-devel BuildRequires: gettext BuildRequires: intltool +ExcludeArch: aarch64 s390x + Requires: xfce4-panel >= %{xfceversion} %description @@ -59,6 +61,9 @@ chmod -c +x %{buildroot}%{_libdir}/xfce4/panel/plugins/*.so %{_datadir}/xfce4/panel/plugins/*.desktop %changelog +* Sat Dec 14 2019 Mukundan Ragavan - 1.6.5-2 +- Exclude s390x and aarch64 until we have upower + * Tue Aug 13 2019 Mukundan Ragavan - 1.2.3-1 - Update to 1.2.3 From 8d1c5afb6106a066a2fe47ab0eae7455cf5ff7ba Mon Sep 17 00:00:00 2001 From: Troy Dawson Date: Thu, 24 Sep 2020 16:04:48 +0000 Subject: [PATCH 3/5] remove package.cfg per new epel-playground policy --- package.cfg | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 package.cfg diff --git a/package.cfg b/package.cfg deleted file mode 100644 index 66ea79d..0000000 --- a/package.cfg +++ /dev/null @@ -1,2 +0,0 @@ -[koji] -targets = epel8 epel8-playground \ No newline at end of file From c9b1039ac1787d88ca5ae9c793e489d30943d376 Mon Sep 17 00:00:00 2001 From: Mukundan Ragavan Date: Mon, 2 Aug 2021 12:28:39 -0400 Subject: [PATCH 4/5] Update to 1.3.1 --- .gitignore | 1 + sources | 2 +- xfce4-systemload-plugin.spec | 17 ++++++++--------- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index 8870cf7..dc26148 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ xfce4-systemload-plugin-0.4.2.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.3.1.tar.bz2 diff --git a/sources b/sources index d07c59a..83c3871 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xfce4-systemload-plugin-1.2.3.tar.bz2) = 98985b2250bfff3ae8314f5671ec4438f4c53702cf9e1b76563cdc5d1b4b62174d6cfa559603294c1fc8fbbd5e15a833cc112c75b106a85b1e11788ded4da538 +SHA512 (xfce4-systemload-plugin-1.3.1.tar.bz2) = 2b2285c5960a5728dd7818f90605848e462fe5fef8643ff5be64b7087225399395ace5ec8013f6795d410b0acf79ec77c14e2ed0e56007cfe6f13133ba708876 diff --git a/xfce4-systemload-plugin.spec b/xfce4-systemload-plugin.spec index d4468bf..78039ce 100644 --- a/xfce4-systemload-plugin.spec +++ b/xfce4-systemload-plugin.spec @@ -1,15 +1,11 @@ # Review: https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=173668 -%global minorversion 1.2 -%if 0%{?fedora} >= 29 - %global xfceversion 4.14 -%else - %global xfceversion 4.12 -%endif +%global minorversion 1.3 +%global xfceversion 4.16 Name: xfce4-systemload-plugin -Version: 1.2.3 -Release: 2%{?dist} +Version: 1.3.1 +Release: 1%{?dist} Summary: Systemload monitor for the Xfce panel License: BSD @@ -61,7 +57,10 @@ chmod -c +x %{buildroot}%{_libdir}/xfce4/panel/plugins/*.so %{_datadir}/xfce4/panel/plugins/*.desktop %changelog -* Sat Dec 14 2019 Mukundan Ragavan - 1.6.5-2 +* Mon Aug 02 2021 Mukundan Ragagan - 1.3.1-1 +- Update to 1.3.1 + +* Sat Dec 14 2019 Mukundan Ragavan - 1.2.3-2 - Exclude s390x and aarch64 until we have upower * Tue Aug 13 2019 Mukundan Ragavan - 1.2.3-1 From a65c47491a164d796f8a75e28c92811025b29de7 Mon Sep 17 00:00:00 2001 From: Mukundan Ragavan Date: Mon, 2 Aug 2021 14:44:13 -0400 Subject: [PATCH 5/5] define G_GNUC_FALLTHROUGH for glib < 2.60 --- define_G_GNUC_FALLTHROUGH.patch | 19 +++++++++++++++++++ xfce4-systemload-plugin.spec | 14 ++++++++++---- 2 files changed, 29 insertions(+), 4 deletions(-) create mode 100644 define_G_GNUC_FALLTHROUGH.patch diff --git a/define_G_GNUC_FALLTHROUGH.patch b/define_G_GNUC_FALLTHROUGH.patch new file mode 100644 index 0000000..cc32a91 --- /dev/null +++ b/define_G_GNUC_FALLTHROUGH.patch @@ -0,0 +1,19 @@ +--- panel-plugin/cpu.h.orig 2021-08-02 14:16:48.329366967 -0400 ++++ panel-plugin/cpu.h 2021-08-02 14:17:07.782923109 -0400 +@@ -32,3 +32,16 @@ + gulong read_cpuload(void); + + #endif /* ndef __CPU_H */ ++ ++/* G_GNUC_FALLTHROUGH definition, from GLib 2.68.0 */ ++ ++#if ! GLIB_CHECK_VERSION (2, 60, 0) ++#if __GNUC__ > 6 ++#define G_GNUC_FALLTHROUGH __attribute__((fallthrough)) ++#elif g_macro__has_attribute (fallthrough) ++#define G_GNUC_FALLTHROUGH __attribute__((fallthrough)) ++#else ++#define G_GNUC_FALLTHROUGH ++#endif ++#endif ++ diff --git a/xfce4-systemload-plugin.spec b/xfce4-systemload-plugin.spec index 78039ce..05773b4 100644 --- a/xfce4-systemload-plugin.spec +++ b/xfce4-systemload-plugin.spec @@ -5,14 +5,15 @@ Name: xfce4-systemload-plugin Version: 1.3.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Systemload monitor for the Xfce panel License: 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 +Patch0: define_G_GNUC_FALLTHROUGH.patch + BuildRequires: gcc-c++ BuildRequires: libxfce4ui-devel >= %{xfceversion} BuildRequires: xfce4-panel-devel >= %{xfceversion} @@ -32,6 +33,7 @@ load, the memory in use, the swap space and the system uptime. %prep %setup -q +%patch0 %build %configure --disable-static @@ -52,12 +54,16 @@ chmod -c +x %{buildroot}%{_libdir}/xfce4/panel/plugins/*.so %files -f %{name}.lang %license COPYING -%doc AUTHORS ChangeLog NEWS README +%doc AUTHORS ChangeLog NEWS %{_libdir}/xfce4/panel/plugins/*.so %{_datadir}/xfce4/panel/plugins/*.desktop +%{_datadir}/icons/hicolor/*/apps/org.xfce.panel.systemload.* %changelog -* Mon Aug 02 2021 Mukundan Ragagan - 1.3.1-1 +* Mon Aug 02 2021 Mukundan Ragavan - 1.3.1-2 +- define G_GNUC_FALLTHROUGH for glib < 2.60 + +* Mon Aug 02 2021 Mukundan Ragavan - 1.3.1-1 - Update to 1.3.1 * Sat Dec 14 2019 Mukundan Ragavan - 1.2.3-2