From f286d9828322a0d3a910e97953cc7354b496396232c57483c8b67179d7b2a07e Mon Sep 17 00:00:00 2001
From: OBS User unknown <null@suse.de>
Date: Thu, 12 Apr 2007 16:19:02 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/openSUSE:Factory/sensors?expand=0&rev=6

---
 lm_sensors-2.10.3.dif         | 42 -----------------------------------
 lm_sensors-2.8.3-nodump.patch | 11 ---------
 sensors.changes               |  9 ++++++++
 sensors.spec                  | 17 ++++++--------
 4 files changed, 16 insertions(+), 63 deletions(-)
 delete mode 100644 lm_sensors-2.8.3-nodump.patch

diff --git a/lm_sensors-2.10.3.dif b/lm_sensors-2.10.3.dif
index 71199f4..fe0c22c 100644
--- a/lm_sensors-2.10.3.dif
+++ b/lm_sensors-2.10.3.dif
@@ -107,48 +107,6 @@
    }
  }
  
---- prog/dump/isadump.c
-+++ prog/dump/isadump.c	2006-02-28 13:05:01.000000000 +0100
-@@ -35,15 +35,26 @@
- #include "util.h"
- #include "superio.h"
- 
--
- /* To keep glibc2 happy */
- #if defined(__GLIBC__) && __GLIBC__ == 2 && __GLIBC_MINOR__ >= 0
--#include <sys/io.h>
-+# if !defined(__sparc__) && !defined(__sparc64__) && !defined(__powerpc__)
-+#  include <sys/io.h>
-+# else
-+#ifdef __powerpc__
-+#define __KERNEL__
-+#define CONFIG_ALL_PPC
-+#endif
-+#  include <asm/io.h>
-+#ifdef __powerpc__
-+#undef __KERNEL__
-+#undef CONFIG_ALL_PPC
-+#endif
-+# endif
- #else
--#include <asm/io.h>
-+# include <asm/io.h>
- #endif
- 
--#ifdef __powerpc__
-+#if defined(__powerpc__) || defined(__sparc__) || defined(__sparc64__)
- unsigned long isa_io_base = 0; /* XXX for now */
- #endif /* __powerpc__ */
- 
-@@ -242,7 +253,7 @@ int main(int argc, char *argv[])
- 		}
- 	}
- 
--#ifndef __powerpc__
-+#if !defined(__sparc__) && !defined(__sparc64__) && !defined(__powerpc__)
- 	if ((datareg < 0x400) && (addrreg < 0x400) && !flat) {
- 		if (ioperm(datareg, 1, 1)) {
- 			fprintf(stderr, "Error: Could not ioperm() data "
 --- prog/init/README
 +++ prog/init/README	2006-02-28 13:05:01.000000000 +0100
 @@ -10,7 +10,7 @@ The script lm_sensors.init is a nice sta
diff --git a/lm_sensors-2.8.3-nodump.patch b/lm_sensors-2.8.3-nodump.patch
deleted file mode 100644
index 67b8864..0000000
--- a/lm_sensors-2.8.3-nodump.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile
-+++ Makefile
-@@ -155,7 +155,7 @@
- endif
- endif
- SRCDIRS += kernel/include
--SRCDIRS += lib prog/detect prog/dump prog/eeprom prog/pwm \
-+SRCDIRS += lib prog/detect prog/eeprom prog/pwm \
-            prog/sensors prog/xeon ${PROG_EXTRA:%=prog/%} etc
- 
- # Some often-used commands with default options
diff --git a/sensors.changes b/sensors.changes
index 1746f58..32b6e69 100644
--- a/sensors.changes
+++ b/sensors.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Thu Apr 12 10:55:19 CEST 2007 - jdelvare@suse.de
+
+- lm_sensors-2.8.3-nodump.patch: Removed, should no longer be
+  needed. Since lm_sensors 2.8.6, isadump is only compiled on i386
+  and x86_64.
+- Likewise, no need to patch prog/dump/isadump.c for powerpc,
+  as it won't be compiled for these architectures anyway.
+
 -------------------------------------------------------------------
 Thu Apr  5 17:15:43 CEST 2007 - werner@suse.de
 
diff --git a/sensors.spec b/sensors.spec
index 9fee397..8e7cfa3 100644
--- a/sensors.spec
+++ b/sensors.spec
@@ -14,7 +14,7 @@ Name:           sensors
 BuildRequires:  bison flex rrdtool sysfsutils udev
 URL:            http://www.lm-sensors.org/
 Version:        2.10.3
-Release:        1
+Release:        3
 Summary:        Hardware health monitoring for Linux
 License:        GNU General Public License (GPL)
 Group:          System/Monitoring
@@ -23,14 +23,8 @@ Autoreqprov:    on
 Source0:        lm_sensors-2.10.3.tar.bz2
 Source1:        README.SuSE
 Patch:          lm_sensors-2.10.3.dif
-Patch1:         lm_sensors-2.8.3-nodump.patch
 Patch2:         lm_sensors-2.7.0-kernelheaders.dif
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-%ifarch	%ix86 x86_64 ia64 alpha
-%define	we_have_isa	1
-%else
-%define	we_have_isa	0
-%endif
 
 %description
 This package includes programs that show data from some sensor chips. 
@@ -56,9 +50,6 @@ Authors:
 %prep
 %setup -n lm_sensors-%{version} 
 %patch
-%if !%{we_have_isa}
-%patch1
-%endif
 %patch2
 
 %build
@@ -118,6 +109,12 @@ rm -f $RPM_BUILD_ROOT/usr/src/linux/include/sensors.h
 %doc /usr/share/man/man8/*.8.gz
 
 %changelog
+* Thu Apr 12 2007 - jdelvare@suse.de
+- lm_sensors-2.8.3-nodump.patch: Removed, should no longer be
+  needed. Since lm_sensors 2.8.6, isadump is only compiled on i386
+  and x86_64.
+- Likewise, no need to patch prog/dump/isadump.c for powerpc,
+  as it won't be compiled for these architectures anyway.
 * Thu Apr 05 2007 - werner@suse.de
 - Update to lm_sensors version 2.10.3 which added support for
   recent devices and support for kernel 2.6.22.