From cb86577da64b645d9157e7c896be9d524bbb6aa0 Mon Sep 17 00:00:00 2001
From: Hans de Goede <jwrdegoede@fedoraproject.org>
Date: Fri, 2 Jan 2009 08:24:07 +0000
Subject: [PATCH] - New upstream release 3.0.3 - Add a patch to support drivers
 with an ACPI "bus" (new Asus atk0110 drv)

---
 .cvsignore                      |  2 +-
 lm_sensors-3.0.3-acpi-bus.patch | 64 +++++++++++++++++++++++++++++++++
 lm_sensors.spec                 |  9 ++++-
 sources                         |  2 +-
 4 files changed, 74 insertions(+), 3 deletions(-)
 create mode 100644 lm_sensors-3.0.3-acpi-bus.patch

diff --git a/.cvsignore b/.cvsignore
index 47c2f28..cfa8e27 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-lm_sensors-3.0.2.tar.bz2
+lm_sensors-3.0.3.tar.bz2
diff --git a/lm_sensors-3.0.3-acpi-bus.patch b/lm_sensors-3.0.3-acpi-bus.patch
new file mode 100644
index 0000000..dbbe7bb
--- /dev/null
+++ b/lm_sensors-3.0.3-acpi-bus.patch
@@ -0,0 +1,64 @@
+Index: lib/access.c
+===================================================================
+--- lib/access.c	(revision 5577)
++++ lib/access.c	(working copy)
+@@ -349,6 +349,8 @@
+ 		return "SPI adapter";
+ 	case SENSORS_BUS_TYPE_VIRTUAL:
+ 		return "Virtual device";
++	case SENSORS_BUS_TYPE_ACPI:
++		return "ACPI interface";
+ 	}
+ 
+ 	/* bus types with several instances */
+Index: lib/sensors.h
+===================================================================
+--- lib/sensors.h	(revision 5577)
++++ lib/sensors.h	(working copy)
+@@ -42,6 +42,7 @@
+ #define SENSORS_BUS_TYPE_PCI		2
+ #define SENSORS_BUS_TYPE_SPI		3
+ #define SENSORS_BUS_TYPE_VIRTUAL	4
++#define SENSORS_BUS_TYPE_ACPI		5
+ #define SENSORS_BUS_NR_ANY		(-1)
+ #define SENSORS_BUS_NR_IGNORE		(-2)
+ 
+Index: lib/sysfs.c
+===================================================================
+--- lib/sysfs.c	(revision 5577)
++++ lib/sysfs.c	(working copy)
+@@ -596,6 +596,11 @@
+ 			entry.chip.addr = 0;
+ 		entry.chip.bus.type = SENSORS_BUS_TYPE_ISA;
+ 		entry.chip.bus.nr = 0;
++	} else if (subsys && !strcmp(subsys, "acpi")) {
++		entry.chip.bus.type = SENSORS_BUS_TYPE_ACPI;
++		/* For now we assume that acpi devices are unique */
++		entry.chip.bus.nr = 0;
++		entry.chip.addr = 0;
+ 	} else {
+ 		/* Ignore unknown device */
+ 		err = 0;
+Index: lib/data.c
+===================================================================
+--- lib/data.c	(revision 5577)
++++ lib/data.c	(working copy)
+@@ -111,6 +111,8 @@
+ 		res->bus.type = SENSORS_BUS_TYPE_SPI;
+ 	else if (!strncmp(name, "virtual", dash - name))
+ 		res->bus.type = SENSORS_BUS_TYPE_VIRTUAL;
++	else if (!strncmp(name, "acpi", dash - name))
++		res->bus.type = SENSORS_BUS_TYPE_ACPI;
+ 	else
+ 		goto ERROR;
+ 	name = dash + 1;
+@@ -174,6 +176,9 @@
+ 	case SENSORS_BUS_TYPE_VIRTUAL:
+ 		return snprintf(str, size, "%s-virtual-%x", chip->prefix,
+ 				chip->addr);
++	case SENSORS_BUS_TYPE_ACPI:
++		return snprintf(str, size, "%s-acpi-%x", chip->prefix,
++				chip->addr);
+ 	}
+ 
+ 	return -SENSORS_ERR_CHIP_NAME;
diff --git a/lm_sensors.spec b/lm_sensors.spec
index 3222b34..36c3673 100644
--- a/lm_sensors.spec
+++ b/lm_sensors.spec
@@ -1,5 +1,5 @@
 Name: lm_sensors
-Version: 3.0.2
+Version: 3.0.3
 Release: 1%{?dist}
 URL: http://www.lm-sensors.org/
 Source: http://dl.lm-sensors.org/lm-sensors/releases/%{name}-%{version}.tar.bz2
@@ -7,6 +7,8 @@ Source1: lm_sensors.sysconfig
 # these 2 were taken from PLD-linux, Thanks!
 Source2: sensord.sysconfig
 Source3: sensord.init
+# submitted to upstream mailinglist
+Patch0: lm_sensors-3.0.3-acpi-bus.patch
 Summary: Hardware monitoring tools
 Group: Applications/System
 License: GPLv2+
@@ -48,6 +50,7 @@ database, and warns of sensor alarms.
 
 %prep
 %setup -q
+%patch0 -p0
 mv prog/init/README prog/init/README.initscripts
 chmod -x prog/init/fancontrol.init
 
@@ -161,6 +164,10 @@ fi
 
 
 %changelog
+* Thu Jan  1 2009 Hans de Goede <j.w.r.degoede@hhs.nl> 3.0.3-1
+- New upstream release 3.0.3
+- Add a patch to support drivers with an ACPI "bus" (new Asus atk0110 drv)
+
 * Tue Jul  1 2008 Hans de Goede <j.w.r.degoede@hhs.nl> 3.0.2-1
 - New upstream release 3.0.2
 - This release contains various important fixes to sensors-detect, which made
diff --git a/sources b/sources
index d318f32..d3497c9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5b210ba9cc01f00161c438fd618484e5  lm_sensors-3.0.2.tar.bz2
+e88b236228ac2a50821217015b8fd0fa  lm_sensors-3.0.3.tar.bz2