OBS User unknown 2007-05-28 13:04:57 +00:00 committed by Git OBS Bridge
parent 14583938c5
commit 1c5bbcdef1
3 changed files with 35 additions and 22 deletions

View File

@ -1,5 +1,5 @@
--- Makefile
+++ Makefile 2006-11-10 15:39:03.000000000 +0100
--- Makefile.orig
+++ Makefile
@@ -45,8 +45,8 @@ LINUX_HEADERS := $(LINUX)/include
# may be used mistakenly. Note: This should point to the directory
# *above* the linux/ subdirectory, so to /usr/local/include in the
@ -47,8 +47,8 @@
endif
ifeq ($(WARN),1)
--- prog/detect/sensors-detect
+++ prog/detect/sensors-detect 2006-11-10 17:45:13.000000000 +0100
--- prog/detect/sensors-detect.orig
+++ prog/detect/sensors-detect
@@ -2147,7 +2147,9 @@ sub initialize_conf
}
}
@ -107,8 +107,8 @@
}
}
--- prog/init/README
+++ prog/init/README 2006-02-28 13:05:01.000000000 +0100
--- prog/init/README.orig
+++ prog/init/README
@@ -10,7 +10,7 @@ The script lm_sensors.init is a nice sta
On RH and other RH-based systems (MDK, notably) use this sort of startup
mechanism (i.e. SVR4-based), as opposed to the everything-in-one-script
@ -131,9 +131,9 @@
For more information see the top of the file.
To configure this service one should put appropriate "alias i2c-bus-0 xxx"
--- prog/init/lm_sensors.init.suse
+++ prog/init/lm_sensors.init.suse 2006-02-28 13:05:01.000000000 +0100
@@ -1,19 +1,14 @@
--- prog/init/lm_sensors.init.suse.orig
+++ prog/init/lm_sensors.init.suse
@@ -1,19 +1,15 @@
#!/bin/sh
#
### BEGIN INIT INFO
@ -151,6 +151,7 @@
+# Required-Stop: $remote_fs
+# Default-Start: 2 3 5
+# Default-Stop:
+# Short-Description: Load and configure hardware monitoring drivers
+# Description: sensors is used for monitoring motherboard sensor values.
+# Config file is /etc/sysconfig/lm_sensors
### END INIT INFO
@ -160,7 +161,7 @@
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -40,115 +35,91 @@
@@ -40,115 +36,91 @@
# MODULE_1, MODULE_2, MODULE_3, etc.
# If sensors isn't supported by the kernel, try loading the module...
@ -321,7 +322,7 @@
# See how we were called.
case "$1" in
start)
@@ -163,12 +134,12 @@ case "$1" in
@@ -163,12 +135,12 @@ case "$1" in
restart|reload)
restart
;;
@ -337,9 +338,9 @@
-exit $RETVAL
+rc_exit
--- prog/init/sensord.init
+++ prog/init/sensord.init 2006-02-28 13:05:01.000000000 +0100
@@ -1,130 +1,83 @@
--- prog/init/sensord.init.orig
+++ prog/init/sensord.init
@@ -1,130 +1,84 @@
-#!@BASH@
+#!/bin/bash
#
@ -372,6 +373,7 @@
+# Required-Stop: $remote_fs
+# Default-Start: 2 3 5
+# Default-Stop:
+# Short-Description: Hardware monitoring daemon
+# Description: This shell script takes care of starting and stopping
+# sensord, the lm_sensors hardware health monitoring daemon.
+### END INIT INFO
@ -508,7 +510,7 @@
}
# See how we were called.
@@ -135,9 +88,6 @@ case "$1" in
@@ -135,9 +89,6 @@ case "$1" in
stop)
stop
;;
@ -518,7 +520,7 @@
restart)
stop
start
@@ -145,11 +95,11 @@ case "$1" in
@@ -145,11 +96,11 @@ case "$1" in
reload)
reload
;;
@ -532,8 +534,8 @@
exit 1
;;
esac
--- prog/pwm/fancontrol
+++ prog/pwm/fancontrol 2006-02-28 13:05:01.000000000 +0100
--- prog/pwm/fancontrol.orig
+++ prog/pwm/fancontrol
@@ -188,10 +188,10 @@ function restorefans()
do
pwmo=${AFCPWM[$fcvcount]}
@ -583,8 +585,8 @@
done
# some old stuff/missing features, will clean this up soon
--- prog/pwm/pwmconfig
+++ prog/pwm/pwmconfig 2006-02-28 13:05:01.000000000 +0100
--- prog/pwm/pwmconfig.orig
+++ prog/pwm/pwmconfig
@@ -248,6 +248,9 @@ echo
PLOTTER=gnuplot
STEP=15

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Mon May 28 13:43:34 CEST 2007 - jdelvare@suse.de
- Fix two rpmlint errors: /etc/init.d/lm_sensors shouldn't be
marked as a config file, and was missing a Short-Description
tag.
-------------------------------------------------------------------
Wed May 9 09:28:58 CEST 2007 - jdelvare@suse.de

View File

@ -14,7 +14,7 @@ Name: sensors
BuildRequires: bison flex rrdtool sysfsutils udev
URL: http://www.lm-sensors.org/
Version: 2.10.3
Release: 10
Release: 19
Summary: Hardware health monitoring for Linux
License: GNU General Public License (GPL)
Group: System/Monitoring
@ -92,7 +92,7 @@ rm -f $RPM_BUILD_ROOT/usr/src/linux/include/sensors.h
%files
%defattr(-,root,root)
%config(noreplace) /etc/sensors.conf
%config /etc/init.d/lm_sensors
/etc/init.d/lm_sensors
%attr(660, root, root) %dev(c, 89, 0) /lib/udev/devices/i2c-0
/usr/bin/*
/usr/sbin/*
@ -106,6 +106,10 @@ rm -f $RPM_BUILD_ROOT/usr/src/linux/include/sensors.h
%doc /usr/share/man/man8/*.8.gz
%changelog
* Mon May 28 2007 - jdelvare@suse.de
- Fix two rpmlint errors: /etc/init.d/lm_sensors shouldn't be
marked as a config file, and was missing a Short-Description
tag.
* Wed May 09 2007 - jdelvare@suse.de
- lm_sensors-no-xeon-script.patch: The decode-xeon.pl script is
outdated. It was never ported to work with 2.6 kernels, so it is