commit gkrellm for openSUSE:Factory
Hello community,
here is the log from the commit of package gkrellm for openSUSE:Factory checked
in at 2019-11-15 00:39:18
Comparing /work/SRC/openSUSE:Factory/gkrellm (Old)
and /work/SRC/openSUSE:Factory/.gkrellm.new.26869 (New)
Package is "gkrellm"
Fri Nov 15 00:39:18 2019 rev:39 rq:748752 version:2.3.11
Changes:
--- /work/SRC/openSUSE:Factory/gkrellm/gkrellm.changes 2019-04-19
18:38:41.831208650 +0200
+++ /work/SRC/openSUSE:Factory/.gkrellm.new.26869/gkrellm.changes
2019-11-15 00:39:18.903693240 +0100
@@ -1,0 +2,7 @@
+Mon Nov 11 13:40:05 UTC 2019 - Hans-Peter Jansen
+
+- updated to 2.3.11:
+ * see http://git.srcbox.net/gkrellm/log/
+- removed gkrellm-2.3.10-d51b57616e.patch (released upstream now)
+
+---
Old:
gkrellm-2.3.10-d51b57616e.patch
gkrellm-2.3.10.tar.bz2
New:
gkrellm-2.3.11.tar.bz2
Other differences:
--
++ gkrellm.spec ++
--- /var/tmp/diff_new_pack.QbpLlM/_old 2019-11-15 00:39:19.683693180 +0100
+++ /var/tmp/diff_new_pack.QbpLlM/_new 2019-11-15 00:39:19.687693180 +0100
@@ -17,7 +17,7 @@
Name: gkrellm
-Version:2.3.10
+Version:2.3.11
Release:0
Summary:Manages Multiple Stacked Monitors
License:GPL-3.0-or-later
@@ -34,10 +34,8 @@
%endif
# PATCH-FIX-OPENSUSE gkrellm-lib64-plugins-dir.patch pgaj...@suse.cz -- look
also into /usr/lib64/gkrellm2/plugins
Patch1: %{name}-lib64-plugins-dir.patch
-# PATCH-FIX-UPSTREAM gkrellm-2.3.10-d51b57616e.patch h...@urpla.net -- apply
upstream git master changes, contains a number of fixes, including
gkrellm-2.3.5-fix-sdX-sort-order.patch and
gkrellm-2.3.5-fix-diskio-corruption.patch
-Patch2: %{name}-2.3.10-d51b57616e.patch
# PATCH-FIX-OPENSUSE gkrellm-install-and-reconnect-gkrellmd.conf.patch
h...@urpla.net -- install /etc/gkrellmd.conf and make reconnect default
-Patch3: %{name}-install-and-reconnect-gkrellmd.conf.patch
+Patch2: %{name}-install-and-reconnect-gkrellmd.conf.patch
BuildRequires: gtk2-devel
BuildRequires: libsensors4-devel
@@ -111,7 +109,6 @@
%setup -q
%patch1 -p1
%patch2 -p1
-%patch3 -p1
%build
cd src
++ gkrellm-2.3.10.tar.bz2 -> gkrellm-2.3.11.tar.bz2 ++
1623 lines of diff (skipped)
commit gkrellm for openSUSE:Factory
Hello community,
here is the log from the commit of package gkrellm for openSUSE:Factory checked
in at 2019-04-19 18:38:40
Comparing /work/SRC/openSUSE:Factory/gkrellm (Old)
and /work/SRC/openSUSE:Factory/.gkrellm.new.5536 (New)
Package is "gkrellm"
Fri Apr 19 18:38:40 2019 rev:38 rq:69 version:2.3.10
Changes:
--- /work/SRC/openSUSE:Factory/gkrellm/gkrellm.changes 2018-11-26
10:29:29.469085338 +0100
+++ /work/SRC/openSUSE:Factory/.gkrellm.new.5536/gkrellm.changes
2019-04-19 18:38:41.831208650 +0200
@@ -1,0 +2,8 @@
+Wed Apr 17 10:35:50 UTC 2019 - Hans-Peter Jansen
+
+- apply patch gkrellm-2.3.10-d51b57616e.patch with upstream git master
+ changes, contains a number of important fixes, including improved
+ gkrellm-2.3.5-fix-diskio-corruption.patch and
+ gkrellm-2.3.5-fix-sdX-sort-order.patch
+
+---
Old:
gkrellm-2.3.5-fix-diskio-corruption.patch
gkrellm-2.3.5-fix-sdX-sort-order.patch
New:
gkrellm-2.3.10-d51b57616e.patch
Other differences:
--
++ gkrellm.spec ++
--- /var/tmp/diff_new_pack.W6Hva8/_old 2019-04-19 18:38:43.999211404 +0200
+++ /var/tmp/diff_new_pack.W6Hva8/_new 2019-04-19 18:38:44.031211444 +0200
@@ -1,7 +1,7 @@
#
# spec file for package gkrellm
#
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -34,12 +34,10 @@
%endif
# PATCH-FIX-OPENSUSE gkrellm-lib64-plugins-dir.patch pgaj...@suse.cz -- look
also into /usr/lib64/gkrellm2/plugins
Patch1: %{name}-lib64-plugins-dir.patch
-# PATCH-FIX-OPENSUSE gkrellm-2.3.5-fix-sdX-sort-order.patch
seife+...@b1-systems.com -- fix sort order for scsi-style disks sda,sdb,sdc,...
-Patch2: %{name}-2.3.5-fix-sdX-sort-order.patch
-# PATCH-FIX-OPENSUSE gkrellm-2.3.5-fix-diskio-corruption.patch
seife+...@b1-systems.com -- fix corruption in chart labels
-Patch3: %{name}-2.3.5-fix-diskio-corruption.patch
+# PATCH-FIX-UPSTREAM gkrellm-2.3.10-d51b57616e.patch h...@urpla.net -- apply
upstream git master changes, contains a number of fixes, including
gkrellm-2.3.5-fix-sdX-sort-order.patch and
gkrellm-2.3.5-fix-diskio-corruption.patch
+Patch2: %{name}-2.3.10-d51b57616e.patch
# PATCH-FIX-OPENSUSE gkrellm-install-and-reconnect-gkrellmd.conf.patch
h...@urpla.net -- install /etc/gkrellmd.conf and make reconnect default
-Patch4: %{name}-install-and-reconnect-gkrellmd.conf.patch
+Patch3: %{name}-install-and-reconnect-gkrellmd.conf.patch
BuildRequires: gtk2-devel
BuildRequires: libsensors4-devel
@@ -114,7 +112,6 @@
%patch1 -p1
%patch2 -p1
%patch3 -p1
-%patch4 -p1
%build
cd src
++ gkrellm-2.3.10-d51b57616e.patch ++
diff --git a/Changelog b/Changelog
index b078036..ee52938 100644
--- a/Changelog
+++ b/Changelog
@@ -38,7 +38,7 @@ GKrellM Changelog
* Patch from Gerard Neil: Skip autofs mounts in free disk space polling
* Patch from Gerard Neil: Handle cifs as remote filesystem to use longer
nfs-timeout polling interval
- * Patch from Alexandre Rostovtsev: Explicitely link against gmodule-2.0
+ * Patch from Alexandre Rostovtsev: Explicitly link against gmodule-2.0
* Add support for GPU-Z sensor information on Windows
* Increase minimum required GLib version to 2.32, some parts of gkrellm
use newer GLib API
@@ -151,7 +151,7 @@ GKrellM Changelog
Use unicode function calls.
Use getaddrinfo() on win32.
Support CoreTemp application for getting cpu temperatures.
- Redo sensor-handling to support multipe sensor backends.
+ Redo sensor-handling to support multiple sensor backends.
Make Proc monitor work and properly count # of logged in users.
Mem monitor displays cache bytes.
System name shows some new windows versions.
diff --git a/README b/README
index 84df8ac..b8f59d4 100644
--- a/README
+++ b/README
@@ -549,7 +549,7 @@ The reasons for this choice are a) efficiency (though it
might be possible
to open/close /dev/sysmon each time a reading is needed without major
performance issue) and b) as of october 2001, there's a bug in the
envsys(4) driver which sometimes causes deadlocks when processes try to
-access simultaneoulsy /dev/sysmon (see NetBSD PR#14368). A (quick and
+access simultaneously /dev/sysmon (see NetBSD PR#14368). A (quick and
dirty) workaround for this is to monopolize the driver :)
diff --git a/Themes.html b/Themes.html
commit gkrellm for openSUSE:Factory
Hello community,
here is the log from the commit of package gkrellm for openSUSE:Factory checked
in at 2018-11-26 10:29:15
Comparing /work/SRC/openSUSE:Factory/gkrellm (Old)
and /work/SRC/openSUSE:Factory/.gkrellm.new.19453 (New)
Package is "gkrellm"
Mon Nov 26 10:29:15 2018 rev:37 rq:651318 version:2.3.10
Changes:
--- /work/SRC/openSUSE:Factory/gkrellm/gkrellm.changes 2016-12-13
19:34:21.750284406 +0100
+++ /work/SRC/openSUSE:Factory/.gkrellm.new.19453/gkrellm.changes
2018-11-26 10:29:29.469085338 +0100
@@ -1,0 +2,13 @@
+Thu Nov 22 14:12:54 UTC 2018 - Hans-Peter Jansen
+
+- add patch gkrellm-install-and-reconnect-gkrellmd.conf.patch
+ in order to install /etc/gkrellmd.conf properly and make reconnect
+ default
+- refresh patches
+
+---
+Thu Nov 8 14:36:59 UTC 2018 - Hans-Peter Jansen
+
+- separate gkrellmd package
+
+---
New:
gkrellm-install-and-reconnect-gkrellmd.conf.patch
Other differences:
--
++ gkrellm.spec ++
--- /var/tmp/diff_new_pack.pUXd3Q/_old 2018-11-26 10:29:30.849083719 +0100
+++ /var/tmp/diff_new_pack.pUXd3Q/_new 2018-11-26 10:29:30.853083715 +0100
@@ -1,7 +1,7 @@
#
# spec file for package gkrellm
#
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -12,7 +12,7 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
@@ -20,7 +20,7 @@
Version:2.3.10
Release:0
Summary:Manages Multiple Stacked Monitors
-License:GPL-3.0+
+License:GPL-3.0-or-later
Group: System/Monitoring
Url:http://gkrellm.srcbox.net/
Source: http://gkrellm.srcbox.net/releases/%{name}-%{version}.tar.bz2
@@ -38,6 +38,9 @@
Patch2: %{name}-2.3.5-fix-sdX-sort-order.patch
# PATCH-FIX-OPENSUSE gkrellm-2.3.5-fix-diskio-corruption.patch
seife+...@b1-systems.com -- fix corruption in chart labels
Patch3: %{name}-2.3.5-fix-diskio-corruption.patch
+# PATCH-FIX-OPENSUSE gkrellm-install-and-reconnect-gkrellmd.conf.patch
h...@urpla.net -- install /etc/gkrellmd.conf and make reconnect default
+Patch4: %{name}-install-and-reconnect-gkrellmd.conf.patch
+
BuildRequires: gtk2-devel
BuildRequires: libsensors4-devel
%if 0%{?suse_version} > 1220
@@ -90,6 +93,13 @@
* A different theme can be created with the GIMP.
+%package -n gkrellmd
+Summary:Multiple Stacked Monitors daemon
+Group: System/Monitoring
+
+%description -n gkrellmd
+The GNU Grell Monitors daemon service, independent from any GUI library.
+
%package devel
Summary:Files needed for gkrellm2 development
Group: Development/Sources
@@ -101,9 +111,10 @@
%lang_package
%prep
%setup -q
-%patch1
+%patch1 -p1
%patch2 -p1
%patch3 -p1
+%patch4 -p1
%build
cd src
@@ -117,7 +128,9 @@
make install STRIP= \
X11_LIBS="-L/usr/X11R6/%{_lib} -lX11 -lSM -lICE" \
INSTALLROOT=%{buildroot}%{_prefix} \
+ CFGDIR=%{buildroot}%{_sysconfdir} \
PKGCONFIGDIR=%{buildroot}%{_libdir}/pkgconfig
+
for i in {16,24,32,48}; do
mkdir -p %{buildroot}%{_datadir}/icons/hicolor/"$i"x"$i"/apps
done
@@ -132,16 +145,18 @@
%endif
%if 0%{?suse_version} > 1220
install -D -m 0644 %{SOURCE6} %{buildroot}%{_unitdir}/gkrellmd.service
+mkdir -p %{buildroot}%{_sbindir}
+ln -s /sbin/service %{buildroot}%{_sbindir}/rcgkrellmd
%endif
%suse_update_desktop_file -i %name
%find_lang %{name} %{?no_lang_C}
%if 0%{?suse_version} > 1220
-%pre
+%pre -n gkrellmd
%service_add_pre gkrellmd.service
%endif
-%post
+%post -n gkrellmd
%if 0%{?suse_version} > 1220
%service_add_post gkrellmd.service
%endif
@@ -151,12 +166,12 @@
%endif
%if %{?suse_version} > 1220
-%preun
+%preun -n gkrellmd
%service_del_preun gkrellmd.service
%stop_on_removal gkrellmd
%endif
-%postun
+%postun -n gkrellmd
%if 0%{?suse_version} > 1220
%service_del_postun gkrellmd.service
%restart_on_update gkrellmd
@@ -169,20 +184,27 @@
%files
%defattr(-,root,root)
%doc COPYRIGHT Changelog README Themes.html
-%{_bindir}/*
+%{_bindir}/gkrellm
%{_datadir}/icons/hicolor/*/apps/gkrellm.png
%{_datadir}/applications/gkrellm.desktop
%doc %{_mandir}/man1/*
%dir /usr/lib/gkrellm2
%dir /usr/lib/gkrellm2/plugins
-%if 0%{?suse_version} > 1220
commit gkrellm for openSUSE:Factory
Hello community,
here is the log from the commit of package gkrellm for openSUSE:Factory checked
in at 2015-05-07 08:29:17
Comparing /work/SRC/openSUSE:Factory/gkrellm (Old)
and /work/SRC/openSUSE:Factory/.gkrellm.new (New)
Package is gkrellm
Changes:
--- /work/SRC/openSUSE:Factory/gkrellm/gkrellm.changes 2014-06-10
14:38:41.0 +0200
+++ /work/SRC/openSUSE:Factory/.gkrellm.new/gkrellm.changes 2015-05-07
08:29:30.0 +0200
@@ -1,0 +2,6 @@
+Fri Mar 27 14:04:16 UTC 2015 - seife+...@b1-systems.com
+
+- add gkrellm-2.3.5-fix-diskio-corruption.patch to fix corruption
+ of chart labels (actually work around it)
+
+---
New:
gkrellm-2.3.5-fix-diskio-corruption.patch
Other differences:
--
++ gkrellm.spec ++
--- /var/tmp/diff_new_pack.bgcvZK/_old 2015-05-07 08:29:31.0 +0200
+++ /var/tmp/diff_new_pack.bgcvZK/_new 2015-05-07 08:29:31.0 +0200
@@ -1,7 +1,7 @@
#
# spec file for package gkrellm
#
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -38,6 +38,8 @@
Patch1: %{name}-lib64-plugins-dir.patch
# PATCH-FIX-OPENSUSE gkrellm-2.3.5-fix-sdX-sort-order.patch
seife+...@b1-systems.com -- fix sort order for scsi-style disks sda,sdb,sdc,...
Patch2: %{name}-2.3.5-fix-sdX-sort-order.patch
+# PATCH-FIX-OPENSUSE gkrellm-2.3.5-fix-diskio-corruption.patch
seife+...@b1-systems.com -- fix corruption in chart labels
+Patch3: %{name}-2.3.5-fix-diskio-corruption.patch
BuildRequires: gtk2-devel
BuildRequires: libsensors4-devel
%if 0%{?suse_version} 1220
@@ -104,6 +106,7 @@
%patch0
%patch1
%patch2 -p1
+%patch3 -p1
%build
cd src
++ gkrellm-2.3.5-fix-diskio-corruption.patch ++
Author: Stefan Seyfried
Subject: fix corruption of chart labels
I was seeing corruption in my r/w label in the disk chart.
Investigation showed, that this was caused by invalid UTF8 being passed to
pango_layout_set_text().
In the relevant places, I now check if the string is valid UTF8 before passing
it (or a NULL pointer)
to pango_layout_set_text().
Also, fix a possible buffer overrun resulting from
gkrellm_format_size_abbrev(), because it was
misusing snprintf return code (but this was probably not the reason of the
invalid UTF8, as it did
not help that problem :-)
I'm guessing that the original problem is a 32bit overflow in the disk
statistics gathering, I
suspect that I/O speeds of over 2GB/sec result in huge negative numbers.
Anyway, the additional check for valid UTF8 makes the corruption go away and
that's better
than not fixing it at all.
diff --git a/src/utils.c b/src/utils.c
index c6a2773..1ed7382 100644
--- a/src/utils.c
+++ b/src/utils.c
@@ -276,15 +276,24 @@ gkrellm_format_size_abbrev(gchar *buf, size_t buflen,
gfloat size,
{
gfloat abs_size;
ginti;
+ int ret;
abs_size = (size 0.0) ? -size : size;
for (i = 0; i tbl_size - 1; ++i)
if (abs_size tbl[i].limit)
break;
- return snprintf(buf, buflen, tbl[i].format, size / tbl[i].divisor);
+ ret = snprintf(buf, buflen, tbl[i].format, size / tbl[i].divisor);
+ if (ret buflen) {
+ fprintf(stderr, %s:%d retbuflen %d %d\n, __func__,
__LINE__, ret, buflen);
+ return buflen;
+ }
+ if (ret 0) {
+ fprintf(stderr, %s:%d ret 0 %d %d\n, __func__, __LINE__,
ret, 0);
+ return 0;
+ }
+ return ret;
}
-
/* Next three calls return string extent info. Width extents are logical
| so that spaces will be counted while height extent is ink so that gkrellm
@@ -366,7 +375,8 @@ gkrellm_text_extents(PangoFontDescription *font_desc, gchar
*text,
else
{
utf8 = g_locale_to_utf8(text, -1, NULL, NULL, NULL);
- pango_layout_set_text(layout, utf8, len);
+ if (utf8)
+ pango_layout_set_text(layout, utf8, len);
g_free(utf8);
}
iter = pango_layout_get_iter(layout);
@@ -456,7 +466,8 @@ gkrellm_gdk_draw_text(GdkDrawable *drawable,
PangoFontDescription *font_desc,
layout = gtk_widget_create_pango_layout(gkrellm_get_top_window(), NULL);
pango_layout_set_font_description(layout, font_desc);
- pango_layout_set_text(layout, string, len);
+ if (g_utf8_validate(string, -1, NULL))
+
commit gkrellm for openSUSE:Factory
Hello community,
here is the log from the commit of package gkrellm for openSUSE:Factory checked
in at 2014-06-10 14:38:40
Comparing /work/SRC/openSUSE:Factory/gkrellm (Old)
and /work/SRC/openSUSE:Factory/.gkrellm.new (New)
Package is gkrellm
Changes:
--- /work/SRC/openSUSE:Factory/gkrellm/gkrellm.changes 2014-02-19
06:55:12.0 +0100
+++ /work/SRC/openSUSE:Factory/.gkrellm.new/gkrellm.changes 2014-06-10
14:38:41.0 +0200
@@ -1,0 +2,6 @@
+Sun Apr 27 18:41:11 UTC 2014 - seife+...@b1-systems.com
+
+- add gkrellm-2.3.5-fix-sdX-sort-order.patch to fix sort order of
+ sda,sdb,sdc,... disks
+
+---
New:
gkrellm-2.3.5-fix-sdX-sort-order.patch
Other differences:
--
++ gkrellm.spec ++
--- /var/tmp/diff_new_pack.8cOpHh/_old 2014-06-10 14:38:41.0 +0200
+++ /var/tmp/diff_new_pack.8cOpHh/_new 2014-06-10 14:38:41.0 +0200
@@ -36,6 +36,8 @@
Patch0: %{name}-libsensors.patch
# PATCH-FIX-OPENSUSE gkrellm-lib64-plugins-dir.patch pgaj...@suse.cz -- look
also into /usr/lib64/gkrellm2/plugins
Patch1: %{name}-lib64-plugins-dir.patch
+# PATCH-FIX-OPENSUSE gkrellm-2.3.5-fix-sdX-sort-order.patch
seife+...@b1-systems.com -- fix sort order for scsi-style disks sda,sdb,sdc,...
+Patch2: %{name}-2.3.5-fix-sdX-sort-order.patch
BuildRequires: gtk2-devel
BuildRequires: libsensors4-devel
%if 0%{?suse_version} 1220
@@ -101,6 +103,7 @@
%setup -q
%patch0
%patch1
+%patch2 -p1
%build
cd src
++ gkrellm-2.3.5-fix-sdX-sort-order.patch ++
diff --git a/src/sysdeps/linux.c b/src/sysdeps/linux.c
index 427fe6e..a81305a 100644
--- a/src/sysdeps/linux.c
+++ b/src/sysdeps/linux.c
@@ -484,6 +484,8 @@ gkrellm_sys_disk_order_from_name(const gchar *name)
}
if (i = table_size)
i = -1;
+ if (i 9) /* hda */
+ i += (i - 10) * 16 + suffix - dm-suffix_base;
return i;
}
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit gkrellm for openSUSE:Factory
Hello community,
here is the log from the commit of package gkrellm for openSUSE:Factory checked
in at 2014-02-19 06:55:11
Comparing /work/SRC/openSUSE:Factory/gkrellm (Old)
and /work/SRC/openSUSE:Factory/.gkrellm.new (New)
Package is gkrellm
Changes:
--- /work/SRC/openSUSE:Factory/gkrellm/gkrellm.changes 2014-02-17
12:52:33.0 +0100
+++ /work/SRC/openSUSE:Factory/.gkrellm.new/gkrellm.changes 2014-02-19
06:55:12.0 +0100
@@ -1,0 +2,5 @@
+Mon Feb 17 10:48:25 UTC 2014 - pgaj...@suse.com
+
+- Add systemd service gkrellm.service (bnc#864225).
+
+---
New:
gkrellmd.service
Other differences:
--
++ gkrellm.spec ++
--- /var/tmp/diff_new_pack.imaSHS/_old 2014-02-19 06:55:13.0 +0100
+++ /var/tmp/diff_new_pack.imaSHS/_new 2014-02-19 06:55:13.0 +0100
@@ -29,12 +29,18 @@
Source3:gkrellm-24.png
Source4:gkrellm-32.png
Source5:gkrellm-48.png
+%if 0%{?suse_version} 1220
+Source6:gkrellmd.service
+%endif
# PATCH-FIX-OPENSUSE gkrellm-libsensors.patch pgaj...@suse.cz -- detect
libsensors correctly
Patch0: %{name}-libsensors.patch
# PATCH-FIX-OPENSUSE gkrellm-lib64-plugins-dir.patch pgaj...@suse.cz -- look
also into /usr/lib64/gkrellm2/plugins
Patch1: %{name}-lib64-plugins-dir.patch
BuildRequires: gtk2-devel
BuildRequires: libsensors4-devel
+%if 0%{?suse_version} 1220
+BuildRequires: pkgconfig(libsystemd-daemon)
+%endif
BuildRequires: openssl-devel
BuildRequires: update-desktop-files
BuildRequires: xorg-x11-libSM-devel
@@ -121,22 +127,35 @@
%if x%{_lib} == xlib64
mkdir -p %{buildroot}/usr/lib64/gkrellm2/plugins
%endif
+%if 0%{?suse_version} 1220
+install -D -m 0644 %{SOURCE6} %{buildroot}%{_unitdir}/gkrellmd.service
+%endif
%suse_update_desktop_file -i %name
%find_lang %{name} %{?no_lang_C}
-%clean
-rm -rf %{buildroot}
-
-%if 0%{?suse_version} 1130
+%if 0%{?suse_version} 1220
+%pre
+%service_add_pre gkrellmd.service
+%endif
%post
+%if 0%{?suse_version} 1130
%desktop_database_post
%icon_theme_cache_post
%endif
-%if 0%{?suse_version} 1130
+%if %{?suse_version} 1220
+%preun
+%service_del_preun gkrellmd.service
+%stop_on_removal gkrellmd
+%endif
%postun
+%if 0%{?suse_version} 1220
+%service_del_postun gkrellmd.service
+%restart_on_update gkrellmd
+%endif
+%if 0%{?suse_version} 1130
%desktop_database_postun
%icon_theme_cache_postun
%endif
@@ -150,6 +169,9 @@
%doc %{_mandir}/man1/*
%dir /usr/lib/gkrellm2
%dir /usr/lib/gkrellm2/plugins
+%if 0%{?suse_version} 1220
+%{_unitdir}/gkrellmd.service
+%endif
%if x%{_lib} == xlib64
%dir /usr/lib64/gkrellm2
%dir /usr/lib64/gkrellm2/plugins
++ gkrellmd.service ++
[Unit]
Description=GNU Krell Monitors server
After=network.target
[Service]
ExecStart=/usr/bin/gkrellmd
[Install]
WantedBy=multi-user.target
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit gkrellm for openSUSE:Factory
Hello community,
here is the log from the commit of package gkrellm for openSUSE:Factory checked
in at 2014-02-17 12:52:32
Comparing /work/SRC/openSUSE:Factory/gkrellm (Old)
and /work/SRC/openSUSE:Factory/.gkrellm.new (New)
Package is gkrellm
Changes:
--- /work/SRC/openSUSE:Factory/gkrellm/gkrellm.changes 2013-11-15
13:21:10.0 +0100
+++ /work/SRC/openSUSE:Factory/.gkrellm.new/gkrellm.changes 2014-02-17
12:52:33.0 +0100
@@ -1,0 +2,5 @@
+Wed Feb 12 01:35:16 CET 2014 - r...@suse.de
+
+- Exclude s390/s390x that have no libsensors.
+
+---
Other differences:
--
++ gkrellm.spec ++
--- /var/tmp/diff_new_pack.DML9UW/_old 2014-02-17 12:52:34.0 +0100
+++ /var/tmp/diff_new_pack.DML9UW/_new 2014-02-17 12:52:34.0 +0100
@@ -1,7 +1,7 @@
#
# spec file for package gkrellm
#
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -40,6 +40,8 @@
BuildRequires: xorg-x11-libSM-devel
Recommends: %{name}-lang
BuildRoot: %{_tmppath}/%{name}-%{version}-build
+# no libsensors
+ExcludeArch:s390 s390x
%description
With a single process, GKrellM manages multiple stacked monitors and
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit gkrellm for openSUSE:Factory
Hello community,
here is the log from the commit of package gkrellm for openSUSE:Factory checked
in at 2013-11-15 13:21:09
Comparing /work/SRC/openSUSE:Factory/gkrellm (Old)
and /work/SRC/openSUSE:Factory/.gkrellm.new (New)
Package is gkrellm
Changes:
--- /work/SRC/openSUSE:Factory/gkrellm/gkrellm.changes 2013-05-06
09:51:36.0 +0200
+++ /work/SRC/openSUSE:Factory/.gkrellm.new/gkrellm.changes 2013-11-15
13:21:10.0 +0100
@@ -1,0 +2,7 @@
+Thu Oct 24 08:41:54 UTC 2013 - pgaj...@suse.com
+
+- Install /usr/lib{,64}/gkrellm2/plugins directories (bnc#841818).
+- Add gkrellm-lib64-plugins-dir.patch: Look in
+ /usr/lib64/gkrellm2/plugins on 64bit systems.
+
+---
New:
gkrellm-lib64-plugins-dir.patch
Other differences:
--
++ gkrellm.spec ++
--- /var/tmp/diff_new_pack.SvQyyc/_old 2013-11-15 13:21:11.0 +0100
+++ /var/tmp/diff_new_pack.SvQyyc/_new 2013-11-15 13:21:11.0 +0100
@@ -29,8 +29,10 @@
Source3:gkrellm-24.png
Source4:gkrellm-32.png
Source5:gkrellm-48.png
-# PATCH-FIX-OPENSUSE -- detect libsensors correctly -- pgaj...@suse.cz
+# PATCH-FIX-OPENSUSE gkrellm-libsensors.patch pgaj...@suse.cz -- detect
libsensors correctly
Patch0: %{name}-libsensors.patch
+# PATCH-FIX-OPENSUSE gkrellm-lib64-plugins-dir.patch pgaj...@suse.cz -- look
also into /usr/lib64/gkrellm2/plugins
+Patch1: %{name}-lib64-plugins-dir.patch
BuildRequires: gtk2-devel
BuildRequires: libsensors4-devel
BuildRequires: openssl-devel
@@ -90,6 +92,7 @@
%prep
%setup -q
%patch0
+%patch1
%build
cd src
@@ -111,6 +114,11 @@
cp %{SOURCE3} %{buildroot}%{_datadir}/icons/hicolor/24x24/apps/gkrellm.png
cp %{SOURCE4} %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/gkrellm.png
cp %{SOURCE5} %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/gkrellm.png
+# following two directories are searched for plugins and we want to own them
(bnc#841818)
+mkdir -p %{buildroot}/usr/lib/gkrellm2/plugins
+%if x%{_lib} == xlib64
+mkdir -p %{buildroot}/usr/lib64/gkrellm2/plugins
+%endif
%suse_update_desktop_file -i %name
%find_lang %{name} %{?no_lang_C}
@@ -138,6 +146,12 @@
%{_datadir}/icons/hicolor/*/apps/gkrellm.png
%{_datadir}/applications/gkrellm.desktop
%doc %{_mandir}/man1/*
+%dir /usr/lib/gkrellm2
+%dir /usr/lib/gkrellm2/plugins
+%if x%{_lib} == xlib64
+%dir /usr/lib64/gkrellm2
+%dir /usr/lib64/gkrellm2/plugins
+%endif
%files devel
%defattr(-,root,root)
++ gkrellm-lib64-plugins-dir.patch ++
Index: src/gkrellm.h
===
--- src/gkrellm.h.orig 2010-10-02 18:21:01.0 +0200
+++ src/gkrellm.h 2013-11-14 13:33:55.325216840 +0100
@@ -141,6 +141,9 @@
#if !defined(SYSTEM_PLUGINS_DIR)
#defineSYSTEM_PLUGINS_DIR /usr/lib/gkrellm2/plugins
#endif
+#if !defined(SYSTEM64_PLUGINS_DIR)
+#defineSYSTEM64_PLUGINS_DIR/usr/lib64/gkrellm2/plugins
+#endif
#else
Index: src/plugins.c
===
--- src/plugins.c.orig 2010-09-14 18:25:51.0 +0200
+++ src/plugins.c 2013-11-14 13:34:34.349703021 +0100
@@ -1293,6 +1293,10 @@
#if defined(SYSTEM_PLUGINS_DIR)
scan_for_plugins(SYSTEM_PLUGINS_DIR);
#endif
+
+#if defined(SYSTEM64_PLUGINS_DIR)
+ scan_for_plugins(SYSTEM64_PLUGINS_DIR);
+#endif
}
#if 0
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit gkrellm for openSUSE:Factory
Hello community,
here is the log from the commit of package gkrellm for openSUSE:Factory checked
in at 2013-05-06 09:51:35
Comparing /work/SRC/openSUSE:Factory/gkrellm (Old)
and /work/SRC/openSUSE:Factory/.gkrellm.new (New)
Package is gkrellm
Changes:
--- /work/SRC/openSUSE:Factory/gkrellm/gkrellm.changes 2013-04-23
17:19:36.0 +0200
+++ /work/SRC/openSUSE:Factory/.gkrellm.new/gkrellm.changes 2013-05-06
09:51:36.0 +0200
@@ -1,0 +2,5 @@
+Thu May 2 15:28:29 UTC 2013 - sch...@linux-m68k.org
+
+- Compile with %{optflags}
+
+---
Other differences:
--
++ gkrellm.spec ++
--- /var/tmp/diff_new_pack.lXnK9q/_old 2013-05-06 09:51:37.0 +0200
+++ /var/tmp/diff_new_pack.lXnK9q/_new 2013-05-06 09:51:37.0 +0200
@@ -97,7 +97,7 @@
#e. g. bnc#803967 bnc#803081
./configure
cd ..
-make X11_LIBS=-L/usr/X11R6/%{_lib} -lX11 -lSM -lICE GTOP_LIBS=-lgmodule-2.0
+make CFLAGS=%{optflags} X11_LIBS=-L/usr/X11R6/%{_lib} -lX11 -lSM -lICE
GTOP_LIBS=-lgmodule-2.0
%install
make install STRIP= \
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit gkrellm for openSUSE:Factory
Hello community,
here is the log from the commit of package gkrellm for openSUSE:Factory checked
in at 2013-04-23 17:19:35
Comparing /work/SRC/openSUSE:Factory/gkrellm (Old)
and /work/SRC/openSUSE:Factory/.gkrellm.new (New)
Package is gkrellm, Maintainer is pgaj...@suse.com
Changes:
--- /work/SRC/openSUSE:Factory/gkrellm/gkrellm.changes 2013-03-12
17:15:12.0 +0100
+++ /work/SRC/openSUSE:Factory/.gkrellm.new/gkrellm.changes 2013-04-23
17:19:36.0 +0200
@@ -1,0 +2,5 @@
+Tue Apr 23 11:01:17 UTC 2013 - pgaj...@suse.com
+
+- really build against libsensors [bnc#803967] and [bnc#803081]
+
+---
Other differences:
--
++ gkrellm.spec ++
--- /var/tmp/diff_new_pack.skgF9H/_old 2013-04-23 17:19:37.0 +0200
+++ /var/tmp/diff_new_pack.skgF9H/_new 2013-04-23 17:19:37.0 +0200
@@ -1,7 +1,7 @@
#
# spec file for package gkrellm
#
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -29,7 +29,7 @@
Source3:gkrellm-24.png
Source4:gkrellm-32.png
Source5:gkrellm-48.png
-# PATCH-MISSING-TAG -- See http://en.opensuse.org/Packaging/Patches
+# PATCH-FIX-OPENSUSE -- detect libsensors correctly -- pgaj...@suse.cz
Patch0: %{name}-libsensors.patch
BuildRequires: gtk2-devel
BuildRequires: libsensors4-devel
@@ -92,7 +92,11 @@
%patch0
%build
-echo '#define HAVE_SSL 1' src/configure.h
+cd src
+# run configure to build against libsensors; otherwise it leads to
+#e. g. bnc#803967 bnc#803081
+./configure
+cd ..
make X11_LIBS=-L/usr/X11R6/%{_lib} -lX11 -lSM -lICE GTOP_LIBS=-lgmodule-2.0
%install
++ gkrellm-libsensors.patch ++
--- /var/tmp/diff_new_pack.skgF9H/_old 2013-04-23 17:19:37.0 +0200
+++ /var/tmp/diff_new_pack.skgF9H/_new 2013-04-23 17:19:37.0 +0200
@@ -15,12 +15,12 @@
===
--- src/configure.orig
+++ src/configure
-@@ -162,7 +162,7 @@ EOF
- ${CC} ${CFLAGS} ${GTK_INCLUDE} ${PKG_NTLM_INCLUDE} -c test.c -o test.o 2 5
|| true
- ${CC} test.o -o test ${LINK_FLAGS} ${GTK_LIBS} ${PKG_NTLM_LIBS} 2 5 || true
+@@ -212,7 +212,7 @@ EOF
+ ${CC} ${CFLAGS} ${GTK_INCLUDE} -c test.c -o test.o 2 5 || true
+ ${CC} test.o -o test ${LINK_FLAGS} ${GTK_LIBS} -lsensors 2 5 || true
-if [ -x ./test ] ./test
+if [ -x ./test ]
then
echo Found
- echo 'Defining HAVE_NTLM' 1 5
+ echo 'Defining HAVE_LIBSENSORS' 1 5
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit gkrellm for openSUSE:Factory
Hello community,
here is the log from the commit of package gkrellm for openSUSE:Factory checked
in at 2013-03-12 17:15:06
Comparing /work/SRC/openSUSE:Factory/gkrellm (Old)
and /work/SRC/openSUSE:Factory/.gkrellm.new (New)
Package is gkrellm, Maintainer is pgaj...@suse.com
Changes:
--- /work/SRC/openSUSE:Factory/gkrellm/gkrellm.changes 2012-02-20
16:10:52.0 +0100
+++ /work/SRC/openSUSE:Factory/.gkrellm.new/gkrellm.changes 2013-03-12
17:15:12.0 +0100
@@ -1,0 +2,5 @@
+Tue Nov 20 08:40:50 UTC 2012 - pgaj...@suse.com
+
+- fixed url
+
+---
Other differences:
--
++ gkrellm.spec ++
--- /var/tmp/diff_new_pack.loVLCQ/_old 2013-03-12 17:15:19.0 +0100
+++ /var/tmp/diff_new_pack.loVLCQ/_new 2013-03-12 17:15:19.0 +0100
@@ -16,14 +16,13 @@
#
-
Name: gkrellm
Version:2.3.5
-Release:2
-License:GPL-3.0+
+Release:0
Summary:Manages Multiple Stacked Monitors
-Url:http://www.gkrellm.net
+License:GPL-3.0+
Group: System/Monitoring
+Url:http://freecode.com/projects/gkrellm
Source: %{name}-%{version}.tar.bz2
Source1:%name.desktop
Source2:gkrellm-16.png
@@ -80,7 +79,6 @@
* A different theme can be created with the GIMP.
%package devel
-License:GPL-3.0+
Summary:Files needed for gkrellm2 development
Group: Development/Sources
Requires: gkrellm = %{version}
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit gkrellm for openSUSE:Factory
Hello community,
here is the log from the commit of package gkrellm for openSUSE:Factory checked
in at 2012-02-20 16:10:51
Comparing /work/SRC/openSUSE:Factory/gkrellm (Old)
and /work/SRC/openSUSE:Factory/.gkrellm.new (New)
Package is gkrellm, Maintainer is pgaj...@suse.com
Changes:
--- /work/SRC/openSUSE:Factory/gkrellm/gkrellm.changes 2012-02-03
10:22:33.0 +0100
+++ /work/SRC/openSUSE:Factory/.gkrellm.new/gkrellm.changes 2012-02-20
16:10:52.0 +0100
@@ -1,0 +2,5 @@
+Mon Feb 20 09:07:24 UTC 2012 - pgaj...@suse.com
+
+- add xorg-x11-libSM-devel into buildrequires
+
+---
Other differences:
--
++ gkrellm.spec ++
--- /var/tmp/diff_new_pack.Ic6AUW/_old 2012-02-20 16:10:53.0 +0100
+++ /var/tmp/diff_new_pack.Ic6AUW/_new 2012-02-20 16:10:53.0 +0100
@@ -1,7 +1,7 @@
#
# spec file for package gkrellm
#
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -36,6 +36,7 @@
BuildRequires: libsensors4-devel
BuildRequires: openssl-devel
BuildRequires: update-desktop-files
+BuildRequires: xorg-x11-libSM-devel
Recommends: %{name}-lang
BuildRoot: %{_tmppath}/%{name}-%{version}-build
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit gkrellm for openSUSE:Factory
Hello community,
here is the log from the commit of package gkrellm for openSUSE:Factory checked
in at 2012-02-03 10:22:32
Comparing /work/SRC/openSUSE:Factory/gkrellm (Old)
and /work/SRC/openSUSE:Factory/.gkrellm.new (New)
Package is gkrellm, Maintainer is pgaj...@suse.com
Changes:
--- /work/SRC/openSUSE:Factory/gkrellm/gkrellm.changes 2011-09-23
01:59:59.0 +0200
+++ /work/SRC/openSUSE:Factory/.gkrellm.new/gkrellm.changes 2012-02-03
10:22:33.0 +0100
@@ -1,0 +2,5 @@
+Wed Dec 21 08:30:07 UTC 2011 - pgaj...@suse.com
+
+- -lgmodule-2.0 added to the linker command line
+
+---
Other differences:
--
++ gkrellm.spec ++
--- /var/tmp/diff_new_pack.ea2or3/_old 2012-02-03 10:22:34.0 +0100
+++ /var/tmp/diff_new_pack.ea2or3/_new 2012-02-03 10:22:34.0 +0100
@@ -94,7 +94,7 @@
%build
echo '#define HAVE_SSL 1' src/configure.h
-make X11_LIBS=-L/usr/X11R6/%{_lib} -lX11 -lSM -lICE
+make X11_LIBS=-L/usr/X11R6/%{_lib} -lX11 -lSM -lICE GTOP_LIBS=-lgmodule-2.0
%install
make install STRIP= \
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit gkrellm for openSUSE:Factory
Hello community,
here is the log from the commit of package gkrellm for openSUSE:Factory checked
in at 2011-12-06 18:13:00
Comparing /work/SRC/openSUSE:Factory/gkrellm (Old)
and /work/SRC/openSUSE:Factory/.gkrellm.new (New)
Package is gkrellm, Maintainer is pgaj...@suse.com
Changes:
Other differences:
--
++ gkrellm.spec ++
--- /var/tmp/diff_new_pack.uqAxQN/_old 2011-12-06 18:18:50.0 +0100
+++ /var/tmp/diff_new_pack.uqAxQN/_new 2011-12-06 18:18:50.0 +0100
@@ -20,7 +20,7 @@
Name: gkrellm
Version:2.3.5
Release:2
-License:GPLv3+
+License:GPL-3.0+
Summary:Manages Multiple Stacked Monitors
Url:http://www.gkrellm.net
Group: System/Monitoring
@@ -79,7 +79,7 @@
* A different theme can be created with the GIMP.
%package devel
-License:GPLv3+
+License:GPL-3.0+
Summary:Files needed for gkrellm2 development
Group: Development/Sources
Requires: gkrellm = %{version}
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
