From fc29d60aec611683b6f048830d2d4f4e81dbd11b Mon Sep 17 00:00:00 2001
From: cvsdist <cvsdist@fedoraproject.org>
Date: Thu, 9 Sep 2004 07:59:22 +0000
Subject: [PATCH] auto-import changelog data from lm_sensors-2.6.1-1.src.rpm
 Mon Mar 25 2002 Phil Knirsch <pknirsch@redhat.com> 2.6.1-1 - Update to
 version 2.6.1 to be in line with kernel update.

---
 .cvsignore                     |  2 +-
 lm_sensors-2.5.5-glibc22.patch |  6 +++---
 lm_sensors.spec                | 26 +++++++++++++++-----------
 sources                        |  2 +-
 4 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index c59be4b..5837bc3 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-lm_sensors-2.5.5.tar.gz
+lm_sensors-2.6.1.tar.gz
diff --git a/lm_sensors-2.5.5-glibc22.patch b/lm_sensors-2.5.5-glibc22.patch
index f01bc00..5ec413a 100644
--- a/lm_sensors-2.5.5-glibc22.patch
+++ b/lm_sensors-2.5.5-glibc22.patch
@@ -6,6 +6,6 @@
  /* To keep glibc2 happy */
 -#if defined(__GLIBC__) && __GLIBC__ == 2 && __GLIBC_MINOR__ >= 0
 +#if 0 && defined(__GLIBC__) && __GLIBC__ == 2 && __GLIBC_MINOR__ >= 0
- #include <sys/perm.h>
- #endif
- 
+ #include <sys/io.h>
+ #else
+ #include <asm/io.h>
diff --git a/lm_sensors.spec b/lm_sensors.spec
index 63d54cb..4ec9c92 100644
--- a/lm_sensors.spec
+++ b/lm_sensors.spec
@@ -1,23 +1,22 @@
 Name: lm_sensors
-Version: 2.5.5
-Release: 6
+Version: 2.6.1
+Release: 1
 URL: http://www.netroedge.com/~lm78/
 Source: http://www.netroedge.com/~lm78/archive/lm_sensors-%{version}.tar.gz
 Patch1: lm_sensors-2.5.2-redhat.patch
-Patch2: lm_sensors-2.5.5-ic2_block.patch
 Patch3: lm_sensors-2.5.5-glibc22.patch
 Patch4: lm_sensors-2.5.5-csb5.patch
 Summary: Hardware monitoring tools.
 Group: Applications/System
 Copyright: GPL
 Buildroot: %{_tmppath}/%{name}-root
-BuildPrereq: kernel-headers >= 2.2.16
+BuildPrereq: glibc-kernheaders >= 2.4
 ExclusiveArch: alpha %{ix86}
 
 %description
-The lm_sensors package includes a collection of modules for general
-SMBus access and hardware monitoring. NOTE: this package requires
-special support which is not in standard 2.2-vintage kernels.
+The lm_sensors package includes a collection of modules for general SMBus
+access and hardware monitoring.  NOTE: this requires special support which
+is not in standard 2.2-vintage kernels.
 
 %package devel
 Summary: Development files for programs which will use lm_sensors.
@@ -25,18 +24,20 @@ Group: Development/System
 Requires: lm_sensors = %{version}
 
 %description devel
-The lm_sensors-devel package includes a header files and libraries for
-use when building applications that make use of lm_sensors data.
+The lm_sensors-devel package includes a header files and libraries for use
+when building applications that make use of sensor data.
 
 %prep
 %setup -q 
 %patch1 -p1 -b .redhat
-#%patch2 -p1 -b .i2c_block
 %patch3 -p1 -b .glibc22
 %patch4 -p1 -b .csb5
 
 %build
-make LINUX_HEADERS=/usr/include
+mkdir -p kernel/include/linux/
+ln -s /usr/src/linux-2.4/include/linux/i2c* kernel/include/linux/
+#make LINUX_HEADERS=/usr/include LINUX=/usr/src/linux-2.4
+make
 
 %install
 [ "$RPM_BUILD_ROOT" != "/" ] && rm -fr $RPM_BUILD_ROOT
@@ -66,6 +67,9 @@ chmod 755 $RPM_BUILD_ROOT%{_libdir}/*.so*
 %{_libdir}/lib*.so
 
 %changelog
+* Mon Mar 25 2002 Phil Knirsch <pknirsch@redhat.com> 2.6.1-1
+- Update to version 2.6.1 to be in line with kernel update.
+
 * Wed Aug 22 2001 Philipp Knirsch <pknirsch@redhat.de> 2.5.5-6
 - Added the SMBus CSB5 detection (#50468)
 
diff --git a/sources b/sources
index e4642b9..50200f4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-53740608812efa82532da2f980e6f974  lm_sensors-2.5.5.tar.gz
+556d1e069ecc48b2eff67b3036e9e3e6  lm_sensors-2.6.1.tar.gz