rpms/lm_sensors/F-7 lm_sensors-2.10.5-fschrc.patch, NONE, 1.1 .cvsignore, 1.18, 1.19 lm_sensors.spec, 1.47, 1.48 sources, 1.18, 1.19

[Hans de Goede (jwrdegoede)]

Author: jwrdegoede

Update of /cvs/extras/rpms/lm_sensors/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17266

Modified Files:
	.cvsignore lm_sensors.spec sources 
Added Files:
	lm_sensors-2.10.5-fschrc.patch 
Log Message:
* Thu Nov 15 2007 Hans de Goede <j.w.r.degoede at hhs.nl> - 2.10.5-1
- New upstream bugfix release 2.10.5


lm_sensors-2.10.5-fschrc.patch:

--- NEW FILE lm_sensors-2.10.5-fschrc.patch ---
diff -up lm_sensors-2.10.5/lib/chips.h~ lm_sensors-2.10.5/lib/chips.h
--- lm_sensors-2.10.5/lib/chips.h~	2007-11-15 11:39:26.000000000 +0100
+++ lm_sensors-2.10.5/lib/chips.h	2007-11-15 11:39:26.000000000 +0100
@@ -2342,8 +2342,8 @@
 #define SENSORS_F71882FG_TEMP_TYPE(n)		(150 + (n))
 
 /* Fujitsu Siemens Computers Heimdal and Heracles */
-#define SENSORS_FSCHMD_PREFIX		"fscher"
-#define SENSORS_FSCHRC_PREFIX		"fscher"
+#define SENSORS_FSCHMD_PREFIX		"fschmd"
+#define SENSORS_FSCHRC_PREFIX		"fschrc"
 
 /* Note, we start with feature numbers of 60+ to not have any overlapping
    features with the old FSCPOS, FSCSCY and FSCHER feature lists, as the


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/lm_sensors/F-7/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- .cvsignore	19 Jul 2007 18:24:26 -0000	1.18
+++ .cvsignore	15 Nov 2007 13:31:48 -0000	1.19
@@ -1 +1 @@
-lm_sensors-2.10.4.tar.gz
+lm_sensors-2.10.5.tar.gz


Index: lm_sensors.spec
===================================================================
RCS file: /cvs/extras/rpms/lm_sensors/F-7/lm_sensors.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- lm_sensors.spec	19 Jul 2007 18:24:26 -0000	1.47
+++ lm_sensors.spec	15 Nov 2007 13:31:48 -0000	1.48
@@ -1,5 +1,5 @@
 Name: lm_sensors
-Version: 2.10.4
+Version: 2.10.5
 Release: 1%{?dist}
 URL: http://www.lm-sensors.org/
 Source: http://dl.lm-sensors.org/lm-sensors/releases/%{name}-%{version}.tar.gz
@@ -7,10 +7,11 @@
 # these 2 were taken from PLD-linux, Thanks!
 Source2: sensord.sysconfig
 Source3: sensord.init
-Patch3: lm_sensors-2.8.0-utf8.patch
+Patch0: lm_sensors-2.10.4-service-default-off.patch
+Patch1: lm_sensors-2.10.5-fschrc.patch
 Summary: Hardware monitoring tools
 Group: Applications/System
-License: GPL
+License: GPLv2+
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 %ifarch %{ix86} x86_64
 Requires: /usr/sbin/dmidecode
@@ -18,7 +19,7 @@
 Requires(preun): chkconfig
 Requires(post): chkconfig
 Requires(post): /sbin/ldconfig
-BuildRequires: kernel-headers >= 2.2.16, bison, libsysfs-devel, flex
+BuildRequires: kernel-headers >= 2.2.16, bison, libsysfs-devel, flex, gawk
 BuildRequires: rrdtool-devel
 ExcludeArch:   s390 s390x
 
@@ -60,7 +61,8 @@
 
 %prep
 %setup -q 
-%patch3 -p1 -b .utf8
+%patch0 -p1
+%patch1 -p1
 mv prog/init/README prog/init/README.initscripts
 chmod -x prog/init/fancontrol.init
 
@@ -162,9 +164,18 @@
 
 
 %changelog
+* Thu Nov 15 2007 Hans de Goede <j.w.r.degoede at hhs.nl> - 2.10.5-1
+- New upstream bugfix release 2.10.5
+
+* Wed Aug 22 2007 Hans de Goede <j.w.r.degoede at hhs.nl> - 2.10.4-2
+- Update License tag for new Licensing Guidelines compliance
+- Disable service by default (no use without any sensors being configured),
+  enable it automatically on a successfull sensors-detect run (bz 253750)
+
 * Thu Jul 19 2007 Hans de Goede <j.w.r.degoede at hhs.nl> - 2.10.4-1
 - 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,


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lm_sensors/F-7/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	19 Jul 2007 18:24:26 -0000	1.18
+++ sources	15 Nov 2007 13:31:48 -0000	1.19
@@ -1 +1 @@
-96eb9ca1a1f1cb308757a7b8f0af93d6  lm_sensors-2.10.4.tar.gz
+77f96bc8a7773e95b2990d756e4925d6  lm_sensors-2.10.5.tar.gz