diff --git a/hardware/info/gkrellm/actions.py b/hardware/info/gkrellm/actions.py index 36ecac8a26..53d87c0685 100644 --- a/hardware/info/gkrellm/actions.py +++ b/hardware/info/gkrellm/actions.py @@ -2,38 +2,28 @@ # -*- coding: utf-8 -*- # # Licensed under the GNU General Public License, version 3. -# See the file http://www.gnu.org/licenses/gpl.txt +# See the file https://www.gnu.org/licenses/gpl-3.0.txt -from pisi.actionsapi import autotools -from pisi.actionsapi import pisitools -from pisi.actionsapi import shelltools -from pisi.actionsapi import get +from pisi.actionsapi import autotools, pisitools, get +i = ''.join([ + ' without-gnutls=no', + ' without-ssl=yes', + ' without-ntlm=yes', + ' without-libsensors=yes', + ' INSTALLROOT=/usr', + ' INCLUDEDIR=/usr/include/gkrellm2', + ' CFLAGS=\'%s\'' % get.CFLAGS(), + ' LDFLAGS=\'%s\' ' % get.LDFLAGS() + ]) def build(): - shelltools.export("LDFLAGS", "%s -lgmodule-2.0" % get.LDFLAGS()) - autotools.make('CC=%s \ - INSTALLROOT=/usr \ - INCLUDEDIR=/usr/include/gkrellm2 \ - LOCALEDIR=/usr/share/locale \ - STRIP="" \ - LINK_FLAGS="%s -Wl,-E" \ - enable_nls=1 \ - without-ssl=yes \ - without-sensors=no \ - without-libsensors=yes' % (get.CC(), get.LDFLAGS())) - # without ssl option enables gnutls + autotools.make(i) def install(): - autotools.rawInstall("DESTDIR=%s \ - PREFIX=/usr" % get.installDIR()) - - pisitools.insinto("/etc", "server/gkrellmd.conf") - - pisitools.doman("gkrellm.1") - pisitools.doman("gkrellmd.1") - - pisitools.dodoc("CREDITS", "README", "Changelog", "COPYRIGHT") - pisitools.dohtml("*") - + a = get.installDIR() + b = "DESTDIR=%s PREFIX=/usr CFGDIR=%s/etc" % (a, a) + autotools.rawInstall(b) + pisitools.dodoc("CREDITS", "COPYRIGHT", "COPYING") + pisitools.removeDir("/usr/lib/systemd") diff --git a/hardware/info/gkrellm/pspec.xml b/hardware/info/gkrellm/pspec.xml index a5007bfa1e..f5bdebe226 100644 --- a/hardware/info/gkrellm/pspec.xml +++ b/hardware/info/gkrellm/pspec.xml @@ -1,61 +1,42 @@ - + gkrellm - https://www.gkrellm.net/ + https://gkrellm.srcbox.net/ PisiLinux Community admins@pisilinux.org - GPLv2 + GPLv3 gkrellm app:gui service - A compact and clean system monitoring tool + A compact and clean system monitoring tool. A program to monitor system status, and to collect system information such as memory usage, cpu temperature etc. - https://gkrellm.srcbox.net/releases/gkrellm-2.3.11.tar.bz2 + https://gkrellm.srcbox.net/releases/gkrellm-2.4.0.tar.bz2 - gnutls-devel gtk2-devel - pango-devel - libX11-devel - glib2-devel - libgcrypt-devel - libICE-devel libSM-devel + gnutls-devel - drop_privileges.patch - gkrellmd-conf.patch + gkrellm - gnutls gtk2 - pango - glib2 - libX11 - libgcrypt - libICE - gdk-pixbuf libSM + gnutls /etc /usr/bin - /usr/lib - /usr/share/doc /usr/share - /usr/share/man - - gkrellm.desktop - gkrellm.png - System.Service @@ -65,8 +46,8 @@ gkrellm-devel Development files for gkrellm - gkrellm gtk2-devel + gkrellm /usr/include @@ -75,6 +56,13 @@ + + 2025-01-29 + 2.4.0 + Version bump. + Pisi Linux community + admins@pisilinux.org + 2024-11-29 2.3.11