diff --git a/.gitignore b/.gitignore index c5271f1..bf0d2f9 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ lm_sensors-3.1.2.tar.bz2 +/lm_sensors-3.1.2.svn5857.tar.gz diff --git a/lm_sensors-3.1.2-lm85.patch b/lm_sensors-3.1.2-lm85.patch deleted file mode 100644 index 1ff82a1..0000000 --- a/lm_sensors-3.1.2-lm85.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up lm_sensors-3.1.2/prog/detect/sensors-detect.lm85 lm_sensors-3.1.2/prog/detect/sensors-detect ---- lm_sensors-3.1.2/prog/detect/sensors-detect.lm85 2010-03-31 17:07:22.339044681 +0200 -+++ lm_sensors-3.1.2/prog/detect/sensors-detect 2010-03-31 17:08:25.518920014 +0200 -@@ -558,7 +558,7 @@ use vars qw(@i2c_adapter_names); - i2c_detect => sub { adt7467_detect(@_, 3); }, - }, { - name => "Analog Devices ADT7467 or ADT7468", -- driver => "to-be-written", -+ driver => "lm85", - i2c_addrs => [0x2e], - i2c_detect => sub { adt7467_detect(@_, 0); }, - }, { diff --git a/lm_sensors.spec b/lm_sensors.spec index 6e81169..87f0f97 100644 --- a/lm_sensors.spec +++ b/lm_sensors.spec @@ -1,8 +1,9 @@ Name: lm_sensors Version: 3.1.2 -Release: 2%{?dist} +Release: 2.svn5857%{?dist} URL: http://www.lm-sensors.org/ -Source: http://dl.lm-sensors.org/lm-sensors/releases/%{name}-%{version}.tar.bz2 +#Source: http://dl.lm-sensors.org/lm-sensors/releases/%{name}-%{version}.tar.bz2 +Source: %{name}-%{version}.svn5857.tar.gz Source1: lm_sensors.sysconfig # these 2 were taken from PLD-linux, Thanks! Source2: sensord.sysconfig @@ -20,7 +21,6 @@ Requires(post): /sbin/ldconfig BuildRequires: kernel-headers >= 2.2.16, bison, libsysfs-devel, flex, gawk BuildRequires: rrdtool-devel -Patch0: lm_sensors-3.1.2-lm85.patch %description The lm_sensors package includes a collection of modules for general SMBus @@ -57,7 +57,6 @@ database, and warns of sensor alarms. %prep %setup -q -%patch0 -p1 -b .lm85 mv prog/init/README prog/init/README.initscripts chmod -x prog/init/fancontrol.init @@ -179,6 +178,10 @@ fi %changelog +* Fri Sep 03 2010 Nikola Pajkovsky - 3.1.2.svn5857 +- update lm_sensors from svn +- drop patch lm_sensors-3.1.2-lm85.patch(already in svn) + * Wed Mar 31 2010 Nikola Pajkovsky - 3.1.2-2 - patch lm_sensors-3.1.2-lm85.patch add into sensors-detect driver lm85 - Resolved: 578527 - sensors-detect fails to detect diff --git a/sources b/sources index 618776c..760ee2b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -58a9a225808ac4587c4c8cbd12b40b5c lm_sensors-3.1.2.tar.bz2 +d2a1edfd390f5ca37b243bd66c1d8c83 lm_sensors-3.1.2.svn5857.tar.gz