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

2007-10-29 09:25:39 +00:00 · 2007-10-29 09:25:39 +00:00 · 1f3dd78a31
commit 1f3dd78a31
parent 145777075f
7 changed files with 62 additions and 42 deletions
--- a/lm_sensors-2.10.4.tar.bz2
+++ b/lm_sensors-2.10.4.tar.bz2
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:40244e81750efade771e2b0e49d96000fe69f00d25b1f16d8e58361ff1ec3ff0
-size 690222
--- a/lm_sensors-2.10.5.dif
+++ b/lm_sensors-2.10.5.dif
@ -1,5 +1,7 @@
--- Makefile
-+++ Makefile	2007-08-01 00:00:00.000000000 +0200
+Index: Makefile
+===================================================================
+--- Makefile.orig
+++ Makefile
@@ -45,8 +45,8 @@ LINUX_HEADERS := $(LINUX)/include
 # may be used mistakenly. Note: This should point to the directory
 # *above* the linux/ subdirectory, so to /usr/local/include in the
@ -20,7 +22,7 @@
 
 # Your C compiler
 CC := gcc
-@@ -97,7 +97,7 @@ ifeq (,$(findstring /2.4., $(MODPREF)))
+@@ -99,7 +99,7 @@ ifeq (,$(findstring /2.4., /$(KERNELVERS
 else
 	SYSFS_SUPPORT :=
 endif
@ -28,8 +30,8 @@
 +SYSFS_SUPPORT := 1
 
 # Prevent 2.6+ users from using improper targets, as this won't work.
- ifeq (,$(findstring /2.4., $(MODPREF)))
-@@ -141,7 +141,7 @@ LIBINCLUDEDIR := $(INCLUDEDIR)/sensors
+ ifeq (,$(findstring /2.4., /$(KERNELVERSION)))
+@@ -143,7 +143,7 @@ LIBINCLUDEDIR := $(INCLUDEDIR)/sensors
 
 # You should not need to change this. It is the base directory under which the
 # manual pages will be installed.
@ -38,7 +40,7 @@
 
 MACHINE := $(shell uname -m)
 
-@@ -216,7 +216,7 @@ ifeq ($(DEBUG),1)
+@@ -218,7 +218,7 @@ ifeq ($(DEBUG),1)
 ALL_CPPFLAGS += -DDEBUG
 ALL_CFLAGS += -O -g
 else
@ -47,9 +49,11 @@
 endif
 
 ifeq ($(WARN),1)
--- prog/detect/sensors-detect
-+++ prog/detect/sensors-detect	2007-08-01 15:19:55.706591921 +0200
-@@ -5416,7 +5416,7 @@ sub generate_modprobes
+Index: prog/detect/sensors-detect
+===================================================================
+--- prog/detect/sensors-detect.orig
+++ prog/detect/sensors-detect
+@@ -5551,7 +5551,7 @@ sub generate_modprobes
   $modprobes .= "# I2C adapter drivers\n" if $nr;
   for ($i = 0; $i < $nr; $i++) {
     foreach $adap (@i2c_adapters) {
@ -58,7 +62,7 @@
       if ($adap->{driver} eq "UNKNOWN") {
         $modprobes .= "# modprobe unknown adapter ".$adap->{name}."\n";
       } elsif ($adap->{driver} eq "DISABLED") {
-@@ -5448,6 +5448,19 @@ sub generate_modprobes
+@@ -5583,6 +5583,19 @@ sub generate_modprobes
     next if not @{$chip->{detected}};
     if ($chip->{driver} eq "to-be-written") {
       $modprobes .= "# no driver for $chip->{detected}[0]{chipname} yet\n";
@ -78,7 +82,7 @@
     } else {
        # need the * for 2.4 kernels, won't necessarily be an exact match
        open(local *INPUTFILE, "modprobe -l $chip->{driver}\\* 2>/dev/null |");
-@@ -5789,6 +5802,8 @@ EOT
+@@ -5927,6 +5940,8 @@ EOT
     print "Copy prog/init/lm_sensors.init to /etc/init.d/lm_sensors\n".
           "for initialization at boot time.\n"
       unless -f "/etc/init.d/lm_sensors";
@ -87,8 +91,10 @@
   }
 }
 
--- prog/init/README
-+++ prog/init/README	2007-08-01 00:00:00.000000000 +0200
+Index: prog/init/README
+===================================================================
+--- prog/init/README.orig
+++ prog/init/README
@@ -10,7 +10,7 @@ The script lm_sensors.init is a nice sta
 On RH and other RH-based systems (MDK, notably) use this sort of startup
 mechanism (i.e. SVR4-based), as opposed to the everything-in-one-script
@ -111,8 +117,10 @@
 For more information see the top of the file.
 
 To configure this service one should put appropriate "alias i2c-bus-0 xxx"
--- prog/init/lm_sensors.init.suse
-+++ prog/init/lm_sensors.init.suse	2007-08-01 15:21:17.447299679 +0200
+Index: prog/init/lm_sensors.init.suse
+===================================================================
+--- prog/init/lm_sensors.init.suse.orig
+++ prog/init/lm_sensors.init.suse
@@ -1,19 +1,15 @@
 #!/bin/sh
 #
@ -318,8 +326,10 @@
 
 -exit $RETVAL
 +rc_exit
--- prog/init/sensord.init
-+++ prog/init/sensord.init	2007-08-01 00:00:00.000000000 +0200
+Index: prog/init/sensord.init
+===================================================================
+--- prog/init/sensord.init.orig
+++ prog/init/sensord.init
@@ -1,130 +1,84 @@
 -#!@BASH@
 +#!/bin/bash
--- a/lm_sensors-2.10.5.tar.bz2
+++ b/lm_sensors-2.10.5.tar.bz2
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c27183d9d73e988f19874ef1c0eb429e49494bf6b475c1be2b466eabac3eae5a
+size 686483
--- a/lm_sensors-dont-probe-i2c-isa.dif
+++ b/lm_sensors-dont-probe-i2c-isa.dif
@ -1,10 +0,0 @@
-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;
--- a/lm_sensors-drop-i2c-tools.dif
+++ b/lm_sensors-drop-i2c-tools.dif
@ -2,7 +2,7 @@ Index: Makefile
 ===================================================================
 --- Makefile.orig
 +++ Makefile
-@@ -185,8 +185,11 @@ endif
+@@ -187,8 +187,11 @@ endif
 endif
 endif
 SRCDIRS += kernel/include
@ -70,7 +70,7 @@ Index: doc/progs
 ===================================================================
 --- doc/progs.orig
 +++ doc/progs
-@@ -18,13 +18,6 @@ see useful_addresses.html.
+@@ -18,13 +18,6 @@ see http://www.lm-sensors.org/wiki/Usefu
 * prog/daemon/healthd.sh (written in bash, not installed)
   An example of a very simple hardware health monitoring daemon.
 
@ -84,7 +84,7 @@ Index: doc/progs
 * prog/detect/sensors-detect (written in Perl, installed by 'make install')
   This program tries to detect the available SMBus adapters and the chips
   connected to them, as well as Super-I/O and misc chips. It also generates
-@@ -43,40 +36,12 @@ see useful_addresses.html.
+@@ -43,40 +36,12 @@ see http://www.lm-sensors.org/wiki/Usefu
   all module information and outputs insmod parameter information. Syntax:
     ./doc-insmod.pl DRIVER
 
@ -125,7 +125,7 @@ Index: doc/progs
 * prog/eepromer/eepromer (written in C, not installed)
   This program reads and writes eeproms.
   Danger: Do not use this to write your DRAM DIMM eeproms.
-@@ -145,6 +110,3 @@ see useful_addresses.html.
+@@ -145,6 +110,3 @@ see http://www.lm-sensors.org/wiki/Usefu
 * prog/tellerstats/gather.sh, tellerstats.sh (written in bash, not installed)
   These scripts gather sensors data and graph the data for web pages.
   See prog/tellerstats/README for more information.
--- a/sensors.changes
+++ b/sensors.changes
@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Sun Oct 28 16:16:39 CET 2007 - jdelvare@suse.de
+
+- Update to lm_sensors version 2.10.5
+  * Support for the SMSC SCH3112, SCH3114, SCH3116
+  * libsensors fixes for the thmc50, bmcsensors, lm93, adm1026
+    drivers
+  * sensord support for the w83793 and lm87 drivers
+  * sensors fixes for the dme1737, thmc50 and adm1021 drivers
+  * Detect new Winbond chips
+- useful_addresses.html is no longer part of the package.
+- lm_sensors-dont-probe-i2c-isa.dif: Drop, bug fixed upstream.
+
 -------------------------------------------------------------------
 Mon Oct 15 13:39:55 CEST 2007 - jdelvare@suse.de

--- a/sensors.spec
+++ b/sensors.spec
@ -1,5 +1,5 @@
 #
-# spec file for package sensors (Version 2.10.4)
+# spec file for package sensors (Version 2.10.5)
 #
 # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
@ -13,19 +13,18 @@
 Name:           sensors
 BuildRequires:  bison flex rrdtool-devel sysfsutils
 Url:            http://www.lm-sensors.org/
-Version:        2.10.4
-Release:        28
+Version:        2.10.5
+Release:        1
 Summary:        Hardware health monitoring for Linux
 License:        GPL v2 or later
 Group:          System/Monitoring
 Requires:       modules
 AutoReqProv:    on
-Source0:        lm_sensors-2.10.4.tar.bz2
+Source0:        lm_sensors-2.10.5.tar.bz2
 Source1:        README.SuSE
-Patch:          lm_sensors-2.10.4.dif
+Patch:          lm_sensors-2.10.5.dif
 Patch1:         lm_sensors-drop-i2c-tools.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
@ -56,7 +55,6 @@ Authors:
 %patch
 %patch1
 %patch2
-%patch3
 %patch4

 %build
@ -74,7 +72,6 @@ RPM_OPT_FLAGS="$RPM_OPT_FLAGS"
 	cp -a fancontrol.txt		$RPM_BUILD_ROOT/%{_docdir}/sensors/
 	cp -a temperature-sensors	$RPM_BUILD_ROOT/%{_docdir}/sensors/
 	cp -a vid			$RPM_BUILD_ROOT/%{_docdir}/sensors/
-	cp -a useful_addresses.html	$RPM_BUILD_ROOT/%{_docdir}/sensors/
 	cp -a progs			$RPM_BUILD_ROOT/%{_docdir}/sensors/
 	chmod -R u+rwX,g+rX,o+rX	$RPM_BUILD_ROOT/%{_docdir}/sensors/
    cd ../
@ -111,6 +108,16 @@ rm -f $RPM_BUILD_ROOT/usr/src/linux/include/sensors.h
 %doc /usr/share/man/man5/*.5.gz
 %doc /usr/share/man/man8/*.8.gz
 %changelog
+* Sun Oct 28 2007 - jdelvare@suse.de
+- Update to lm_sensors version 2.10.5
+  * Support for the SMSC SCH3112, SCH3114, SCH3116
+  * libsensors fixes for the thmc50, bmcsensors, lm93, adm1026
+  drivers
+  * sensord support for the w83793 and lm87 drivers
+  * sensors fixes for the dme1737, thmc50 and adm1021 drivers
+  * Detect new Winbond chips
+- useful_addresses.html is no longer part of the package.
+- lm_sensors-dont-probe-i2c-isa.dif: Drop, bug fixed upstream.
 * Mon Oct 15 2007 - jdelvare@suse.de
 - Do not include i2c tools, they have their own package now.
 * Mon Sep 03 2007 - jdelvare@suse.de