public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Adam Goode <adam@spicenitz.org>
To: git-commits@fedoraproject.org
Subject: [rpms/gkrellm] main: Update gkrellm to 2.5.1 (rhbz#2422065)
Date: Sat, 13 Jun 2026 16:29:58 GMT [thread overview]
Message-ID: <178136819832.1.8753001080126903194.rpms-gkrellm-0c57f403834c@fedoraproject.org> (raw)
A new commit has been pushed.
Repo : rpms/gkrellm
Branch : main
Commit : 0c57f403834c1ce2bff986f0ba518ed4f326452d
Author : Adam Goode <adam@spicenitz.org>
Date : 2026-06-13T12:28:52-04:00
Stats : +45/-50 in 4 file(s)
URL : https://src.fedoraproject.org/rpms/gkrellm/c/0c57f403834c1ce2bff986f0ba518ed4f326452d?branch=main
Log:
Update gkrellm to 2.5.1 (rhbz#2422065)
- Use meson to build
---
diff --git a/gkrellm-2.4.0-config.patch b/gkrellm-2.4.0-config.patch
deleted file mode 100644
index 4d85e99..0000000
--- a/gkrellm-2.4.0-config.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -up gkrellm-2.3.5/server/gkrellmd.conf.config gkrellm-2.3.5/server/gkrellmd.conf
---- gkrellm-2.3.5/server/gkrellmd.conf.config 2010-09-14 17:26:19.000000000 +0300
-+++ gkrellm-2.3.5/server/gkrellmd.conf 2011-06-19 19:17:56.398591498 +0300
-@@ -22,16 +22,17 @@
- # List of hosts allowed to connect. If no hosts are specified in a
- # gkrellmd.conf file or on the command line, all hosts will be allowed.
- #
--#allow-host localhost
--#allow-host 127.0.0.1
-+allow-host localhost
-+allow-host 127.0.0.1
-+allow-host ::ffff:127.0.0.1
- #allow-host ::1
- #allow-host 192.168.0.*
-
- # Drop privileges after startup (you must start gkrellmd as root to do it).
- # NOTE: Option ignored on Windows
- #
--#user nobody
--#group proc
-+user gkrellmd
-+group gkrellmd
-
- # Create a PID file for the running gkrellmd. Default is no PID file.
- # NOTE: Option ignored on Windows
diff --git a/gkrellm-2.5.1-config.patch b/gkrellm-2.5.1-config.patch
new file mode 100644
index 0000000..5dd6702
--- /dev/null
+++ b/gkrellm-2.5.1-config.patch
@@ -0,0 +1,25 @@
+diff -ur gkrellm-2.5.1.orig/data/gkrellmd.conf gkrellm-2.5.1/data/gkrellmd.conf
+--- gkrellm-2.5.1.orig/data/gkrellmd.conf 2026-02-22 06:12:05.000000000 -0500
++++ gkrellm-2.5.1/data/gkrellmd.conf 2026-06-13 11:29:53.208912884 -0400
+@@ -22,16 +22,17 @@
+ # List of hosts allowed to connect. If no hosts are specified in a
+ # gkrellmd.conf file or on the command line, all hosts will be allowed.
+ #
+-#allow-host localhost
+-#allow-host 127.0.0.1
++allow-host localhost
++allow-host 127.0.0.1
++allow-host ::ffff:127.0.0.1
+ #allow-host ::1
+ #allow-host 192.168.0.*
+
+ # Drop privileges after startup (you must start gkrellmd as root to do it).
+ # NOTE: Option ignored on Windows
+ #
+-#user nobody
+-#group proc
++user gkrellmd
++group gkrellmd
+
+ # Create a PID file for the running gkrellmd. Default is no PID file.
+ # NOTE: Option ignored on Windows
diff --git a/gkrellm.spec b/gkrellm.spec
index 26746cf..2068012 100644
--- a/gkrellm.spec
+++ b/gkrellm.spec
@@ -1,16 +1,23 @@
Name: gkrellm
-Version: 2.4.0
+Version: 2.5.1
Release: %autorelease
Summary: Multiple stacked system monitors in one process
License: GPL-3.0-or-later
URL: https://gkrellm.srcbox.net/
Source0: https://gkrellm.srcbox.net/releases/%{name}-%{version}.tar.bz2
Source5: make-git-snapshot.sh
-Patch1: gkrellm-2.4.0-config.patch
+Patch1: gkrellm-2.5.1-config.patch
Patch3: gkrellm-2.4.0-width.patch
+BuildRequires: meson
BuildRequires: gcc
-BuildRequires: gtk2-devel openssl-devel libSM-devel desktop-file-utils gettext
-BuildRequires: lm_sensors-devel libntlm-devel libappstream-glib
+BuildRequires: pkgconfig(libsystemd)
+BuildRequires: pkgconfig(gtk+-2.0)
+BuildRequires: pkgconfig(openssl)
+BuildRequires: pkgconfig(sm)
+BuildRequires: pkgconfig(libntlm)
+BuildRequires: desktop-file-utils gettext
+BuildRequires: lm_sensors-devel libappstream-glib
+BuildRequires: make
Requires: gdk-pixbuf2-modules-extra%{?_isa}
%description
@@ -29,9 +36,6 @@ Additional features are:
%package daemon
Summary: The GNU Krell Monitors Server
-# systemd >= 186 for scriptlet macros
-BuildRequires: systemd >= 186
-BuildRequires: make
Requires(pre): systemd
Requires(post,preun,postun): systemd
@@ -53,7 +57,7 @@ Development files for the GNU Krell Monitors.
%prep
%autosetup -p1
-for i in gkrellmd.1 gkrellm.1 README Changelog.OLD Changelog-plugins.html \
+for i in docs/gkrellmd.1 docs/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
@@ -65,27 +69,19 @@ u gkrellmd - 'GNU Krell daemon' - -
EOF
+%conf
+%meson
+
+
%build
-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"
+%meson_build
%install
mkdir -p %{buildroot}%{_datadir}/gkrellm2/themes
mkdir -p %{buildroot}%{_libdir}/gkrellm2/plugins
-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}
+%meson_install
%find_lang %name
desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
@@ -94,7 +90,6 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/*.metainfo.xml
install -m0644 -D gkrellm.sysusers.conf %{buildroot}%{_sysusersdir}/gkrellm.conf
-
%post daemon
%systemd_post gkrellmd.service
@@ -119,7 +114,7 @@ install -m0644 -D gkrellm.sysusers.conf %{buildroot}%{_sysusersdir}/gkrellm.conf
%files devel
%license %{_licensedir}/%{name}*
%{_includedir}/gkrellm2
-%{_libdir}/pkgconfig/%{name}.pc
+%{_libdir}/pkgconfig/%{name}*.pc
%files daemon
%license %{_licensedir}/%{name}*
diff --git a/sources b/sources
index 9513bac..23b92b7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (gkrellm-2.4.0.tar.bz2) = 770acfe5ee23b74ffe5becc89d3735e9e8688ac338b052e1c2f86cb722b7867b1f8c262a969ef3140eb32912cf0426ac13bf3743e2a9149eec2a962655e05a9f
+SHA512 (gkrellm-2.5.1.tar.bz2) = beb9d90267cd2eb8c74b5e8276835e8012c8104d31d21491bfd14444b83a5f38d3b7d06c1894ac3041ae60d969493bbc177129759769402a34ed4e41d46039de
reply other threads:[~2026-06-13 16:29 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=178136819832.1.8753001080126903194.rpms-gkrellm-0c57f403834c@fedoraproject.org \
--to=adam@spicenitz.org \
--cc=git-commits@fedoraproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox