rpms/gkrellm/devel gkrellm-2.2.10-via686.patch, NONE, 1.1 gkrellm.spec, 1.5, 1.6

[Hans de Goede (jwrdegoede)]

Author: jwrdegoede

Update of /cvs/extras/rpms/gkrellm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20209

Modified Files:
	gkrellm.spec 
Added Files:
	gkrellm-2.2.10-via686.patch 
Log Message:
* Wed Nov  8 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 2.2.10-2
- Add special case for via 686 volt sensors <sigh> (bug 213304)


gkrellm-2.2.10-via686.patch:

--- NEW FILE gkrellm-2.2.10-via686.patch ---
diff -ur gkrellm-2.2.10/src/sysdeps/linux.c gkrellm-2.2.10.new/src/sysdeps/linux.c
--- gkrellm-2.2.10/src/sysdeps/linux.c	2006-10-27 00:06:07.000000000 +0200
+++ gkrellm-2.2.10.new/src/sysdeps/linux.c	2006-11-08 17:00:26.000000000 +0100
@@ -2016,6 +2016,7 @@
 
 #ifdef HAVE_LIBSENSORS
 #include <sensors/sensors.h>
+#include <ctype.h>
 
 static gboolean
 libsensors_init(void)
@@ -2028,6 +2029,7 @@
 	gchar			id_name[512], sensor_path[512];
 	gint			type, n_sensors_added;
 	ConfigMap		*config_map;
+	char			*endptr;
 
 	f = fopen("/etc/sensors.conf", "r");
 	if (!f)
@@ -2070,6 +2072,9 @@
 				*/
 				snprintf(sensor_path, sizeof (sensor_path), "%s:%s",
 						name->prefix, name->busname ? name->busname : "NULL");
+						
+				/* For VIA 686 volt sensors special case */
+				strtol(feature->name, &endptr, 10);
 
 				if (!strncmp(feature->name, "temp", 4))
 					type = SENSOR_TEMPERATURE;
@@ -2077,6 +2082,12 @@
 					type = SENSOR_FAN;
 				else if (!strncmp(feature->name, "in", 2))
 					type = SENSOR_VOLTAGE;
+				/* HURRAY! special case for VIA 686 volt sensors,
+				   which genius made up those feature names? */
+				else if ((endptr[0] == 'V' && endptr[1] == 0) ||
+				         (endptr[0] == '.' && isdigit(endptr[1]) &&
+				          endptr[2] == 'V' && endptr[3] == 0))
+					type = SENSOR_VOLTAGE;
 				else
 					{
 					if (_GK.debug_level & DEBUG_SENSORS)
Only in gkrellm-2.2.10.new/src/sysdeps: linux.c~


Index: gkrellm.spec
===================================================================
RCS file: /cvs/extras/rpms/gkrellm/devel/gkrellm.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gkrellm.spec	31 Oct 2006 16:29:31 -0000	1.5
+++ gkrellm.spec	8 Nov 2006 18:35:24 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           gkrellm
 Version:        2.2.10
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Multiple stacked system monitors in one process
 Group:          Applications/System
 License:        GPL
@@ -15,6 +15,7 @@
 Patch3:         gkrellm-2.2.7-width.patch
 Patch4:         gkrellm-2.2.9-libdir.patch
 Patch5:         gkrellm-2.2.9-gkrellmd.conf.patch
+Patch6:         gkrellm-2.2.10-via686.patch
 BuildRequires:  gtk2-devel openssl-devel libSM-devel desktop-file-utils gettext
 %ifarch %{ix86} x86_64
 BuildRequires:  lm_sensors-devel
@@ -67,6 +68,7 @@
 %patch3 -p1 -z .width
 %patch4 -p1 -z .libdir2
 %patch5 -p1 -z .conf-patch
+%patch6 -p1 -z .via686
 
 for i in gkrellmd.1 gkrellm.1 README Changelog Changelog-plugins.html; do
    sed -i -e "s@/usr/lib/gkrellm2/plugins@%{_libdir}/gkrellm2/plugins@" $i
@@ -180,6 +182,9 @@
 
 
 %changelog
+* Wed Nov  8 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 2.2.10-2
+- Add special case for via 686 volt sensors <sigh> (bug 213304)
+
 * Tue Oct 31 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 2.2.10-1
 - New upstream release 2.2.10
 - Drop integrated lmsensors and sysfs sensors patches