From e10c88af634afad834d60646a57dd96ad77bac4a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jul 2019 03:33:08 +0000 Subject: [PATCH 01/26] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- gkrellm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gkrellm.spec b/gkrellm.spec index 31ef69e..1bc0114 100644 --- a/gkrellm.spec +++ b/gkrellm.spec @@ -2,7 +2,7 @@ Name: gkrellm Version: 2.3.10 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Multiple stacked system monitors in one process License: GPLv3+ URL: http://www.gkrellm.net/ @@ -149,6 +149,9 @@ useradd -r -g gkrellmd -M -d / -s /sbin/nologin -c "GNU Krell daemon" gkrellmd %changelog +* Thu Jul 25 2019 Fedora Release Engineering - 2.3.10-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Thu Jan 31 2019 Fedora Release Engineering - 2.3.10-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From 2adcd2384b31e6db9eb000954268dbc4287c6be6 Mon Sep 17 00:00:00 2001 From: Adam Goode Date: Sun, 25 Aug 2019 17:38:14 -0400 Subject: [PATCH 02/26] Update to 2.3.11 --- 04_fix_manpage_hyphen.patch | 147 +++++++++++++++++++++++++++++++++ 05_bts437033_fix_strip.patch | 17 ++++ 10_fix_glib_underlinkage.patch | 15 ++++ gkrellm.spec | 22 ++--- sources | 3 +- 5 files changed, 191 insertions(+), 13 deletions(-) create mode 100644 04_fix_manpage_hyphen.patch create mode 100644 05_bts437033_fix_strip.patch create mode 100644 10_fix_glib_underlinkage.patch diff --git a/04_fix_manpage_hyphen.patch b/04_fix_manpage_hyphen.patch new file mode 100644 index 0000000..dd06644 --- /dev/null +++ b/04_fix_manpage_hyphen.patch @@ -0,0 +1,147 @@ +Author: Sandro Tosi +Description: fix errors in manpage +Index: gkrellm/gkrellm.1 +=================================================================== +--- gkrellm.orig/gkrellm.1 2010-10-21 21:13:40.792904598 +0200 ++++ gkrellm/gkrellm.1 2010-10-21 21:13:48.004905141 +0200 +@@ -145,7 +145,7 @@ + .I "Btn 2" + Slide + .B gkrellm +-window shut (Btn1 if -m2 option). ++window shut (Btn1 if \-m2 option). + .TP + .I "Btn 3" + Popup main menu. +@@ -281,8 +281,8 @@ + move to an + .I (x,y) + position on the screen at startup. Standard X window geometry position +-(not size) formats are parsed, ie +x+y -x+y +x-y -x-y. Except, negative +-geometry positions are not recognized (ie +-x--y ). ++(not size) formats are parsed, ie +x+y \-x+y +x\-y \-x\-y. Except, negative ++geometry positions are not recognized (ie +-x\-\-y ). + .TP + .B \-wm + Forces +@@ -438,7 +438,7 @@ + .PP + .RS + .nf +-ln -s /var/lock/LCK..ttySx ~/.gkrellm2/LCK..modem ++ln \-s /var/lock/LCK..ttySx ~/.gkrellm2/LCK..modem + .fi + .RE + .IP +@@ -589,7 +589,7 @@ + .PP + .RS + .nf +-sudo /bin/mount -t msdos /dev/fd0 /mnt/A ++sudo /bin/mount \-t msdos /dev/fd0 /mnt/A + sudo /bin/umount /mnt/A + .fi + .RE +@@ -701,7 +701,7 @@ + .PP + .RS + .nf +-mbmon -r -P port-number ++mbmon \-r \-P port\-number + .fi + .RE + .PP +@@ -741,7 +741,7 @@ + .PP + .RS + .nf +-gkrellm --without-libsensors ++gkrellm \-\-without\-libsensors + .fi + .RE + .PP +@@ -814,7 +814,7 @@ + .PP + .RS + .nf +-gkrellm -d 0x80 ++gkrellm \-d 0x80 + .fi + .RE + .PP +@@ -1036,7 +1036,7 @@ + compute in5 (1 + 160/35.7)*@ - (160/35.7)*in0, ... + + so the correction factor is (1 + 160/35.7) = 5.48 +-and the correction offset is -(160/35.7) = -4.48 ++and the correction offset is \-(160/35.7) = \-4.48 + and the voltage reference Vref is in0 + .fi + .RE +@@ -1053,16 +1053,16 @@ + in2 (22.1/30 + 1) * @ 1.737 0 - + in3 (2.8/1.9) * @ 1.474 0 - + in4 (160/30.1 + 1) * @ 6.316 0 - +- in5 (160/35.7)*(@-in0) + @ 5.482 -4.482 in0 +- in6 (36/16.2)*(@-in0) + @ 3.222 -2.222 in0 ++ in5 (160/35.7)*(@\-in0) + @ 5.482 \-4.482 in0 ++ in6 (36/16.2)*(@\-in0) + @ 3.222 \-2.222 in0 + + LM78 in3 ((6.8/10)+1)*@ 1.68 0 - + in4 ((28/10)+1)*@ 3.8 0 - +- in5 -(210/60.4)*@ -3.477 0 - +- in6 -(90.9/60.4)*@ -1.505 0 - ++ in5 \-(210/60.4)*@ \-3.477 0 - ++ in6 \-(90.9/60.4)*@ \-1.505 0 - + +-w83782 in5 (5.14 * @) - 14.91 5.14 -14.91 - +- in6 (3.14 * @) - 7.71 3.14 -7.71 - ++w83782 in5 (5.14 * @) \- 14.91 5.14 \-14.91 - ++ in6 (3.14 * @) \- 7.71 3.14 \-7.71 - + + .fi + .RE +@@ -1077,7 +1077,7 @@ + the command must be run in a terminal window such as xterm, eterm, + or Gnome terminal. For example running the "top" command would take: + .TP +-xterm -e top ++xterm \-e top + .PP + You can use the command launching feature to run commands related to + monitoring functions, or you may use it to have a convenient launch +@@ -1094,13 +1094,13 @@ + gnomecal, evolution, or ical + .TP + .I CPU: +-xterm -e top or gps or gtop ++xterm \-e top or gps or gtop + .TP + .I inet: +-gftp or xterm -e ftpwho ++gftp or xterm \-e ftpwho + .TP + .I net: +-mozilla, galeon, skipstone, or xterm -e slrn -C- ++mozilla, galeon, skipstone, or xterm \-e slrn \-C\- + .PP + And so on... Tooltips can be set up for these commands. + +@@ -1122,7 +1122,7 @@ + alert warn command could just speak the current temperature with: + .nf + +- sh -c "echo warning C P U is at $s degrees | esddsp festival --tts" ++ sh \-c "echo warning C P U is at $s degrees | esddsp festival \-\-tts" + + .fi + Assuming you have esd running. +@@ -1158,7 +1158,7 @@ + .PP + .RS + .nf +-gkrellm -t path_to_theme ++gkrellm \-t path_to_theme + .fi + .RE + .PP diff --git a/05_bts437033_fix_strip.patch b/05_bts437033_fix_strip.patch new file mode 100644 index 0000000..1fc0417 --- /dev/null +++ b/05_bts437033_fix_strip.patch @@ -0,0 +1,17 @@ +Author: Sandro Tosi +Description: correctly handle stripping as per Debian policy +Index: gkrellm/Makefile +=================================================================== +--- gkrellm.orig/Makefile 2010-10-21 21:13:40.728904771 +0200 ++++ gkrellm/Makefile 2010-10-21 21:14:27.764905757 +0200 +@@ -152,8 +152,8 @@ + + install: install_gkrellm.pc + (cd po && ${MAKE} install) +- (cd src && ${MAKE} install) +- (cd server && ${MAKE} install) ++ (cd src && ${MAKE} install STRIP="") ++ (cd server && ${MAKE} install STRIP="") + + uninstall: + (cd po && ${MAKE} uninstall) diff --git a/10_fix_glib_underlinkage.patch b/10_fix_glib_underlinkage.patch new file mode 100644 index 0000000..1fcdaa5 --- /dev/null +++ b/10_fix_glib_underlinkage.patch @@ -0,0 +1,15 @@ +Description: add missing library to be linked to + +Index: gkrellm-2.3.5/src/Makefile +=================================================================== +--- gkrellm-2.3.5.orig/src/Makefile 2010-10-02 12:21:01.000000000 -0400 ++++ gkrellm-2.3.5/src/Makefile 2013-04-08 07:34:13.851640490 -0400 +@@ -75,7 +75,7 @@ + ${SSL_INCLUDE} ${NTLM_INCLUDE} -DGKRELLM_CLIENT + + LIBS = $(PKG_LIB) $(GTOP_LIBS) $(X11_LIBS) $(SYS_LIBS) $(SSL_LIBS) $(SENSORS_LIBS)\ +- $(NTLM_LIBS) $(MATH_LIB) ++ $(NTLM_LIBS) $(MATH_LIB) -lgmodule-2.0 + + ifeq ($(debug),1) + FLAGS += -g diff --git a/gkrellm.spec b/gkrellm.spec index 1bc0114..287d82f 100644 --- a/gkrellm.spec +++ b/gkrellm.spec @@ -1,8 +1,8 @@ %global _hardened_build 1 Name: gkrellm -Version: 2.3.10 -Release: 9%{?dist} +Version: 2.3.11 +Release: 1%{?dist} Summary: Multiple stacked system monitors in one process License: GPLv3+ URL: http://www.gkrellm.net/ @@ -12,10 +12,13 @@ Source2: gkrellm.desktop Source3: gkrellm.png Source4: gnome-gkrellm.appdata.xml Source5: make-git-snapshot.sh -Source6: http://cdn.debian.net/debian/pool/main/g/gkrellm/gkrellm_2.3.8-1.debian.tar.xz Patch1: gkrellm-2.3.5-config.patch Patch2: gkrellm-2.2.4-sansfont.patch Patch3: gkrellm-2.2.7-width.patch +# Debian patches from https://sources.debian.org/patches/gkrellm/2.3.10-2/ +Patch10: 04_fix_manpage_hyphen.patch +Patch11: 05_bts437033_fix_strip.patch +Patch12: 10_fix_glib_underlinkage.patch BuildRequires: gcc BuildRequires: gtk2-devel openssl-devel libSM-devel desktop-file-utils gettext BuildRequires: lm_sensors-devel libntlm-devel libappstream-glib @@ -57,14 +60,7 @@ Development files for the GNU Krell Monitors. %prep -%setup -q -a 6 -%patch1 -p1 -z .config -%patch2 -p1 -z .sansfont -%patch3 -p1 -z .width -rm debian/patches/01_gkrellmd.conf.patch -for i in debian/patches/*_*.patch; do - patch -p1 --fuzz=0 < $i -done +%autosetup -p1 for i in gkrellmd.1 gkrellm.1 README Changelog Changelog-plugins.html \ src/gkrellm.h server/gkrellmd.h; do @@ -149,6 +145,10 @@ useradd -r -g gkrellmd -M -d / -s /sbin/nologin -c "GNU Krell daemon" gkrellmd %changelog +* Sun Aug 25 2019 Adam Goode - 2.3.11-1 +- Update to 2.3.11 (#1742316) +- Include Debian patches directly instead of via source + * Thu Jul 25 2019 Fedora Release Engineering - 2.3.10-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild diff --git a/sources b/sources index fc2e2e5..30e626a 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -30743dfdb4e30bfbbf78efa41e819b1f gkrellm_2.3.8-1.debian.tar.xz -ccc0b6af434542a2374e34a135ae68da gkrellm-2.3.10.tar.bz2 +SHA512 (gkrellm-2.3.11.tar.bz2) = e4147aa90e09925b9672728f287880bde26632d77d83d3f0b9458a201593a57158d9eb8cbb31e569e0d71d91a08c9bceba29814f59e542315775663ef9fd27a9 From c9d789d67f5b768df973eb088e2461e53b7b5da6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jan 2020 22:03:33 +0000 Subject: [PATCH 03/26] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- gkrellm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gkrellm.spec b/gkrellm.spec index 287d82f..5875f00 100644 --- a/gkrellm.spec +++ b/gkrellm.spec @@ -2,7 +2,7 @@ Name: gkrellm Version: 2.3.11 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Multiple stacked system monitors in one process License: GPLv3+ URL: http://www.gkrellm.net/ @@ -145,6 +145,9 @@ useradd -r -g gkrellmd -M -d / -s /sbin/nologin -c "GNU Krell daemon" gkrellmd %changelog +* Tue Jan 28 2020 Fedora Release Engineering - 2.3.11-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Sun Aug 25 2019 Adam Goode - 2.3.11-1 - Update to 2.3.11 (#1742316) - Include Debian patches directly instead of via source From 109b594a8f922eac9c8b27762951f2fadd0d6b34 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 27 Jul 2020 20:09:18 +0000 Subject: [PATCH 04/26] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- gkrellm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gkrellm.spec b/gkrellm.spec index 5875f00..a039fa6 100644 --- a/gkrellm.spec +++ b/gkrellm.spec @@ -2,7 +2,7 @@ Name: gkrellm Version: 2.3.11 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Multiple stacked system monitors in one process License: GPLv3+ URL: http://www.gkrellm.net/ @@ -145,6 +145,9 @@ useradd -r -g gkrellmd -M -d / -s /sbin/nologin -c "GNU Krell daemon" gkrellmd %changelog +* Mon Jul 27 2020 Fedora Release Engineering - 2.3.11-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Tue Jan 28 2020 Fedora Release Engineering - 2.3.11-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From 961ccffc008842833174f863858cdf4525e9cf09 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 1 Aug 2020 01:53:27 +0000 Subject: [PATCH 05/26] - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- gkrellm.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/gkrellm.spec b/gkrellm.spec index a039fa6..a438f2e 100644 --- a/gkrellm.spec +++ b/gkrellm.spec @@ -2,7 +2,7 @@ Name: gkrellm Version: 2.3.11 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Multiple stacked system monitors in one process License: GPLv3+ URL: http://www.gkrellm.net/ @@ -145,6 +145,10 @@ useradd -r -g gkrellmd -M -d / -s /sbin/nologin -c "GNU Krell daemon" gkrellmd %changelog +* Sat Aug 01 2020 Fedora Release Engineering - 2.3.11-4 +- Second attempt - Rebuilt for + https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Mon Jul 27 2020 Fedora Release Engineering - 2.3.11-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 12858b924663aa74a9c7d55292a89fbf11766f15 Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Fri, 18 Dec 2020 23:23:45 +0000 Subject: [PATCH 06/26] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- gkrellm.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/gkrellm.spec b/gkrellm.spec index a438f2e..2ac27e0 100644 --- a/gkrellm.spec +++ b/gkrellm.spec @@ -41,6 +41,7 @@ Additional features are: Summary: The GNU Krell Monitors Server # systemd >= 186 for scriptlet macros BuildRequires: systemd >= 186 +BuildRequires: make Requires(pre): shadow-utils systemd Requires(post,preun,postun): systemd From 2a3aaf3b2acb040b1335fe01a6fbd67407014dae Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 08:12:50 +0000 Subject: [PATCH 07/26] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- gkrellm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gkrellm.spec b/gkrellm.spec index 2ac27e0..f9a2376 100644 --- a/gkrellm.spec +++ b/gkrellm.spec @@ -2,7 +2,7 @@ Name: gkrellm Version: 2.3.11 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Multiple stacked system monitors in one process License: GPLv3+ URL: http://www.gkrellm.net/ @@ -146,6 +146,9 @@ useradd -r -g gkrellmd -M -d / -s /sbin/nologin -c "GNU Krell daemon" gkrellmd %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 2.3.11-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Sat Aug 01 2020 Fedora Release Engineering - 2.3.11-4 - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 9b753a88ff5d597b8435130e0d39484521d5baf7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 2 Mar 2021 16:13:44 +0100 Subject: [PATCH 08/26] Rebuilt for updated systemd-rpm-macros See https://pagure.io/fesco/issue/2583. --- gkrellm.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/gkrellm.spec b/gkrellm.spec index f9a2376..8046de2 100644 --- a/gkrellm.spec +++ b/gkrellm.spec @@ -2,7 +2,7 @@ Name: gkrellm Version: 2.3.11 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Multiple stacked system monitors in one process License: GPLv3+ URL: http://www.gkrellm.net/ @@ -146,6 +146,10 @@ useradd -r -g gkrellmd -M -d / -s /sbin/nologin -c "GNU Krell daemon" gkrellmd %changelog +* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek - 2.3.11-6 +- Rebuilt for updated systemd-rpm-macros + See https://pagure.io/fesco/issue/2583. + * Tue Jan 26 2021 Fedora Release Engineering - 2.3.11-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 8146720b7ebeb2b158ae8dbdb5d397cf1fba0b94 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 22 Jul 2021 01:45:43 +0000 Subject: [PATCH 09/26] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- gkrellm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gkrellm.spec b/gkrellm.spec index 8046de2..3eae4ea 100644 --- a/gkrellm.spec +++ b/gkrellm.spec @@ -2,7 +2,7 @@ Name: gkrellm Version: 2.3.11 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Multiple stacked system monitors in one process License: GPLv3+ URL: http://www.gkrellm.net/ @@ -146,6 +146,9 @@ useradd -r -g gkrellmd -M -d / -s /sbin/nologin -c "GNU Krell daemon" gkrellmd %changelog +* Thu Jul 22 2021 Fedora Release Engineering - 2.3.11-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek - 2.3.11-6 - Rebuilt for updated systemd-rpm-macros See https://pagure.io/fesco/issue/2583. From 59e8c8c3f6dd2cbbde406b7f53fe1d0753b871d8 Mon Sep 17 00:00:00 2001 From: Sahana Prasad Date: Tue, 14 Sep 2021 19:02:41 +0200 Subject: [PATCH 10/26] Rebuilt with OpenSSL 3.0.0 --- gkrellm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gkrellm.spec b/gkrellm.spec index 3eae4ea..0cadb6b 100644 --- a/gkrellm.spec +++ b/gkrellm.spec @@ -2,7 +2,7 @@ Name: gkrellm Version: 2.3.11 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Multiple stacked system monitors in one process License: GPLv3+ URL: http://www.gkrellm.net/ @@ -146,6 +146,9 @@ useradd -r -g gkrellmd -M -d / -s /sbin/nologin -c "GNU Krell daemon" gkrellmd %changelog +* Tue Sep 14 2021 Sahana Prasad - 2.3.11-8 +- Rebuilt with OpenSSL 3.0.0 + * Thu Jul 22 2021 Fedora Release Engineering - 2.3.11-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From f171363416b6c3796a0fc98640a646d961fc8d29 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jan 2022 06:08:29 +0000 Subject: [PATCH 11/26] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- gkrellm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gkrellm.spec b/gkrellm.spec index 0cadb6b..0fbfe5f 100644 --- a/gkrellm.spec +++ b/gkrellm.spec @@ -2,7 +2,7 @@ Name: gkrellm Version: 2.3.11 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Multiple stacked system monitors in one process License: GPLv3+ URL: http://www.gkrellm.net/ @@ -146,6 +146,9 @@ useradd -r -g gkrellmd -M -d / -s /sbin/nologin -c "GNU Krell daemon" gkrellmd %changelog +* Thu Jan 20 2022 Fedora Release Engineering - 2.3.11-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Tue Sep 14 2021 Sahana Prasad - 2.3.11-8 - Rebuilt with OpenSSL 3.0.0 From 317cc10e26cefbe8e778784062264c3243b6a31b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 21 Jul 2022 06:22:57 +0000 Subject: [PATCH 12/26] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- gkrellm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gkrellm.spec b/gkrellm.spec index 0fbfe5f..6d0437d 100644 --- a/gkrellm.spec +++ b/gkrellm.spec @@ -2,7 +2,7 @@ Name: gkrellm Version: 2.3.11 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Multiple stacked system monitors in one process License: GPLv3+ URL: http://www.gkrellm.net/ @@ -146,6 +146,9 @@ useradd -r -g gkrellmd -M -d / -s /sbin/nologin -c "GNU Krell daemon" gkrellmd %changelog +* Thu Jul 21 2022 Fedora Release Engineering - 2.3.11-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Thu Jan 20 2022 Fedora Release Engineering - 2.3.11-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From f1829c7c02d4b93e0f023614fa7e358e8c0d0a9b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 19 Jan 2023 05:02:03 +0000 Subject: [PATCH 13/26] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- gkrellm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gkrellm.spec b/gkrellm.spec index 6d0437d..e54430a 100644 --- a/gkrellm.spec +++ b/gkrellm.spec @@ -2,7 +2,7 @@ Name: gkrellm Version: 2.3.11 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Multiple stacked system monitors in one process License: GPLv3+ URL: http://www.gkrellm.net/ @@ -146,6 +146,9 @@ useradd -r -g gkrellmd -M -d / -s /sbin/nologin -c "GNU Krell daemon" gkrellmd %changelog +* Thu Jan 19 2023 Fedora Release Engineering - 2.3.11-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Thu Jul 21 2022 Fedora Release Engineering - 2.3.11-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 720d8e34a06861a1f4aa673837a8689d4d661a1e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jul 2023 23:08:58 +0000 Subject: [PATCH 14/26] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- gkrellm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gkrellm.spec b/gkrellm.spec index e54430a..11174b2 100644 --- a/gkrellm.spec +++ b/gkrellm.spec @@ -2,7 +2,7 @@ Name: gkrellm Version: 2.3.11 -Release: 11%{?dist} +Release: 12%{?dist} Summary: Multiple stacked system monitors in one process License: GPLv3+ URL: http://www.gkrellm.net/ @@ -146,6 +146,9 @@ useradd -r -g gkrellmd -M -d / -s /sbin/nologin -c "GNU Krell daemon" gkrellmd %changelog +* Wed Jul 19 2023 Fedora Release Engineering - 2.3.11-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Thu Jan 19 2023 Fedora Release Engineering - 2.3.11-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From b9fbbea3dca5be0a3f43951e11af746c15c31b99 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jan 2024 22:29:12 +0000 Subject: [PATCH 15/26] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- gkrellm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gkrellm.spec b/gkrellm.spec index 11174b2..45a53fe 100644 --- a/gkrellm.spec +++ b/gkrellm.spec @@ -2,7 +2,7 @@ Name: gkrellm Version: 2.3.11 -Release: 12%{?dist} +Release: 13%{?dist} Summary: Multiple stacked system monitors in one process License: GPLv3+ URL: http://www.gkrellm.net/ @@ -146,6 +146,9 @@ useradd -r -g gkrellmd -M -d / -s /sbin/nologin -c "GNU Krell daemon" gkrellmd %changelog +* Fri Jan 19 2024 Fedora Release Engineering - 2.3.11-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Wed Jul 19 2023 Fedora Release Engineering - 2.3.11-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 7ec65a5e2a57463751eea6d0f809db1bd6cfe074 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 24 Jan 2024 14:58:43 +0000 Subject: [PATCH 16/26] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- gkrellm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gkrellm.spec b/gkrellm.spec index 45a53fe..ed729cd 100644 --- a/gkrellm.spec +++ b/gkrellm.spec @@ -2,7 +2,7 @@ Name: gkrellm Version: 2.3.11 -Release: 13%{?dist} +Release: 14%{?dist} Summary: Multiple stacked system monitors in one process License: GPLv3+ URL: http://www.gkrellm.net/ @@ -146,6 +146,9 @@ useradd -r -g gkrellmd -M -d / -s /sbin/nologin -c "GNU Krell daemon" gkrellmd %changelog +* Wed Jan 24 2024 Fedora Release Engineering - 2.3.11-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Fri Jan 19 2024 Fedora Release Engineering - 2.3.11-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From f3cd2d6e721207ef782a449b0251c4cf33be29ef Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 18 Jul 2024 02:31:00 +0000 Subject: [PATCH 17/26] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- gkrellm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gkrellm.spec b/gkrellm.spec index ed729cd..4a87f08 100644 --- a/gkrellm.spec +++ b/gkrellm.spec @@ -2,7 +2,7 @@ Name: gkrellm Version: 2.3.11 -Release: 14%{?dist} +Release: 15%{?dist} Summary: Multiple stacked system monitors in one process License: GPLv3+ URL: http://www.gkrellm.net/ @@ -146,6 +146,9 @@ useradd -r -g gkrellmd -M -d / -s /sbin/nologin -c "GNU Krell daemon" gkrellmd %changelog +* Thu Jul 18 2024 Fedora Release Engineering - 2.3.11-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Wed Jan 24 2024 Fedora Release Engineering - 2.3.11-14 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 0b25e2029a978b07d3fa7b5dd95f6dfa6caf3a08 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Thu, 25 Jul 2024 11:57:32 +0200 Subject: [PATCH 18/26] convert GPLv3+ license to SPDX This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4 --- gkrellm.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/gkrellm.spec b/gkrellm.spec index 4a87f08..2a5080c 100644 --- a/gkrellm.spec +++ b/gkrellm.spec @@ -2,9 +2,10 @@ Name: gkrellm Version: 2.3.11 -Release: 15%{?dist} +Release: 16%{?dist} Summary: Multiple stacked system monitors in one process -License: GPLv3+ +# Automatically converted from old format: GPLv3+ - review is highly recommended. +License: GPL-3.0-or-later URL: http://www.gkrellm.net/ Source0: http://gkrellm.srcbox.net/releases/%{name}-%{version}.tar.bz2 Source1: gkrellmd.service @@ -146,6 +147,9 @@ useradd -r -g gkrellmd -M -d / -s /sbin/nologin -c "GNU Krell daemon" gkrellmd %changelog +* Thu Jul 25 2024 Miroslav Suchý - 2.3.11-16 +- convert license to SPDX + * Thu Jul 18 2024 Fedora Release Engineering - 2.3.11-15 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From c6e19dc5fde627e428911cc11ae6d21ecd8836fa Mon Sep 17 00:00:00 2001 From: Benjamin Gilbert Date: Thu, 25 Jul 2024 23:50:12 -0700 Subject: [PATCH 19/26] Require gdk-pixbuf2-modules-extra on F41+ to fix crash (rhbz#2276464) --- gkrellm.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/gkrellm.spec b/gkrellm.spec index 2a5080c..3f5324b 100644 --- a/gkrellm.spec +++ b/gkrellm.spec @@ -2,7 +2,7 @@ Name: gkrellm Version: 2.3.11 -Release: 16%{?dist} +Release: 17%{?dist} Summary: Multiple stacked system monitors in one process # Automatically converted from old format: GPLv3+ - review is highly recommended. License: GPL-3.0-or-later @@ -23,6 +23,9 @@ Patch12: 10_fix_glib_underlinkage.patch BuildRequires: gcc BuildRequires: gtk2-devel openssl-devel libSM-devel desktop-file-utils gettext BuildRequires: lm_sensors-devel libntlm-devel libappstream-glib +%if 0%{?fedora} >= 41 +Requires: gdk-pixbuf2-modules-extra%{?_isa} +%endif %description GKrellM charts CPU, load, Disk, and all active net interfaces @@ -147,6 +150,9 @@ useradd -r -g gkrellmd -M -d / -s /sbin/nologin -c "GNU Krell daemon" gkrellmd %changelog +* Fri Jul 26 2024 Benjamin Gilbert - 2.3.11-17 +- Require gdk-pixbuf2-modules-extra on F41+ to fix crash (rhbz#2276464) + * Thu Jul 25 2024 Miroslav Suchý - 2.3.11-16 - convert license to SPDX From ecc7a19801db8a8aba8f478df389e37f11ac6a63 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Wed, 18 Dec 2024 12:50:51 -0800 Subject: [PATCH 20/26] Rebuild for new libntlm soname bump. Rebuild for new libntlm soname bump. Rebuild for new libntlm soname bump. --- gkrellm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gkrellm.spec b/gkrellm.spec index 3f5324b..12bd05c 100644 --- a/gkrellm.spec +++ b/gkrellm.spec @@ -2,7 +2,7 @@ Name: gkrellm Version: 2.3.11 -Release: 17%{?dist} +Release: 18%{?dist} Summary: Multiple stacked system monitors in one process # Automatically converted from old format: GPLv3+ - review is highly recommended. License: GPL-3.0-or-later @@ -150,6 +150,9 @@ useradd -r -g gkrellmd -M -d / -s /sbin/nologin -c "GNU Krell daemon" gkrellmd %changelog +* Wed Dec 18 2024 Kevin Fenzi - 2.3.11-18 +- Rebuild for new libntlm soname bump. + * Fri Jul 26 2024 Benjamin Gilbert - 2.3.11-17 - Require gdk-pixbuf2-modules-extra on F41+ to fix crash (rhbz#2276464) From 2e57b233bde72622bca003da52b58dcc3e761e61 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 16 Jan 2025 22:10:10 +0000 Subject: [PATCH 21/26] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- gkrellm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gkrellm.spec b/gkrellm.spec index 12bd05c..70be7d5 100644 --- a/gkrellm.spec +++ b/gkrellm.spec @@ -2,7 +2,7 @@ Name: gkrellm Version: 2.3.11 -Release: 18%{?dist} +Release: 19%{?dist} Summary: Multiple stacked system monitors in one process # Automatically converted from old format: GPLv3+ - review is highly recommended. License: GPL-3.0-or-later @@ -150,6 +150,9 @@ useradd -r -g gkrellmd -M -d / -s /sbin/nologin -c "GNU Krell daemon" gkrellmd %changelog +* Thu Jan 16 2025 Fedora Release Engineering - 2.3.11-19 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Wed Dec 18 2024 Kevin Fenzi - 2.3.11-18 - Rebuild for new libntlm soname bump. From 5d19a0e18c7ed292fd8de99c4712622e7ce4f642 Mon Sep 17 00:00:00 2001 From: Adam Goode Date: Mon, 20 Jan 2025 01:41:49 -0500 Subject: [PATCH 22/26] New upstream release and modernize spec file --- 04_fix_manpage_hyphen.patch | 147 ---- 05_bts437033_fix_strip.patch | 17 - 10_fix_glib_underlinkage.patch | 15 - gkrellm-2.2.4-sansfont.patch | 17 - ...config.patch => gkrellm-2.4.0-config.patch | 18 - ...7-width.patch => gkrellm-2.4.0-width.patch | 2 +- gkrellm.desktop | 11 - gkrellm.png | Bin 1862 -> 0 bytes gkrellm.spec | 647 +----------------- gkrellmd.service | 10 - gnome-gkrellm.appdata.xml | 33 - sources | 2 +- 12 files changed, 34 insertions(+), 885 deletions(-) delete mode 100644 04_fix_manpage_hyphen.patch delete mode 100644 05_bts437033_fix_strip.patch delete mode 100644 10_fix_glib_underlinkage.patch delete mode 100644 gkrellm-2.2.4-sansfont.patch rename gkrellm-2.3.5-config.patch => gkrellm-2.4.0-config.patch (55%) rename gkrellm-2.2.7-width.patch => gkrellm-2.4.0-width.patch (94%) delete mode 100644 gkrellm.desktop delete mode 100644 gkrellm.png delete mode 100644 gkrellmd.service delete mode 100644 gnome-gkrellm.appdata.xml diff --git a/04_fix_manpage_hyphen.patch b/04_fix_manpage_hyphen.patch deleted file mode 100644 index dd06644..0000000 --- a/04_fix_manpage_hyphen.patch +++ /dev/null @@ -1,147 +0,0 @@ -Author: Sandro Tosi -Description: fix errors in manpage -Index: gkrellm/gkrellm.1 -=================================================================== ---- gkrellm.orig/gkrellm.1 2010-10-21 21:13:40.792904598 +0200 -+++ gkrellm/gkrellm.1 2010-10-21 21:13:48.004905141 +0200 -@@ -145,7 +145,7 @@ - .I "Btn 2" - Slide - .B gkrellm --window shut (Btn1 if -m2 option). -+window shut (Btn1 if \-m2 option). - .TP - .I "Btn 3" - Popup main menu. -@@ -281,8 +281,8 @@ - move to an - .I (x,y) - position on the screen at startup. Standard X window geometry position --(not size) formats are parsed, ie +x+y -x+y +x-y -x-y. Except, negative --geometry positions are not recognized (ie +-x--y ). -+(not size) formats are parsed, ie +x+y \-x+y +x\-y \-x\-y. Except, negative -+geometry positions are not recognized (ie +-x\-\-y ). - .TP - .B \-wm - Forces -@@ -438,7 +438,7 @@ - .PP - .RS - .nf --ln -s /var/lock/LCK..ttySx ~/.gkrellm2/LCK..modem -+ln \-s /var/lock/LCK..ttySx ~/.gkrellm2/LCK..modem - .fi - .RE - .IP -@@ -589,7 +589,7 @@ - .PP - .RS - .nf --sudo /bin/mount -t msdos /dev/fd0 /mnt/A -+sudo /bin/mount \-t msdos /dev/fd0 /mnt/A - sudo /bin/umount /mnt/A - .fi - .RE -@@ -701,7 +701,7 @@ - .PP - .RS - .nf --mbmon -r -P port-number -+mbmon \-r \-P port\-number - .fi - .RE - .PP -@@ -741,7 +741,7 @@ - .PP - .RS - .nf --gkrellm --without-libsensors -+gkrellm \-\-without\-libsensors - .fi - .RE - .PP -@@ -814,7 +814,7 @@ - .PP - .RS - .nf --gkrellm -d 0x80 -+gkrellm \-d 0x80 - .fi - .RE - .PP -@@ -1036,7 +1036,7 @@ - compute in5 (1 + 160/35.7)*@ - (160/35.7)*in0, ... - - so the correction factor is (1 + 160/35.7) = 5.48 --and the correction offset is -(160/35.7) = -4.48 -+and the correction offset is \-(160/35.7) = \-4.48 - and the voltage reference Vref is in0 - .fi - .RE -@@ -1053,16 +1053,16 @@ - in2 (22.1/30 + 1) * @ 1.737 0 - - in3 (2.8/1.9) * @ 1.474 0 - - in4 (160/30.1 + 1) * @ 6.316 0 - -- in5 (160/35.7)*(@-in0) + @ 5.482 -4.482 in0 -- in6 (36/16.2)*(@-in0) + @ 3.222 -2.222 in0 -+ in5 (160/35.7)*(@\-in0) + @ 5.482 \-4.482 in0 -+ in6 (36/16.2)*(@\-in0) + @ 3.222 \-2.222 in0 - - LM78 in3 ((6.8/10)+1)*@ 1.68 0 - - in4 ((28/10)+1)*@ 3.8 0 - -- in5 -(210/60.4)*@ -3.477 0 - -- in6 -(90.9/60.4)*@ -1.505 0 - -+ in5 \-(210/60.4)*@ \-3.477 0 - -+ in6 \-(90.9/60.4)*@ \-1.505 0 - - --w83782 in5 (5.14 * @) - 14.91 5.14 -14.91 - -- in6 (3.14 * @) - 7.71 3.14 -7.71 - -+w83782 in5 (5.14 * @) \- 14.91 5.14 \-14.91 - -+ in6 (3.14 * @) \- 7.71 3.14 \-7.71 - - - .fi - .RE -@@ -1077,7 +1077,7 @@ - the command must be run in a terminal window such as xterm, eterm, - or Gnome terminal. For example running the "top" command would take: - .TP --xterm -e top -+xterm \-e top - .PP - You can use the command launching feature to run commands related to - monitoring functions, or you may use it to have a convenient launch -@@ -1094,13 +1094,13 @@ - gnomecal, evolution, or ical - .TP - .I CPU: --xterm -e top or gps or gtop -+xterm \-e top or gps or gtop - .TP - .I inet: --gftp or xterm -e ftpwho -+gftp or xterm \-e ftpwho - .TP - .I net: --mozilla, galeon, skipstone, or xterm -e slrn -C- -+mozilla, galeon, skipstone, or xterm \-e slrn \-C\- - .PP - And so on... Tooltips can be set up for these commands. - -@@ -1122,7 +1122,7 @@ - alert warn command could just speak the current temperature with: - .nf - -- sh -c "echo warning C P U is at $s degrees | esddsp festival --tts" -+ sh \-c "echo warning C P U is at $s degrees | esddsp festival \-\-tts" - - .fi - Assuming you have esd running. -@@ -1158,7 +1158,7 @@ - .PP - .RS - .nf --gkrellm -t path_to_theme -+gkrellm \-t path_to_theme - .fi - .RE - .PP diff --git a/05_bts437033_fix_strip.patch b/05_bts437033_fix_strip.patch deleted file mode 100644 index 1fc0417..0000000 --- a/05_bts437033_fix_strip.patch +++ /dev/null @@ -1,17 +0,0 @@ -Author: Sandro Tosi -Description: correctly handle stripping as per Debian policy -Index: gkrellm/Makefile -=================================================================== ---- gkrellm.orig/Makefile 2010-10-21 21:13:40.728904771 +0200 -+++ gkrellm/Makefile 2010-10-21 21:14:27.764905757 +0200 -@@ -152,8 +152,8 @@ - - install: install_gkrellm.pc - (cd po && ${MAKE} install) -- (cd src && ${MAKE} install) -- (cd server && ${MAKE} install) -+ (cd src && ${MAKE} install STRIP="") -+ (cd server && ${MAKE} install STRIP="") - - uninstall: - (cd po && ${MAKE} uninstall) diff --git a/10_fix_glib_underlinkage.patch b/10_fix_glib_underlinkage.patch deleted file mode 100644 index 1fcdaa5..0000000 --- a/10_fix_glib_underlinkage.patch +++ /dev/null @@ -1,15 +0,0 @@ -Description: add missing library to be linked to - -Index: gkrellm-2.3.5/src/Makefile -=================================================================== ---- gkrellm-2.3.5.orig/src/Makefile 2010-10-02 12:21:01.000000000 -0400 -+++ gkrellm-2.3.5/src/Makefile 2013-04-08 07:34:13.851640490 -0400 -@@ -75,7 +75,7 @@ - ${SSL_INCLUDE} ${NTLM_INCLUDE} -DGKRELLM_CLIENT - - LIBS = $(PKG_LIB) $(GTOP_LIBS) $(X11_LIBS) $(SYS_LIBS) $(SSL_LIBS) $(SENSORS_LIBS)\ -- $(NTLM_LIBS) $(MATH_LIB) -+ $(NTLM_LIBS) $(MATH_LIB) -lgmodule-2.0 - - ifeq ($(debug),1) - FLAGS += -g diff --git a/gkrellm-2.2.4-sansfont.patch b/gkrellm-2.2.4-sansfont.patch deleted file mode 100644 index 460eb5e..0000000 --- a/gkrellm-2.2.4-sansfont.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- gkrellm-2.2.4/src/gui.c.font 2005-05-17 15:37:16.000000000 +0200 -+++ gkrellm-2.2.4/src/gui.c 2005-05-17 15:37:46.000000000 +0200 -@@ -1575,11 +1575,11 @@ - if (!_GK.theme_path || !g_file_test(_GK.theme_path, G_FILE_TEST_IS_DIR)) - gkrellm_dup_string(&_GK.theme_path, ""); - if (!large_font.string) -- gkrellm_dup_string(&large_font.string, "Serif 11"); -+ gkrellm_dup_string(&large_font.string, "Sans 11"); - if (!normal_font.string) -- gkrellm_dup_string(&normal_font.string, "Serif 9"); -+ gkrellm_dup_string(&normal_font.string, "Sans 9"); - if (!small_font.string) -- gkrellm_dup_string(&small_font.string, "Serif 8"); -+ gkrellm_dup_string(&small_font.string, "Sans 8"); - } - - diff --git a/gkrellm-2.3.5-config.patch b/gkrellm-2.4.0-config.patch similarity index 55% rename from gkrellm-2.3.5-config.patch rename to gkrellm-2.4.0-config.patch index c623059..4d85e99 100644 --- a/gkrellm-2.3.5-config.patch +++ b/gkrellm-2.4.0-config.patch @@ -23,21 +23,3 @@ diff -up gkrellm-2.3.5/server/gkrellmd.conf.config gkrellm-2.3.5/server/gkrellmd # Create a PID file for the running gkrellmd. Default is no PID file. # NOTE: Option ignored on Windows -@@ -76,7 +77,7 @@ - # Minimum is 2 (less than 2 for no I/O disconnecting and is the default). - # Requires at least 2.1.8 versions of both gkrellmd and gkrellm. - # --#io-timeout 5 -+io-timeout 5 - - # Configure gkrellm clients to attempt automatic reconnects to a - # gkrellmd server every reconnect-timeout seconds after a disconnected -@@ -85,7 +86,7 @@ - # Minimum is 2 (less than 2 for no automatic reconnecting and is the default). - # Requires at least 2.1.8 versions of both gkrellmd and gkrellm. - # --#reconnect-timeout 5 -+reconnect-timeout 5 - - # Server side local mailbox counts can be sent to gkrellm clients. List here - # paths to mbox, MH mail, or Maildir style mailboxes. diff --git a/gkrellm-2.2.7-width.patch b/gkrellm-2.4.0-width.patch similarity index 94% rename from gkrellm-2.2.7-width.patch rename to gkrellm-2.4.0-width.patch index c7fc220..3140f13 100644 --- a/gkrellm-2.2.7-width.patch +++ b/gkrellm-2.4.0-width.patch @@ -1,7 +1,7 @@ --- gkrellm-2.2.7/src/gkrellm.h.width 2005-06-09 12:48:34.000000000 +0200 +++ gkrellm-2.2.7/src/gkrellm.h 2005-06-09 12:48:37.000000000 +0200 @@ -518,7 +518,7 @@ - GkrellmCallback; + GkrellmPanel; -#define CHART_WIDTH_MAX 1000 diff --git a/gkrellm.desktop b/gkrellm.desktop deleted file mode 100644 index 984b936..0000000 --- a/gkrellm.desktop +++ /dev/null @@ -1,11 +0,0 @@ -[Desktop Entry] -Name=GKrellM System Monitor -Comment=Monitor for CPU, memory, disks, network, mail -Exec=gkrellm -Icon=gkrellm -Terminal=false -Type=Application -Categories=System; -StartupNotify=true -StartupWMClass=gkrellm -Keywords=system;monitor;cpu;memory;disks;network; diff --git a/gkrellm.png b/gkrellm.png deleted file mode 100644 index ce3be278eb1dd01a8f5ad6f073612d4de9cd6fd9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1862 zcmV-M2f6r(P)kd!8a65(EGi}< zE*>H-9yu;9EiW28Fd-~4BqB5tNHiimHZLtUHa0g6LpUNyIwnUtEG0TRIzB2vJ}fjo zE+jrODn2(cLJCqsDl$SkHA5>uLn}^0F)BnrJw_g0Mk-oL4qi$YQc5mXOBPm3Nk&XE zTuu^RP9AnnHb+i2UQReJQc_Y>CU{ghTvSa+RUUj+Hf>otZdp@LS`u_xKQ&%LI$$(> zU_EqTU|?Y)h+!;(WI{}2LUUwBLS`OvW=cM29(HIdh-n&+YDQjbM}ll6jBG)QZc0jS zZf3uCiZ!r`RI-Y4T8mz$j9ie7PPUFFzm6=lj(&2HTeXp7sF7u}l3|CF zRlAll$d+WDmTIw=Zm*hN!kT7~nr51sX?mP)fSw-4o<7c=YM!2Osh)CHpKxiPc(tG_ zv!HO4q9V$oZNZ{?h^2U^rF(Ryc$}wzwyKhXs+x|fo|>yl)U1PRtcJR-Qr50|&8~}e zu9AAMHQKO~m9dPxvWA|rlFGA-tF|J}wqDw{j-I)hi@BQ1x=P}@QqsDH*1DRay-wS` zkk-C3*1m1uzM6)>qME>?(Z+V-#;U5us=COl*vf+B%AVfJwARjQ;?B0R(ZRdYlIGH< z=F+~#(!Si&m+RHE=-8g@+QR7C%EH~q>)z7l-@WhRw({cA%HrJC=GgG&+TQ2F_Uhu^ z?b7z{&i3)$`tjxV_3rui>ihWe`26|&ql}Zh00001bW%=J06^y0W&i*L07*naRCodH z&jXCK+Z_ks=bSmC9V}|ww!%iWZQG4%+qP}ncCT&oTh6!h`qXWl8&^+$@t^+hKU08f zx@e9^zzrO2?OJG&M)l(Y5R||JeD=3qGYLHtJ!4{?bm)Z zZ`O)qB&I(TpL^D|hW*LPcsgGhiz}BKtPd}idhaPdR?mH>^4hs$e^Y;_jk+jKN^rUM}O`d4e{W(q6KyT&&lwYj-n$m zh&j@%?ELzVXEl)Y+8%AM4bUVEnu>q@(2;B(*ebxiAGX}978eu?d*yDsor|J5xUasr zt&YSR4Gmoe`hVCQt*l)uOvkf0n51cpgJJ01%kCdaB7^~PKXf5L(4dAr22kfM#uvsWTPaHcgMqm#5{+F4nl`+dFtr{q>9)X5XsT}K*w`kMr06d_7vlXaz&X&~16Rya^)i#;f{H$g zAwa^EKb(BxvYC+BdFk_VzF_aDltP`F9+2tRm)tAJA*sjfXD>@?@PI46YC0Yd2JgJb z>ZkAU-5>n=4o4hw!W~Yy!)*P)9cHVG#cXvptIxSZ`mf~|Ng~TNIaEJnWwe)Fu0M->T|>a?S`ef5m`8Se$&l%Bf(f%b7eQ9ZJ={2?KG>lH+s1g=-! zp^KC+xOsgmasWn(jZOGP2(i13Ti|eC5pZRXtty2(-+|bzEt=G%u1n1jtzO9C@I&Df zzCeJ>mO4!U$b-JMy0_Mh(y$z2g?5N9_`i$hPXaaM6mN^d`2YX_07*qoM6N<$f^6G> A5C8xG diff --git a/gkrellm.spec b/gkrellm.spec index 70be7d5..1203e23 100644 --- a/gkrellm.spec +++ b/gkrellm.spec @@ -1,31 +1,17 @@ -%global _hardened_build 1 - Name: gkrellm -Version: 2.3.11 -Release: 19%{?dist} +Version: 2.4.0 +Release: %autorelease Summary: Multiple stacked system monitors in one process -# Automatically converted from old format: GPLv3+ - review is highly recommended. License: GPL-3.0-or-later -URL: http://www.gkrellm.net/ -Source0: http://gkrellm.srcbox.net/releases/%{name}-%{version}.tar.bz2 -Source1: gkrellmd.service -Source2: gkrellm.desktop -Source3: gkrellm.png -Source4: gnome-gkrellm.appdata.xml +URL: https://gkrellm.srcbox.net/ +Source0: https://gkrellm.srcbox.net/releases/%{name}-%{version}.tar.bz2 Source5: make-git-snapshot.sh -Patch1: gkrellm-2.3.5-config.patch -Patch2: gkrellm-2.2.4-sansfont.patch -Patch3: gkrellm-2.2.7-width.patch -# Debian patches from https://sources.debian.org/patches/gkrellm/2.3.10-2/ -Patch10: 04_fix_manpage_hyphen.patch -Patch11: 05_bts437033_fix_strip.patch -Patch12: 10_fix_glib_underlinkage.patch +Patch1: gkrellm-2.4.0-config.patch +Patch3: gkrellm-2.4.0-width.patch BuildRequires: gcc BuildRequires: gtk2-devel openssl-devel libSM-devel desktop-file-utils gettext BuildRequires: lm_sensors-devel libntlm-devel libappstream-glib -%if 0%{?fedora} >= 41 Requires: gdk-pixbuf2-modules-extra%{?_isa} -%endif %description GKrellM charts CPU, load, Disk, and all active net interfaces @@ -67,7 +53,7 @@ Development files for the GNU Krell Monitors. %prep %autosetup -p1 -for i in gkrellmd.1 gkrellm.1 README Changelog Changelog-plugins.html \ +for i in gkrellmd.1 gkrellm.1 README Changelog.OLD Changelog-plugins.html \ src/gkrellm.h server/gkrellmd.h; do sed -i -e "s@/usr/lib/gkrellm2*/plugins@%{_libdir}/gkrellm2/plugins@" $i sed -i -e "s@/usr/local/lib/gkrellm2*/plugins@/usr/local/%{_lib}/gkrellm2/plugins@" $i @@ -75,39 +61,33 @@ done %build -make %{?_smp_mflags} INSTALLROOT=%{_prefix} PKGCONFIGDIR=%{_libdir}/pkgconfig \ - INCLUDEDIR=%{_includedir} CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE" \ +make %{?_smp_mflags} PREFIX=%{_prefix} PKGCONFIGDIR=%{_libdir}/pkgconfig \ + INCLUDEDIR=%{_includedir} \ + CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -Wno-error=incompatible-pointer-types" \ LDFLAGS="$RPM_LD_FLAGS" %install -mkdir -p $RPM_BUILD_ROOT%{_datadir}/gkrellm2/themes -mkdir -p $RPM_BUILD_ROOT%{_libdir}/gkrellm2/plugins +mkdir -p %{buildroot}%{_datadir}/gkrellm2/themes +mkdir -p %{buildroot}%{_libdir}/gkrellm2/plugins -make install \ - LOCALEDIR=$RPM_BUILD_ROOT%{_datadir}/locale \ - INSTALLDIR=$RPM_BUILD_ROOT%{_bindir} \ - SINSTALLDIR=$RPM_BUILD_ROOT%{_sbindir} \ - MANDIR=$RPM_BUILD_ROOT%{_mandir}/man1 \ - PKGCONFIGDIR=$RPM_BUILD_ROOT%{_libdir}/pkgconfig \ - INCLUDEDIR=$RPM_BUILD_ROOT%{_includedir} -install -Dpm 644 %{SOURCE1} $RPM_BUILD_ROOT%{_unitdir}/gkrellmd.service -install -Dpm 644 server/gkrellmd.conf \ - $RPM_BUILD_ROOT%{_sysconfdir}/gkrellmd.conf +make install DESTDIR=%{buildroot} PREFIX=%{_prefix} \ + LOCALEDIR=%{buildroot}%{_datadir}/locale \ + INSTALLDIR=%{buildroot}%{_bindir} \ + SINSTALLDIR=%{buildroot}%{_sbindir} \ + MANDIR=%{buildroot}%{_mandir}/man1 \ + PKGCONFIGDIR=%{buildroot}%{_libdir}/pkgconfig \ + INCLUDEDIR=%{buildroot}%{_includedir} \ + CFGDIR=%{buildroot}%{_sysconfdir} %find_lang %name -# below is the desktop file and icon stuff. -mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications -desktop-file-install --vendor gnome \ - --dir $RPM_BUILD_ROOT%{_datadir}/applications \ - %{SOURCE2} -mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps -install -p -m 644 %{SOURCE3} \ - $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps -mkdir -p $RPM_BUILD_ROOT%{_datadir}/appdata -install -p -m 644 %{SOURCE4} $RPM_BUILD_ROOT%{_datadir}/appdata -appstream-util validate-relax --nonet \ - $RPM_BUILD_ROOT%{_datadir}/appdata/gnome-%{name}.appdata.xml +# AppData file MUST be named with the same root as the .desktop file. +mv %{buildroot}%{_datadir}/applications/gkrellm.desktop \ + %{buildroot}%{_datadir}/applications/net.srcbox.gkrellm.GKrellM.desktop + +desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop +appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/*.metainfo.xml + %pre daemon getent group gkrellmd >/dev/null || groupadd -r gkrellmd @@ -127,14 +107,14 @@ useradd -r -g gkrellmd -M -d / -s /sbin/nologin -c "GNU Krell daemon" gkrellmd %files -f %{name}.lang %license COPYRIGHT -%doc Changelog README Themes.html +%doc CHANGELOG.md Changelog.OLD README Themes.html %{_bindir}/%{name} %{_libdir}/gkrellm2 %{_datadir}/gkrellm2 %{_mandir}/man1/%{name}.1* -%{_datadir}/appdata/gnome-%{name}.appdata.xml -%{_datadir}/applications/gnome-%{name}.desktop -%{_datadir}/icons/hicolor/48x48/apps/%{name}.png +%{_metainfodir}/*.metainfo.xml +%{_datadir}/applications/*.desktop +%{_datadir}/icons/hicolor/*/apps/%{name}.png %files devel %license %{_licensedir}/%{name}* @@ -150,567 +130,4 @@ useradd -r -g gkrellmd -M -d / -s /sbin/nologin -c "GNU Krell daemon" gkrellmd %changelog -* Thu Jan 16 2025 Fedora Release Engineering - 2.3.11-19 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Wed Dec 18 2024 Kevin Fenzi - 2.3.11-18 -- Rebuild for new libntlm soname bump. - -* Fri Jul 26 2024 Benjamin Gilbert - 2.3.11-17 -- Require gdk-pixbuf2-modules-extra on F41+ to fix crash (rhbz#2276464) - -* Thu Jul 25 2024 Miroslav Suchý - 2.3.11-16 -- convert license to SPDX - -* Thu Jul 18 2024 Fedora Release Engineering - 2.3.11-15 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Wed Jan 24 2024 Fedora Release Engineering - 2.3.11-14 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Fri Jan 19 2024 Fedora Release Engineering - 2.3.11-13 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Wed Jul 19 2023 Fedora Release Engineering - 2.3.11-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Thu Jan 19 2023 Fedora Release Engineering - 2.3.11-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Thu Jul 21 2022 Fedora Release Engineering - 2.3.11-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Thu Jan 20 2022 Fedora Release Engineering - 2.3.11-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Tue Sep 14 2021 Sahana Prasad - 2.3.11-8 -- Rebuilt with OpenSSL 3.0.0 - -* Thu Jul 22 2021 Fedora Release Engineering - 2.3.11-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek - 2.3.11-6 -- Rebuilt for updated systemd-rpm-macros - See https://pagure.io/fesco/issue/2583. - -* Tue Jan 26 2021 Fedora Release Engineering - 2.3.11-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Sat Aug 01 2020 Fedora Release Engineering - 2.3.11-4 -- Second attempt - Rebuilt for - https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Mon Jul 27 2020 Fedora Release Engineering - 2.3.11-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Tue Jan 28 2020 Fedora Release Engineering - 2.3.11-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Sun Aug 25 2019 Adam Goode - 2.3.11-1 -- Update to 2.3.11 (#1742316) -- Include Debian patches directly instead of via source - -* Thu Jul 25 2019 Fedora Release Engineering - 2.3.10-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Thu Jan 31 2019 Fedora Release Engineering - 2.3.10-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Sun Oct 14 2018 Peter Robinson 2.3.10-7 -- Drop old sys-v mingration bits - -* Fri Jul 13 2018 Fedora Release Engineering - 2.3.10-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Wed Feb 07 2018 Fedora Release Engineering - 2.3.10-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Wed Aug 02 2017 Fedora Release Engineering - 2.3.10-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Wed Jul 26 2017 Fedora Release Engineering - 2.3.10-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Fri Feb 10 2017 Fedora Release Engineering - 2.3.10-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Mon Oct 24 2016 Ville Skyttä - 2.3.10-1 -- Update to 2.3.10 - -* Wed Oct 12 2016 Ville Skyttä - 2.3.9-1 -- Update to 2.3.9 - -* Thu Sep 8 2016 Ville Skyttä - 2.3.8-1 -- Update to 2.3.8 - -* Thu Jul 14 2016 Ville Skyttä - 2.3.7-2 -- Patch to fix gkrellm.pc (#1356479) -- Optimize gkrellm.png with zopflipng - -* Sat Jun 4 2016 Ville Skyttä - 2.3.7-1 -- Update to 2.3.7 -- Make gkrellmd.conf noreplace again - -* Fri Feb 26 2016 Hans de Goede - 2.3.6-0.1.rc1.git20160226 -- Update to a 2.3.6-rc git snapshot for misc. fixes (inspired by Debian) -- Add a bunch of patches from Debian -- Add appdata - -* Wed Feb 03 2016 Fedora Release Engineering - 2.3.5-24 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Fri Oct 9 2015 Ville Skyttä - 2.3.5-23 -- Mark COPYRIGHT as %%license - -* Wed Jun 17 2015 Fedora Release Engineering - 2.3.5-22 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Sat Aug 16 2014 Fedora Release Engineering - 2.3.5-21 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Sat Jul 12 2014 Ville Skyttä - 2.3.5-20 -- Start daemon after lm_sensors (#1117750, DaveG) -- Specfile cleanups - -* Sat Jun 07 2014 Fedora Release Engineering - 2.3.5-19 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Fri Jan 10 2014 Ville Skyttä - 2.3.5-18 -- Patch daemon to allow binding to a listen address that doesn't exist yet. -- Use systemd macros in scriptlets (#850128). - -* Tue Dec 31 2013 Ville Skyttä - 2.3.5-17 -- Run icon through optipng (#1047215). - -* Wed Dec 11 2013 Ville Skyttä - 2.3.5-16 -- Use main package's doc dir for -devel and -daemon. - -* Fri Dec 6 2013 Ville Skyttä - 2.3.5-15 -- Fix build with -Werror=format-security (#1037086). - -* Sat Aug 03 2013 Fedora Release Engineering - 2.3.5-14 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Wed Feb 13 2013 Fedora Release Engineering - 2.3.5-13 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Fri Feb 8 2013 Ville Skyttä - 2.3.5-12 -- Systemd unit: add Documentation, remove obsolete After=syslog.target. -- Fix bogus dates in %%changelog. - -* Thu Jul 19 2012 Fedora Release Engineering - 2.3.5-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Mon Apr 23 2012 Ville Skyttä - 2.3.5-10 -- Build with hardening flags on. - -* Sun Jan 15 2012 Hans de Goede - 2.3.5-8 -- Explicitly link against gmodule-2.0 to fix building with latest glib - -* Fri Jan 13 2012 Fedora Release Engineering - 2.3.5-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Sun Nov 13 2011 Ville Skyttä - 2.3.5-7 -- Build with $RPM_LD_FLAGS. -- Clean up specfile stuff no longer needed with Fedora or EL6+. - -* Mon Jun 20 2011 Ville Skyttä - 2.3.5-5 -- Migrate daemon to systemd (#661656). -- Do icon dir timestamp update in %%post with lua. - -* Tue Feb 08 2011 Fedora Release Engineering - 2.3.5-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Tue Nov 16 2010 Hans de Goede - 2.3.5-3 -- Add COPYRIGHT file to -devel and -daemon sub-packages - -* Sun Oct 24 2010 Ville Skyttä - 2.3.5-2 -- Add StartupNotify and StartupWMClass to gkrellm.desktop. - -* Sun Oct 10 2010 Hans de Goede 2.3.5-1 -- New upstream release 2.3.5 - -* Mon Jun 21 2010 Ville Skyttä - 2.3.4-3 -- Make -devel gtk2-devel dependency ISA qualified. - -* Sun Feb 14 2010 Ville Skyttä - 2.3.4-2 -- Fix build with --no-add-needed (#564850). -- Fix plugin dir defaults in installed headers. -- Build with NTLM support. - -* Tue Jan 5 2010 Hans de Goede 2.3.4-1 -- New upstream release 2.3.4 - -* Tue Dec 22 2009 Hans de Goede 2.3.3-1 -- New upstream release 2.3.3 -- Fixes the gkrellm client crash when the gkrellm server reboots (#545327) -- Drop a number of upstreamed patches - -* Sun Dec 20 2009 Hans de Goede 2.3.2-8 -- Don't crash on laptops with dead batteries (#545987) -- Don't crash with transparent themes (#549005) - -* Fri Nov 27 2009 Hans de Goede 2.3.2-7 -- Fix crash when using multiple simap/spop mailboxes (#541824) - -* Fri Aug 21 2009 Tomas Mraz - 2.3.2-6 -- rebuilt with new openssl - -* Fri Jul 24 2009 Fedora Release Engineering - 2.3.2-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Tue Mar 17 2009 Ville Skyttä - 2.3.2-4 -- Sync icon cache update scriptlets with current Fedora guidelines. - -* Tue Feb 24 2009 Fedora Release Engineering - 2.3.2-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Fri Jan 16 2009 Tomas Mraz 2.3.2-2 -- rebuild with new openssl - -* Thu Oct 23 2008 Hans de Goede 2.3.2-1 -- New upstream release 2.3.2 -- Drop upstreamed memleak patch - -* Thu Oct 2 2008 Hans de Goede 2.3.1-6 -- Fix a small memory leak (which would accumulate over time) thanks to - Daniel Colascione for the patch (rh 464040) - -* Wed Sep 10 2008 Hans de Goede 2.3.1-5 -- Build against openssl instead of gnutls-openssl fixing symbol conflicts when - using pam_ldap (which uses openssl), this fixes rh 446860 - -* Wed Jun 25 2008 Tomas Mraz 2.3.1-4 -- rebuild with new gnutls - -* Wed Feb 13 2008 Hans de Goede 2.3.1-3 -- Fix building with latest glibc -- Rebuild for gcc 4.3 - -* Tue Dec 4 2007 Ville Skyttä - 2.3.1-2 -- Clean up desktop-file-utils 0.14 warnings. - -* Mon Dec 3 2007 Hans de Goede 2.3.1-1 -- New upstream release 2.3.1 -- Drop upstreamed gnutls and lm_sensors-3.0.0 patches - -* Wed Oct 24 2007 Hans de Goede 2.3.0-5 -- Add support for lm_sensors-3.0.0 - -* Wed Sep 5 2007 Ville Skyttä - 2.3.0-4 -- Rewrite gkrellmd init script: better LSB compliance, hddtemp - interoperability, avoidance of X error messages, general cleanup. - -* Tue Sep 4 2007 Ville Skyttä - 2.3.0-3 -- Fix gnutls detection/build and use it instead of openssl. -- Sync user and group creation with current Fedora guidelines. - -* Tue Aug 7 2007 Hans de Goede 2.3.0-2 -- Update License tag for new Licensing Guidelines compliance - -* Sun Jul 22 2007 Hans de Goede 2.3.0-1 -- New upstream release 2.3.0 - -* Fri Jul 20 2007 Hans de Goede 2.2.10-3 -- Rebuild, including libsensors support on ppc and ppc64 as lm_sensors is - available there now. - -* Wed Nov 8 2006 Hans de Goede 2.2.10-2 -- Add special case for via 686 volt sensors (bug 213304) - -* Tue Oct 31 2006 Hans de Goede 2.2.10-1 -- New upstream release 2.2.10 -- Drop integrated lmsensors and sysfs sensors patches - -* Thu Oct 05 2006 Christian Iseli 2.2.9-10 -- rebuilt for unwind info generation, broken in gcc-4.1.1-21 - -* Fri Sep 22 2006 Hans de Goede 2.2.9-9 -- Fixup .desktop so that gkrellm actually gets shown in the menu (bz 206775) - -* Mon Aug 28 2006 Hans de Goede 2.2.9-8 -- FE6 Rebuild - -* Sun Jul 16 2006 Hans de Goede 2.2.9-7 -- Add -r to groupadd -- Add || : to the gkrellmd service related scripts (deviation from the wiki). -- Don't make -devel package require the main one as it doesn't need it -- Install .desktop file with --vendor gnome to not break existing kde panel - buttons, etc. -- Drop "StartupNotify=false" from .desktop to not interfere with kde's - internal startup notification -- use gkrellmd as group in default gkrellmd.conf - -* Sat Jul 15 2006 Hans de Goede 2.2.9-6 -- Various specfile improvements by Ville Skyttä (ville.skytta@iki.fi) -- Make the daemon package scripts match the ScriptletSnippets wiki page -- Add LSB aliases (try-restart, force-reload) to the -daemon initscript -- Add %%{?dist} to the release for consistency with other packages I maintain - -* Sat Jul 15 2006 Hans de Goede 2.2.9-5 -- Remove Obsoletes/Provides gkrellm-server -- Don't remove user on uninstall -- Only build with lm_sensors support on x86 / x86_64 since lm_sensors is not - available on other archs. -- Use %%{_sysconfdir} instead of /etc in %%install - -* Fri Jul 7 2006 Hans de Goede 2.2.9-4 -- Moving to Fedora Extras, initial FE submission -- Various specfile improvements / cleanups -- Remove gkrellm-wireless (will be submitted as a separate package) -- Use libsensors instead of DIY code to read lm_sensors sensors -- Don't strip the binaries when installing so we get a usable -debuginfo rpm - -* Mon May 22 2006 Karsten Hopp 2.2.9-3 -- fix libdir patch - -* Mon May 15 2006 Karsten Hopp 2.2.9-2 -- fix header file conflict between 32bit and 64bit archs - -* Mon Apr 03 2006 Karsten Hopp 2.2.9-1 -- update to 2.2.9 -- remove explicit UID/GUIs from useradd/groupadd (#186974) - -* Tue Feb 28 2006 Karsten Hopp 2.2.7-7 -- BuildRequires: libSM-devel - -* Wed Feb 15 2006 Karsten Hopp 2.2.7-6 -- fix chkconfig requires - -* Fri Feb 10 2006 Jesse Keating - 2.2.7-5.2.1 -- bump again for double-long bug on ppc(64) - -* Tue Feb 07 2006 Jesse Keating - 2.2.7-5.2 -- rebuilt for new gcc4.1 snapshot and glibc changes - -* Fri Dec 09 2005 Jesse Keating -- rebuilt - -* Fri Nov 18 2005 Bill Nottingham 2.2.7-5 -- Fix references to obsolete /usr/X11R6 path - -* Wed Nov 9 2005 Tomas Mraz 2.2.7-4 -- rebuilt with new openssl - -* Tue Sep 06 2005 Karsten Hopp 2.2.7-3 -- fix path to gkrellm2 plugins on 64bit archs (#164066) - -* Thu Aug 18 2005 Florian La Roche -- the the kernel dep form a Requires: into a Conflicts: - -* Thu Jun 09 2005 Karsten Hopp 2.2.7-1 -- update to 2.2.7 -- add Requires: /sbin/chkconfig for -daemon subpackage -- allow gkrellm width up to 1600 pixel -- change spec file to valid UTF-8 (#159578) - -* Tue May 17 2005 Karsten Hopp 2.2.4-5 -- use Sans fonts (Ville Skytta, #157899) - -* Fri Apr 01 2005 Karsten Hopp 2.2.4-4 -- Include gkrellm2/plugins directories (Michael Schwendt) - #153073 - -* Wed Mar 02 2005 Karsten Hopp 2.2.4-3 -- build with gcc-4 - -* Thu Feb 03 2005 Karsten Hopp 2.2.4-2 -- BuildRequires openssl-devel (#137548) - -* Tue Nov 16 2004 Karsten Hopp 2.2.4-1 -- update - -* Mon Sep 06 2004 Karsten Hopp 2.2.2-2 -- change group of wireless subpackage (#131699) -- add icon - -* Tue Aug 03 2004 Karsten Hopp 2.2.2-1 -- update to 2.2.2 to fix pixbuf memory leak - -* Wed Jun 23 2004 Karsten Hopp 2.2.1-1 -- update to latest stable release - -* Tue Jun 15 2004 Elliot Lee -- rebuilt - -* Mon May 31 2004 Warren Togami 2.2.0-1 -- upgrade to 2.2.0 -- #123846 bogus dep -- Cleanup deps, build deps, and docs - -* Mon Mar 15 2004 Karsten Hopp 2.1.28-3 -- remove Provides: gkrellm-devel from main package (#117105) - -* Thu Mar 11 2004 Karsten Hopp 2.1.28-2 -- don't run gkrellmd as nobody, use a unique UID (#116314) -- fix chkconfig at package removal - -* Wed Mar 10 2004 Karsten Hopp 2.1.28-1 -- update -- add runlevel links with chkconfig (#107481) -- use slightly patched config file from the tarball for gkrellmd -- add wireless plugin - -* Wed Mar 03 2004 Karsten Hopp 2.1.26-2 -- fix -devel provision (#117105) -- remove stringfreeze hack - -* Tue Mar 02 2004 Elliot Lee -- rebuilt - -* Wed Feb 25 2004 Karsten Hopp 2.1.26-1 -- update to 2.1.26, which fixes sensor data being 10x to high (#115850) -- requires kernel >= 2.6.2 - -* Sat Feb 21 2004 Florian La Roche -- mv /etc/init.d -> /etc/rc.d/init.d - -* Fri Feb 13 2004 Elliot Lee -- rebuilt - -* Fri Jan 09 2004 Karsten Hopp 2.1.24-1 -- update to 2.1.24 - -* Mon Oct 13 2003 Karsten Hopp 2.1.21-1 -- update: -- fix temperature reads from /proc/acpi -- Use username instead of userid in session management userid property. - Fixes no session restarts in KDE 3.1.4. -- de.po update - -* Thu Oct 09 2003 Karsten Hopp 2.1.20-3 -- make it compatible with 3d party packages - -* Thu Oct 09 2003 Karsten Hopp 2.1.20-2 -- added patches from Ville Skyttä : - - Add icon for desktop entry - - Install daemon in %%{_sbindir} - - Include themes and plugins dirs in main package - - Make -daemon obsolete -server - - devel subpackage (disabled because of string freeze) - - -* Wed Oct 08 2003 Karsten Hopp 2.1.20-1 -- update to make it work with kernel 2.6 - -* Wed Oct 01 2003 Karsten Hopp 2.1.19-1 -- Update to 2.1.19, includes fix for #106073 - -* Tue Jul 08 2003 Karsten Hopp 2.1.14-3 -- run as user nobody -- fix file ownership - -* Mon Jul 07 2003 Karsten Hopp 2.1.14-2 -- add init script and config file for gkrellmd -- daemon subpackage -- fix pkgconfig file - -* Thu Jun 26 2003 Karsten Hopp 2.1.14-1 -- update to fix buffer overflow in gkrellmd_client_read - -* Wed Jun 18 2003 Karsten Hopp 2.1.13-1 -- update - -* Wed Jun 04 2003 Elliot Lee -- rebuilt - -* Mon May 05 2003 Karsten Hopp 2.1.9-2 -- rebuild - -* Thu Apr 10 2003 Karsten Hopp 2.1.9-1 -- update to 2.1.9 -- daily/weekly/monthly transfer stats - -* Wed Jan 22 2003 Tim Powers -- rebuilt - -* Tue Jan 14 2003 Karsten Hopp 2.1.5-2 -- rename menu entry (#81876) - -* Sun Jan 12 2003 Karsten Hopp 2.1.5-1 -- update (#81620) - -* Mon Dec 16 2002 Tim Powers 2.1.3-2 -- rebuild - -* Wed Dec 11 2002 Karsten Hopp -- 2.1.3-1 -- Battery monitor can display multiple batteries -- Net timer lost the minutes display with large connect times -- use disk stats from /proc/partitions if available - -* Tue Dec 03 2002 Karsten Hopp 2.1.2-1 -- updated translations -- .desktop file (#78562) -- minor bugfixes - -* Mon Nov 11 2002 Karsten Hopp -- update to 2.1 (glib2, gtk2) - -* Wed Jul 17 2002 Karsten Hopp -- update -- own /usr/include/gkrellm directory - -* Fri Jun 21 2002 Tim Powers -- automated rebuild - -* Tue Jun 11 2002 Karsten Hopp -- Update to 1.2.11 - -* Thu May 23 2002 Tim Powers -- automated rebuild - -* Wed Feb 27 2002 Karsten Hopp -- Update to 1.2.9 - -* Wed Jan 23 2002 Karsten Hopp -- Update to 1.2.6 - -* Wed Jan 09 2002 Tim Powers -- automated rebuild - -* Thu Dec 13 2001 Karsten Hopp -- update to 1.2.5-1 -- nls patch not required anymore - -* Mon Nov 26 2001 Karsten Hopp -- enable nls - -* Mon Nov 26 2001 Karsten Hopp -- update to 1.2.4 - -* Fri Jul 6 2001 Trond Eivind Glomsrød -- s/Copyright/License/ -- Add %%defattr -- langify -- Don't define name, ver and rel at the top of the spec file - -* Wed Jun 27 2001 Karsten Hopp -- fix _mandir -- fix BuildRequires - -* Wed Jun 27 2001 SATO Satoru -- clean up (use system-defined macros) -- enable NLS - -* Wed Mar 14 2001 Rob Lineweaver -- fixed new manpage inclusion for newer RPM versions -- source is 1.0.7 -- compiled for PPC and i386 - -* Fri Jan 19 2001 Kevin Ford -- general cleanup of spec file - -* Thu Jan 18 2001 Kevin Ford -- Updated spec file to work with both v3 & v4 rpm -- moved changelog to bottom of spec file -- added defines for common items - -* Thu Apr 6 2000 Bill Wilson -- added INCLUDEDIR to the make install - -* Fri Oct 29 1999 Gary Thomas -- .spec file still broken - -* Thu Oct 7 1999 David Mihm -- fixed spec. +%autochangelog diff --git a/gkrellmd.service b/gkrellmd.service deleted file mode 100644 index dcbac9f..0000000 --- a/gkrellmd.service +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=GNU Krell Monitors server -Documentation=man:gkrellmd(1) -After=hddtemp.service lm_sensors.service - -[Service] -ExecStart=/usr/sbin/gkrellmd - -[Install] -WantedBy=multi-user.target diff --git a/gnome-gkrellm.appdata.xml b/gnome-gkrellm.appdata.xml deleted file mode 100644 index a9e893a..0000000 --- a/gnome-gkrellm.appdata.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - gnome-gkrellm.desktop - CC0-1.0 - GPL-2.0+ - GKrellM - Monitor for CPU, memory, disks, network, mail - -

- GKrellM is a single process stack of system monitors which supports - applying themes to match its appearance to your window manager, Gtk, - or any other theme. -

-

Features:

-
    -
  • Hostname/systemname display
    • -
  • Clock/calendar
    • -
  • Temperature, fan, and voltage sensor monitors
    • -
  • Process monitor with a chart for load and forks
    • -
  • Display of number of current processes and users
    • -
  • Disk monitor that can chart individual disks or a composite disk
    • -
  • Internet monitor (http, ftp, ...)
    • -
  • Net interface monitors, Data rx/tx LEDs
    • -
  • And much more
    • -
- - https://billw2.github.io/gkrellm/gkrellm.html - - https://billw2.github.io/gkrellm/gkrellm.png - https://billw2.github.io/gkrellm/gkrellm0.png - - jwrdegoede_at_fedoraproject.org - diff --git a/sources b/sources index 30e626a..9513bac 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gkrellm-2.3.11.tar.bz2) = e4147aa90e09925b9672728f287880bde26632d77d83d3f0b9458a201593a57158d9eb8cbb31e569e0d71d91a08c9bceba29814f59e542315775663ef9fd27a9 +SHA512 (gkrellm-2.4.0.tar.bz2) = 770acfe5ee23b74ffe5becc89d3735e9e8688ac338b052e1c2f86cb722b7867b1f8c262a969ef3140eb32912cf0426ac13bf3743e2a9149eec2a962655e05a9f From 59cf897abccf93463acf1e3460cc16aa27160da6 Mon Sep 17 00:00:00 2001 From: Adam Goode Date: Mon, 20 Jan 2025 01:59:40 -0500 Subject: [PATCH 23/26] Don't rename desktop file, it's referenced elsewhere --- gkrellm.spec | 4 ---- 1 file changed, 4 deletions(-) diff --git a/gkrellm.spec b/gkrellm.spec index 1203e23..a1d2b08 100644 --- a/gkrellm.spec +++ b/gkrellm.spec @@ -81,10 +81,6 @@ make install DESTDIR=%{buildroot} PREFIX=%{_prefix} \ CFGDIR=%{buildroot}%{_sysconfdir} %find_lang %name -# AppData file MUST be named with the same root as the .desktop file. -mv %{buildroot}%{_datadir}/applications/gkrellm.desktop \ - %{buildroot}%{_datadir}/applications/net.srcbox.gkrellm.GKrellM.desktop - desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/*.metainfo.xml From 2b578a6ef9aba7d44b88846f7fb0c6aed3f42fc5 Mon Sep 17 00:00:00 2001 From: Adam Goode Date: Mon, 20 Jan 2025 09:48:37 -0500 Subject: [PATCH 24/26] Fix systemd unit file to point to correct gkrellmd location --- gkrellm.spec | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/gkrellm.spec b/gkrellm.spec index a1d2b08..e65dc71 100644 --- a/gkrellm.spec +++ b/gkrellm.spec @@ -61,10 +61,12 @@ done %build -make %{?_smp_mflags} PREFIX=%{_prefix} PKGCONFIGDIR=%{_libdir}/pkgconfig \ - INCLUDEDIR=%{_includedir} \ - CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -Wno-error=incompatible-pointer-types" \ - LDFLAGS="$RPM_LD_FLAGS" +make %{?_smp_mflags} PREFIX=%{_prefix} \ + PKGCONFIGDIR=%{_libdir}/pkgconfig \ + INCLUDEDIR=%{_includedir} \ + SINSTALLDIR=%{_sbindir} \ + CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -Wno-error=incompatible-pointer-types" \ + LDFLAGS="$RPM_LD_FLAGS" %install From d4eb3dfb8efe2275742b69a936199713dd9fc301 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 11 Feb 2025 15:35:18 +0100 Subject: [PATCH 25/26] Add sysusers.d config file to allow rpm to create users/groups automatically See https://fedoraproject.org/wiki/Changes/RPMSuportForSystemdSysusers. --- gkrellm.spec | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/gkrellm.spec b/gkrellm.spec index e65dc71..26746cf 100644 --- a/gkrellm.spec +++ b/gkrellm.spec @@ -32,7 +32,7 @@ Summary: The GNU Krell Monitors Server # systemd >= 186 for scriptlet macros BuildRequires: systemd >= 186 BuildRequires: make -Requires(pre): shadow-utils systemd +Requires(pre): systemd Requires(post,preun,postun): systemd @@ -59,6 +59,11 @@ for i in gkrellmd.1 gkrellm.1 README Changelog.OLD Changelog-plugins.html \ sed -i -e "s@/usr/local/lib/gkrellm2*/plugins@/usr/local/%{_lib}/gkrellm2/plugins@" $i done +# Create a sysusers.d config file +cat >gkrellm.sysusers.conf </dev/null || groupadd -r gkrellmd -getent passwd gkrellmd >/dev/null || \ -useradd -r -g gkrellmd -M -d / -s /sbin/nologin -c "GNU Krell daemon" gkrellmd -: %post daemon %systemd_post gkrellmd.service @@ -125,6 +127,7 @@ useradd -r -g gkrellmd -M -d / -s /sbin/nologin -c "GNU Krell daemon" gkrellmd %{_sbindir}/gkrellmd %{_mandir}/man1/gkrellmd.* %config(noreplace) %{_sysconfdir}/gkrellmd.conf +%{_sysusersdir}/gkrellm.conf %changelog From 4caa22f9317bbca584ffb63905ebdd61799dea43 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 23 Jul 2025 22:26:30 +0000 Subject: [PATCH 26/26] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild