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 <[email protected]> + +- 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 <[email protected]> + +- 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 [email protected] -- fix corruption in chart labels Patch3: %{name}-2.3.5-fix-diskio-corruption.patch +# PATCH-FIX-OPENSUSE gkrellm-install-and-reconnect-gkrellmd.conf.patch [email protected] -- 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 -%{_unitdir}/gkrellmd.service -%endif %if "x%{_lib}" == "xlib64" %dir /usr/lib64/gkrellm2 %dir /usr/lib64/gkrellm2/plugins %endif +%files -n gkrellmd +%defattr(-,root,root) +%doc COPYRIGHT Changelog README Themes.html +%config(noreplace) %{_sysconfdir}/gkrellmd.conf +%{_bindir}/gkrellmd +%if 0%{?suse_version} > 1220 +%{_sbindir}/rcgkrellmd +%{_unitdir}/gkrellmd.service +%endif + %files devel %defattr(-,root,root) %{_includedir}/gkrellm2/ ++++++ gkrellm-2.3.5-fix-sdX-sort-order.patch ++++++ --- /var/tmp/diff_new_pack.pUXd3Q/_old 2018-11-26 10:29:30.873083691 +0100 +++ /var/tmp/diff_new_pack.pUXd3Q/_new 2018-11-26 10:29:30.877083687 +0100 @@ -1,8 +1,8 @@ -diff --git a/src/sysdeps/linux.c b/src/sysdeps/linux.c -index 427fe6e..a81305a 100644 +Index: b/src/sysdeps/linux.c +=================================================================== --- a/src/sysdeps/linux.c +++ b/src/sysdeps/linux.c -@@ -484,6 +484,8 @@ gkrellm_sys_disk_order_from_name(const gchar *name) +@@ -556,6 +556,8 @@ gkrellm_sys_disk_order_from_name(const g } if (i >= table_size) i = -1; ++++++ gkrellm-install-and-reconnect-gkrellmd.conf.patch ++++++ Index: b/server/Makefile =================================================================== --- a/server/Makefile +++ b/server/Makefile @@ -135,7 +135,7 @@ windows: libgkrellmd.a SYS_LIBS="-lws2_32 -lwtsapi32 -lpdh -lnetapi32 -liphlpapi -lintl" \ all -install: install_bin install_inc install_man +install: install_bin install_inc install_man install_cfg install_bin: $(INSTALL) -d -m $(INSTALLDIRMODE) $(SINSTALLDIR) Index: b/server/gkrellmd.conf =================================================================== --- a/server/gkrellmd.conf +++ b/server/gkrellmd.conf @@ -85,7 +85,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 15 # Server side local mailbox counts can be sent to gkrellm clients. List here # paths to mbox, MH mail, or Maildir style mailboxes. ++++++ gkrellm-lib64-plugins-dir.patch ++++++ --- /var/tmp/diff_new_pack.pUXd3Q/_old 2018-11-26 10:29:30.941083612 +0100 +++ /var/tmp/diff_new_pack.pUXd3Q/_new 2018-11-26 10:29:30.941083612 +0100 @@ -1,8 +1,8 @@ -Index: src/gkrellm.h +Index: b/src/gkrellm.h =================================================================== ---- src/gkrellm.h.orig 2010-10-02 18:21:01.000000000 +0200 -+++ src/gkrellm.h 2013-11-14 13:33:55.325216840 +0100 -@@ -141,6 +141,9 @@ +--- a/src/gkrellm.h ++++ b/src/gkrellm.h +@@ -142,6 +142,9 @@ #if !defined(SYSTEM_PLUGINS_DIR) #define SYSTEM_PLUGINS_DIR "/usr/lib/gkrellm2/plugins" #endif @@ -12,11 +12,11 @@ #else -Index: src/plugins.c +Index: b/src/plugins.c =================================================================== ---- src/plugins.c.orig 2010-09-14 18:25:51.000000000 +0200 -+++ src/plugins.c 2013-11-14 13:34:34.349703021 +0100 -@@ -1293,6 +1293,10 @@ +--- a/src/plugins.c ++++ b/src/plugins.c +@@ -1283,6 +1283,10 @@ gkrellm_plugins_load(void) #if defined(SYSTEM_PLUGINS_DIR) scan_for_plugins(SYSTEM_PLUGINS_DIR); #endif
