Hello community, here is the log from the commit of package sensors checked in at Thu Mar 13 19:06:11 CET 2008. -------- --- sensors/sensors.changes 2008-02-04 10:41:27.000000000 +0100 +++ /mounts/work_src_done/STABLE/sensors/sensors.changes 2008-03-13 18:51:19.507798000 +0100 @@ -1,0 +2,6 @@ +Thu Mar 13 18:50:04 CET 2008 - werner@suse.de + +- Remove hard coded loading of i2c-dev or better i2c-core as it + should happen due auto dependcies (bnc#369798) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sensors.spec ++++++ --- /var/tmp/diff_new_pack.i24958/_old 2008-03-13 19:05:59.000000000 +0100 +++ /var/tmp/diff_new_pack.i24958/_new 2008-03-13 19:05:59.000000000 +0100 @@ -10,11 +10,12 @@ # norootforbuild + Name: sensors BuildRequires: bison flex rrdtool-devel Url: http://www.lm-sensors.org/ Version: 3.0.1 -Release: 1 +Release: 12 Summary: Hardware health monitoring for Linux License: GPL v2 or later Group: System/Monitoring @@ -196,6 +197,9 @@ %doc /usr/share/man/man3/*.3.gz %changelog +* Thu Mar 13 2008 werner@suse.de +- Remove hard coded loading of i2c-dev or better i2c-core as it + should happen due auto dependcies (bnc#369798) * Mon Feb 04 2008 jdelvare@suse.de - Update to lm_sensors 3.0.1 * Library no longer depends on libsysfs ++++++ lm_sensors-3.0.1.dif ++++++ --- /var/tmp/diff_new_pack.i24958/_old 2008-03-13 19:05:59.000000000 +0100 +++ /var/tmp/diff_new_pack.i24958/_new 2008-03-13 19:05:59.000000000 +0100 @@ -1,7 +1,5 @@ -Index: Makefile -=================================================================== ---- Makefile.orig -+++ Makefile +--- Makefile ++++ Makefile 2008-03-13 00:00:00.000000000 +0100 @@ -136,7 +136,7 @@ ifeq ($(DEBUG),1) ALL_CPPFLAGS += -DDEBUG ALL_CFLAGS += -O -g @@ -11,10 +9,8 @@ endif ifeq ($(WARN),1) -Index: prog/init/README -=================================================================== ---- prog/init/README.orig -+++ prog/init/README +--- prog/init/README ++++ prog/init/README 2008-03-13 00:00:00.000000000 +0100 @@ -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 @@ -37,10 +33,8 @@ For more information see the top of the file. To configure this service one should put appropriate "alias i2c-bus-0 xxx" -Index: prog/init/lm_sensors.init.suse -=================================================================== ---- prog/init/lm_sensors.init.suse.orig -+++ prog/init/lm_sensors.init.suse +--- prog/init/lm_sensors.init.suse ++++ prog/init/lm_sensors.init.suse 2008-03-13 18:49:33.350172134 +0100 @@ -1,19 +1,15 @@ #!/bin/sh # @@ -69,23 +63,20 @@ # # 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 +36,91 @@ +@@ -39,116 +35,82 @@ + # in order as normal shell variables with the special names: # MODULE_1, MODULE_2, MODULE_3, etc. - # If sensors isn't supported by the kernel, try loading the module... +-# If sensors isn't supported by the kernel, try loading the module... -[ -e /proc/sys/dev/sensors ] || /sbin/modprobe i2c-proc &>/dev/null -+[ -e /sys/bus/i2c/devices ] || /sbin/modprobe i2c-dev &>/dev/null - - # Don't bother if /proc/sensors still doesn't exist, kernel doesn't have - # support for sensors. +- +-# Don't bother if /proc/sensors still doesn't exist, kernel doesn't have +-# support for sensors. -[ -e /proc/sys/dev/sensors ] || exit 0 - -+[ -e /sys/bus/i2c/devices ] || exit 0 -+ - # If sensors was not already running, unload the module... +-# If sensors was not already running, unload the module... -[ -e /var/lock/subsys/lm_sensors ] || /sbin/modprobe -r i2c-proc &>/dev/null -+[ -e /var/lock/subsys/sensors ] || /sbin/modprobe -r i2c-dev &>/dev/null - +- CONFIG=/etc/sysconfig/lm_sensors -PSENSORS=/usr/local/bin/sensors +PSENSORS=/usr/bin/sensors @@ -150,13 +141,13 @@ done - $PSENSORS -s + rc_status ++ ++ /usr/bin/sensors -s &> /dev/null ++ rc_status - RETVAL=$? - if [ $RETVAL -eq 0 ] && touch /var/lock/subsys/lm_sensors ; then - rc_status -v -+ /usr/bin/sensors -s &> /dev/null -+ rc_status -+ + # Start fan control, if configured + if test -s "$FANCONFIG" -a -x "$PFAN" ; then + echo -n ", starting fan control: " @@ -230,7 +221,7 @@ # See how we were called. case "$1" in start) -@@ -163,12 +135,12 @@ case "$1" in +@@ -163,12 +125,12 @@ case "$1" in restart|reload) restart ;; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org