rpms/lm_sensors/devel lm_sensors-3.0.0-lsb-retcode.patch, NONE, 1.1 lm_sensors-3.0.1-sensors-detect-special-chips.patch, NONE, 1.1 lm_sensors-2.10.4-service-default-off.patch, 1.2, 1.3 lm_sensors.spec, 1.59, 1.60 lm_sensors-3.0.0-sensord.patch, 1.1, NONE lm_sensors-3.0.0-sensors.conf.patch, 1.1, NONE
Hans de Goede (jwrdegoede)
fedora-extras-commits at redhat.com
Mon Feb 11 13:21:09 UTC 2008
Author: jwrdegoede
Update of /cvs/extras/rpms/lm_sensors/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31398
Modified Files:
lm_sensors-2.10.4-service-default-off.patch lm_sensors.spec
Added Files:
lm_sensors-3.0.0-lsb-retcode.patch
lm_sensors-3.0.1-sensors-detect-special-chips.patch
Removed Files:
lm_sensors-3.0.0-sensord.patch
lm_sensors-3.0.0-sensors.conf.patch
Log Message:
* Mon Feb 11 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 3.0.1-1
- New upstream release 3.0.1
- Drop several patches which are included in the new upstream release
- Add a patch to make the initscript returncodes LSB compliant (bug 431884)
lm_sensors-3.0.0-lsb-retcode.patch:
--- NEW FILE lm_sensors-3.0.0-lsb-retcode.patch ---
--- lm_sensors/prog/init/lm_sensors.init 2008-02-07 11:37:22.000000000 -0500
+++ lm_sensors/prog/init/lm_sensors.init 2008-02-07 11:41:04.000000000 -0500
@@ -40,15 +40,15 @@
# 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 /proc/sys/dev/sensors ] || exit 6
# If sensors was not already running, unload the module...
[ -e /var/lock/subsys/lm_sensors ] || /sbin/modprobe -r i2c-proc >/dev/null 2>&1
fi
CONFIG=/etc/sysconfig/lm_sensors
-[ -r "$CONFIG" ] || exit 0
-grep '^MODULE_' $CONFIG >/dev/null 2>&1 || exit 0
+[ -r "$CONFIG" ] || exit 6
+grep '^MODULE_' $CONFIG >/dev/null 2>&1 || exit 6
# Load config file
. "$CONFIG"
@@ -147,7 +147,7 @@
;;
*)
echo "Usage: $0 {start|stop|status|restart|reload|condrestart}"
- exit 1
+ exit 3
esac
exit $RETVAL
lm_sensors-3.0.1-sensors-detect-special-chips.patch:
--- NEW FILE lm_sensors-3.0.1-sensors-detect-special-chips.patch ---
diff -up lm_sensors-3.0.1/prog/detect/sensors-detect~ lm_sensors-3.0.1/prog/detect/sensors-detect
--- lm_sensors-3.0.1/prog/detect/sensors-detect~ 2008-02-11 13:59:25.000000000 +0100
+++ lm_sensors-3.0.1/prog/detect/sensors-detect 2008-02-11 13:59:25.000000000 +0100
@@ -5677,6 +5677,9 @@ sub main
initialize_conf;
initialize_proc_pci;
initialize_modules_list;
+ # make sure any special case chips are added to the chip_ids list before
+ # making the support modules list
+ chip_special_cases();
initialize_modules_supported;
initialize_cpu_list();
@@ -5740,9 +5744,6 @@ sub main
print "\n";
}
- # Before looking for chips, make sure any special case chips are
- # added to the chip_ids list
- chip_special_cases();
$i2c_addresses_to_scan = i2c_addresses_to_scan();
print "We are now going to do the I2C/SMBus adapter probings. Some chips may\n",
lm_sensors-2.10.4-service-default-off.patch:
Index: lm_sensors-2.10.4-service-default-off.patch
===================================================================
RCS file: /cvs/extras/rpms/lm_sensors/devel/lm_sensors-2.10.4-service-default-off.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- lm_sensors-2.10.4-service-default-off.patch 22 Aug 2007 19:57:12 -0000 1.2
+++ lm_sensors-2.10.4-service-default-off.patch 11 Feb 2008 13:21:03 -0000 1.3
@@ -1,20 +1,25 @@
---- lm_sensors-2.10.4/prog/detect/sensors-detect~ 2007-07-19 13:53:58.000000000 -0400
-+++ lm_sensors-2.10.4/prog/detect/sensors-detect 2007-08-21 14:29:25.000000000 -0400
-@@ -5785,10 +5785,8 @@
- $i++;
- }
- print SYSCONFIG $sysconfig;
--
-- print "Copy prog/init/lm_sensors.init to /etc/init.d/lm_sensors\n".
-- "for initialization at boot time.\n"
-- unless -f "/etc/init.d/lm_sensors";
-+
-+ system("/sbin/chkconfig", "lm_sensors", "on");
- }
- }
+diff -up lm_sensors-3.0.1/prog/detect/sensors-detect.foo lm_sensors-3.0.1/prog/detect/sensors-detect
+--- lm_sensors-3.0.1/prog/detect/sensors-detect.foo 2008-01-22 13:22:47.000000000 +0100
++++ lm_sensors-3.0.1/prog/detect/sensors-detect 2008-02-11 13:42:04.000000000 +0100
+@@ -5943,6 +5943,15 @@ EOT
---- lm_sensors-2.10.4/prog/init/lm_sensors.init~ 2007-08-22 16:43:50.000000000 +0200
-+++ lm_sensors-2.10.4/prog/init/lm_sensors.init 2007-08-22 16:43:50.000000000 +0200
+ if (-x "/sbin/insserv" && -f "/etc/init.d/lm_sensors") {
+ system("/sbin/insserv", "/etc/init.d/lm_sensors");
++ } elsif (-x "/sbin/chkconfig" && -f "/etc/init.d/lm_sensors") {
++ system("/sbin/chkconfig", "lm_sensors", "on");
++ if (-x "/sbin/service") {
++ if (-f "/var/lock/subsys/lm_sensors") {
++ system("/sbin/service", "lm_sensors", "restart");
++ } else {
++ system("/sbin/service", "lm_sensors", "start");
++ }
++ }
+ } else {
+ print "You should now start the lm_sensors service to load the required\n".
+ "kernel modules.\n\n";
+diff -up lm_sensors-3.0.1/prog/init/lm_sensors.init.foo lm_sensors-3.0.1/prog/init/lm_sensors.init
+--- lm_sensors-3.0.1/prog/init/lm_sensors.init.foo 2007-04-27 14:34:17.000000000 +0200
++++ lm_sensors-3.0.1/prog/init/lm_sensors.init 2008-02-11 13:08:58.000000000 +0100
@@ -1,6 +1,6 @@
#!/bin/sh
#
Index: lm_sensors.spec
===================================================================
RCS file: /cvs/extras/rpms/lm_sensors/devel/lm_sensors.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- lm_sensors.spec 18 Dec 2007 10:19:41 -0000 1.59
+++ lm_sensors.spec 11 Feb 2008 13:21:03 -0000 1.60
@@ -1,6 +1,6 @@
Name: lm_sensors
-Version: 3.0.0
-Release: 3%{?dist}
+Version: 3.0.1
+Release: 1%{?dist}
URL: http://www.lm-sensors.org/
Source: http://dl.lm-sensors.org/lm-sensors/releases/%{name}-%{version}.tar.bz2
Source1: lm_sensors.sysconfig
@@ -8,8 +8,8 @@
Source2: sensord.sysconfig
Source3: sensord.init
Patch0: lm_sensors-2.10.4-service-default-off.patch
-Patch1: lm_sensors-3.0.0-sensord.patch
-Patch2: lm_sensors-3.0.0-sensors.conf.patch
+Patch1: lm_sensors-3.0.0-lsb-retcode.patch
+Patch2: lm_sensors-3.0.1-sensors-detect-special-chips.patch
Summary: Hardware monitoring tools
Group: Applications/System
License: GPLv2+
@@ -167,6 +167,11 @@
%changelog
+* Mon Feb 11 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 3.0.1-1
+- New upstream release 3.0.1
+- Drop several patches which are included in the new upstream release
+- Add a patch to make the initscript returncodes LSB compliant (bug 431884)
+
* Tue Dec 18 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 3.0.0-3
- Fix sensors.conf errors with certain chips (patch send in by upstream)
--- lm_sensors-3.0.0-sensord.patch DELETED ---
--- lm_sensors-3.0.0-sensors.conf.patch DELETED ---
More information about the fedora-extras-commits
mailing list