- New upstream release 2.10.4

- Drop upstreamed patches 4, 5, 7 and 8
- Drop no longer need patch 3
- Move libsensors.3 manpage to -devel sub-package
- Move sensord.8 manpage to -sensord sub-package
- Switch from ExclusiveArch: alph ix86 x86_64, to ExcludeArch: s390 s390x,
    so that we get build on ppc, arm, etc. too. (bz 181037 amongst others)

.cvsignore

@@ -1 +1 @@
-lm_sensors-2.10.3.tar.gz
+lm_sensors-2.10.4.tar.gz

lm_sensors-2.10.0-kernel26.patch

@@ -1,11 +0,0 @@
---- lm_sensors-2.10.0/prog/detect/sensors-detect.kernel26	2006-05-12 15:24:05.000000000 +0200
-+++ lm_sensors-2.10.0/prog/detect/sensors-detect	2006-05-12 15:24:05.000000000 +0200
-@@ -2034,6 +2034,8 @@
-     $modules_conf = '/etc/modules.conf';
-   } elsif (-f '/etc/conf.modules') {
-     $modules_conf = '/etc/conf.modules';
-+  } elsif (-f '/etc/modprobe.conf') {
-+    $modules_conf = '/etc/modprobe.conf';
-   } else { # default
-     $modules_conf = '/etc/modules.conf';
-   }

lm_sensors-2.10.1-local.patch

@@ -1,23 +0,0 @@
-diff -uNr lm_sensors-2.10.1.orig/prog/detect/sensors-detect lm_sensors-2.10.1/prog/detect/sensors-detect
---- lm_sensors-2.10.1.orig/prog/detect/sensors-detect	2006-09-25 00:30:10.000000000 +0200
-+++ lm_sensors-2.10.1/prog/detect/sensors-detect	2006-11-16 19:00:36.000000000 +0100
-@@ -40,8 +40,8 @@
- 	unless $ENV{PATH} =~ m,(^|:)/sbin/?(:|$),;
- # Same for /usr/local/sbin since we need i2cdetect which is installed there
- # by default (reported by Lennard Klein)
--$ENV{PATH} = '/usr/local/sbin:'.$ENV{PATH}
--	unless $ENV{PATH} =~ m,(^|:)/usr/local/sbin/?(:|$),;
-+$ENV{PATH} = '/usr/sbin:'.$ENV{PATH}
-+	unless $ENV{PATH} =~ m,(^|:)/usr/sbin/?(:|$),;
- 
- #########################
- # CONSTANT DECLARATIONS #
-@@ -5430,7 +5430,7 @@
-   print "#----cut here----\n".
-         $modprobes.
-         "# sleep 2 # optional\n".
--        "/usr/local/bin/sensors -s # recommended\n".
-+        "/usr/bin/sensors -s # recommended\n".
-         "#----cut here----\n\n";
- 
-   print "If you have some drivers built into your kernel, the list above will\n".

lm_sensors-2.8.0-utf8.patch

@@ -1,11 +0,0 @@
---- lm_sensors-2.8.0/prog/detect/sensors-detect.utf8	2003-07-08 15:07:59.000000000 +0200
-+++ lm_sensors-2.8.0/prog/detect/sensors-detect	2003-07-23 12:40:03.000000000 +0200
-@@ -1394,7 +1394,7 @@
-           "*** Terminating.\n";
-     exit(-1);
-   }
--  my $towrite = pack "C", $_[1];
-+  my $towrite = pack "C", ($_[1] & 0xff);
-   sysseek IOPORTS, $_[0], 0 or return -1;
-   my $nrchars = syswrite IOPORTS, $towrite, 1;
-   return -1 if not defined $nrchars or $nrchars != 1;

lm_sensors-2.8.2-expr.patch

@@ -1,11 +0,0 @@
---- lm_sensors-2.8.1/prog/eepromer/eeprom.c~	2004-01-07 20:55:21.000000000 +0000
-+++ lm_sensors-2.8.1/prog/eepromer/eeprom.c	2004-01-07 20:56:34.000000000 +0000
-@@ -216,7 +216,7 @@
-     /***
-      *** I'm not the one to blame of you screw your computer!
-      ***/
--    if(rwmode & ! force){
-+    if(rwmode && ! force) {
- 	unsigned char warnbuf[4];
- 	fprintf(stderr,"**WARNING**\n");
- 	fprintf(stderr," - \tYou have chosen to WRITE to this eeprom.\n");

lm_sensors-2.8.7-udev.patch

@@ -1,13 +0,0 @@
---- lm_sensors-2.8.7/prog/detect/sensors-detect.udev	2004-10-14 15:32:12.486908800 +0200
-+++ lm_sensors-2.8.7/prog/detect/sensors-detect	2004-10-14 15:35:32.910911461 +0200
-@@ -1788,8 +1788,8 @@
-     if (-c '/dev/i2c-0') {
-       $dev_i2c = '/dev/i2c-';
-     } else { # default
--      print "No i2c device files found. Use prog/mkdev/mkdev.sh to create them.\n";
--      exit -1;
-+   	system("/sbin/MAKEDEV i2c");
-+	$dev_i2c = '/dev/i2c-';
-     }
-   }
- }

lm_sensors-2.9.1-pwconfig.patch

@@ -1,17 +0,0 @@
---- lm_sensors-2.9.1/prog/pwm/pwmconfig.pwconfig	2005-03-15 20:24:25.000000000 +0100
-+++ lm_sensors-2.9.1/prog/pwm/pwmconfig	2005-08-30 14:21:37.000000000 +0200
-@@ -465,9 +465,11 @@
- function SaveConfig {
- 	echo
- 	echo "Saving configuration to $FCCONFIG..."
--	egrep -v '(INTERVAL|FCTEMPS|FCFANS|MAXTEMP|MINTEMP|MINSTART|MINSTOP)' $FCCONFIG >/tmp/fancontrol
--	echo -e "INTERVAL=$INTERVAL\nFCTEMPS=$FCTEMPS\nFCFANS=$FCFANS\nMINTEMP=$MINTEMP\nMAXTEMP=$MAXTEMP\nMINSTART=$MINSTART\nMINSTOP=$MINSTOP" >>/tmp/fancontrol
--	mv /tmp/fancontrol $FCCONFIG
-+	tmpfile=`mktemp` || { echo "$0: Cannot create temporary file" >&2; exit 1;  }
-+	trap " [ -f \"$tmpfile\" ] && /bin/rm -f -- \"$tmpfile\"" 0 1 2 3 13 15
-+	egrep -v '(INTERVAL|FCTEMPS|FCFANS|MAXTEMP|MINTEMP|MINSTART|MINSTOP)' $FCCONFIG >$tmpfile
-+	echo -e "INTERVAL=$INTERVAL\nFCTEMPS=$FCTEMPS\nFCFANS=$FCFANS\nMINTEMP=$MINTEMP\nMAXTEMP=$MAXTEMP\nMINSTART=$MINSTART\nMINSTOP=$MINSTOP" >>$tmpfile
-+	mv $tmpfile $FCCONFIG
- 	#check if file was written correctly
- 	echo 'Configuration saved'
- }

lm_sensors.spec

@@ -1,17 +1,12 @@
 Name: lm_sensors
-Version: 2.10.3
+Version: 2.10.4
-Release: 4%{?dist}
+Release: 1%{?dist}
-URL: http://secure.netroedge.com/~lm78/
+URL: http://www.lm-sensors.org/
-Source: http://secure.netroedge.com/~lm78/archive/lm_sensors-%{version}.tar.gz
+Source: http://dl.lm-sensors.org/lm-sensors/releases/%{name}-%{version}.tar.gz
 Source1: lm_sensors.sysconfig
 # these 2 were taken from PLD-linux, Thanks!
 Source2: sensord.sysconfig
 Source3: sensord.init
-Patch3: lm_sensors-2.8.0-utf8.patch
-Patch4: lm_sensors-2.8.2-expr.patch
-Patch5: lm_sensors-2.10.1-local.patch
-Patch7: lm_sensors-2.8.7-udev.patch
-Patch8: lm_sensors-2.10.0-kernel26.patch
 Summary: Hardware monitoring tools
 Group: Applications/System
 License: GPL
@@ -28,8 +23,7 @@ ExcludeArch:   s390 s390x
 
 %description
 The lm_sensors package includes a collection of modules for general SMBus
-access and hardware monitoring.  NOTE: this requires special support which
+access and hardware monitoring.
-is not in standard 2.2-vintage kernels.
 
 
 %package devel
@@ -65,11 +59,6 @@ what you are doing.
 
 %prep
 %setup -q 
-%patch3 -p1 -b .utf8
-%patch4 -p1 -b .expr
-%patch5 -p1 -b .local
-%patch7 -p1 -b .udev
-%patch8 -p1 -b .kernel26
 mv prog/init/README prog/init/README.initscripts
 chmod -x prog/init/fancontrol.init
 
@@ -171,8 +160,10 @@ fi
 
 
 %changelog
-* Tue Jul 17 2007 Hans de Goede <j.w.r.degoede@hhs.nl> - 2.10.3-4
+* Thu Jul 19 2007 Hans de Goede <j.w.r.degoede@hhs.nl> - 2.10.4-1
-- WIP not released yet, adjust clog date and remove this before release 
+- New upstream release 2.10.4
+- Drop upstreamed patches 4, 5, 7 and 8
+- Drop no longer need patch 3
 - Move libsensors.3 manpage to -devel sub-package
 - Move sensord.8 manpage to -sensord sub-package
 - Switch from ExclusiveArch: alph ix86 x86_64, to ExcludeArch: s390 s390x,

sources

@@ -1 +1 @@
-55d77146fbd56c205a9f81d262b9453c  lm_sensors-2.10.3.tar.gz
+96eb9ca1a1f1cb308757a7b8f0af93d6  lm_sensors-2.10.4.tar.gz