OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/sensors?expand=0&rev=14

lm_sensors-2.10.4-sysconfig_metadata.patch

@@ -0,0 +1,25 @@
+--- prog/detect/sensors-detect
++++ prog/detect/sensors-detect
+@@ -5756,6 +5756,12 @@
+     open(local *SYSCONFIG, ">/etc/sysconfig/lm_sensors")
+       or die "Sorry, can't create /etc/sysconfig/lm_sensors ($!)";
+     print SYSCONFIG <<'EOT';
++## Path: Hardware/Sensors
++## Description:         Defines the modules to used
++## Type:                string
++## ServiceRestart:      lm_sensors
++## Default:             ""
++#
+ #    /etc/sysconfig/lm_sensors - Defines modules loaded by
+ #                                /etc/init.d/lm_sensors
+ #    Copyright (c) 1998 - 2001  Frodo Looijaard <frodol@dds.nl>
+@@ -5787,6 +5793,9 @@
+ #
+ # List the modules that are to be loaded for your system
+ #
++MODULE_0=""
++MODULE_1=""
++MODULE_2=""
+ EOT
+     print SYSCONFIG
+       "# Generated by sensors-detect on " . scalar localtime() . "\n";

lm_sensors-dont-probe-i2c-isa.dif

@@ -0,0 +1,10 @@
+Index: lm-sensors/prog/detect/sensors-detect
+===================================================================
+--- prog/detect/sensors-detect (revision 4627)
++++ prog/detect/sensors-detect (revision 4649)
+@@ -2340,4 +2340,5 @@
+       $entry->{'name'} = sysfs_device_attribute("${class_dir}/i2c-$1", "name")
+                       || sysfs_device_attribute("${class_dir}/i2c-$1/device", "name");
++      next if $entry->{'name'} eq "ISA main adapter";
+       $entry->{'driver'} = find_adapter_driver($entry->{'name'});
+       $i2c_adapters[$1] = $entry;

sensors.changes

@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Tue Aug 14 22:55:31 CEST 2007 - hvogel@suse.de
+
+- Add sysconfig metadata [#300069]
+
+-------------------------------------------------------------------
+Mon Aug 13 15:07:55 CEST 2007 - jdelvare@suse.de
+
+- Don't probe i2c-isa as a regular i2c bus. This regression was
+  introduced in lm_sensors 2.10.4. Fixed upstream in:
+  http://www.lm-sensors.org/changeset/4649
+
 -------------------------------------------------------------------
 Wed Aug  1 15:41:26 CEST 2007 - werner@suse.de
 

sensors.spec

@@ -14,7 +14,7 @@ Name:           sensors
 BuildRequires:  bison flex rrdtool-devel sysfsutils udev
 URL:            http://www.lm-sensors.org/
 Version:        2.10.4
-Release:        1
+Release:        5
 Summary:        Hardware health monitoring for Linux
 License:        GPL v2 or later
 Group:          System/Monitoring
@@ -25,6 +25,8 @@ Source1:        README.SuSE
 Patch:          lm_sensors-2.10.4.dif
 Patch1:         lm_sensors-no-xeon-script.dif
 Patch2:         lm_sensors-2.7.0-kernelheaders.dif
+Patch3:         lm_sensors-dont-probe-i2c-isa.dif
+Patch4:         lm_sensors-2.10.4-sysconfig_metadata.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 ExcludeArch:    s390 s390x
 
@@ -50,10 +52,12 @@ Authors:
     Geert Uytterhoeven <geert@linux-m68k.org>
 
 %prep
-%setup -n lm_sensors-%{version} 
+%setup -q -n lm_sensors-%{version} 
 %patch
 %patch1
 %patch2
+%patch3
+%patch4
 
 %build
 RPM_OPT_FLAGS="$RPM_OPT_FLAGS"
@@ -107,6 +111,12 @@ rm -f $RPM_BUILD_ROOT/usr/bin/decode-edid.pl
 %doc /usr/share/man/man8/*.8.gz
 
 %changelog
+* Tue Aug 14 2007 - hvogel@suse.de
+- Add sysconfig metadata [#300069]
+* Mon Aug 13 2007 - jdelvare@suse.de
+- Don't probe i2c-isa as a regular i2c bus. This regression was
+  introduced in lm_sensors 2.10.4. Fixed upstream in:
+  http://www.lm-sensors.org/changeset/4649
 * Wed Aug 01 2007 - werner@suse.de
 - Update to lm_sensors version 2.10.4
   * added support for recent devices and cips like