new lm-sensors release

Signed-off-by: Nikola Pajkovsky <npajkovs@redhat.com>
This commit is contained in:
Nikola Pajkovsky 2011-07-22 08:50:30 +02:00
parent 3b83433a9e
commit 853e5afc41
4 changed files with 7 additions and 65 deletions

1
.gitignore vendored
View File

@ -2,3 +2,4 @@ lm_sensors-3.1.2.tar.bz2
/lm_sensors-3.1.2.svn5857.tar.gz
/lm_sensors-3.2.0.tar.bz2
/lm_sensors-3.3.0.tar.bz2
/lm_sensors-3.3.1.tar.bz2

View File

@ -1,60 +0,0 @@
Index: prog/init/lm_sensors.service
===================================================================
--- prog/init/lm_sensors.service (revision 0)
+++ prog/init/lm_sensors.service (revision 0)
@@ -0,0 +1,14 @@
+[Unit]
+Description=lm_sensors for monitoring motherboard sensor values
+After=syslog.target
+
+[Service]
+EnvironmentFile=/etc/sysconfig/lm_sensors
+Type=oneshot
+RemainAfterExit=yes
+ExecStart=-/sbin/modprobe -qab $BUS_MODULES $HWMON_MODULES
+ExecStart=/usr/bin/sensors -s
+ExecStop=-/sbin/modprobe -qabr $BUS_MODULES $HWMON_MODULES
+
+[Install]
+WantedBy=multi-user.target
Index: prog/detect/sensors-detect
===================================================================
--- prog/detect/sensors-detect (revision 5939)
+++ prog/detect/sensors-detect (working copy)
@@ -2339,7 +2339,7 @@
if (!$use_udev) {
# Try some known default udev db locations, just in case
if (-e '/dev/.udev.tdb' || -e '/dev/.udev'
- || -e '/dev/.udevdb') {
+ || -e '/dev/.udevdb' || -e '/run/udev') {
$use_udev = 1;
$dev_i2c = '/dev/i2c-';
}
@@ -6378,6 +6378,14 @@
}
close(SYSCONFIG);
+ if (-x "/bin/systemctl" &&
+ -f "/lib/systemd/system/lm_sensors.service") {
+ system("/bin/systemctl", "enable", "lm_sensors.service");
+ system("/bin/systemctl", "start", "lm_sensors.service");
+ # All done, don't check for /etc/init.d/lm_sensors
+ return;
+ }
+
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";
@@ -6433,8 +6441,10 @@
exit -1;
}
- if (-x "/sbin/service" && -f "/etc/init.d/lm_sensors" &&
- -f "/var/lock/subsys/lm_sensors") {
+ if (-x "/bin/systemctl" && -f "/lib/systemd/system/lm_sensors.service") {
+ system("/bin/systemctl", "stop", "lm_sensors.service");
+ } elsif (-x "/sbin/service" && -f "/etc/init.d/lm_sensors" &&
+ -f "/var/lock/subsys/lm_sensors") {
system("/sbin/service", "lm_sensors", "stop");
}

View File

@ -1,13 +1,12 @@
Name: lm_sensors
Version: 3.3.0
Release: 2%{?dist}
Version: 3.3.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
# these 2 were taken from PLD-linux, Thanks!
Source2: sensord.sysconfig
Source3: sensord.init
Patch0: lm_sensors-3.3.0-systemd.patch
Summary: Hardware monitoring tools
Group: Applications/System
License: LGPLv2+
@ -53,7 +52,6 @@ database, and warns of sensor alarms.
%prep
%setup -q
%patch0 -p0
mv prog/init/README prog/init/README.initscripts
chmod -x prog/init/fancontrol.init
@ -145,6 +143,9 @@ fi
%changelog
* Fri Jul 22 2011 Nikola Pajkovsky <npajkovs@redhat.com> - 3.3.1-1
- new upstream release 3.3.1
* Sun Apr 24 2011 Hans de Goede <hdegoede@redhat.com> - 3.3.0-2
- Fix sensors-detect with the udevdb now living under /run (#697565)
- Provide a native systemd service file (#692159)

View File

@ -1 +1 @@
5eb18d7531ead4f54f28a1133a606535 lm_sensors-3.3.0.tar.bz2
8c0eebda8524fc87da1393b4564d279b lm_sensors-3.3.1.tar.bz2