Update to 3.3.3

This commit is contained in:
Jaromir Capik 2012-12-06 17:34:22 +01:00
parent 2a0ab68253
commit c7f2253af2
5 changed files with 7 additions and 84 deletions

1
.gitignore vendored
View File

@ -4,3 +4,4 @@ lm_sensors-3.1.2.tar.bz2
/lm_sensors-3.3.0.tar.bz2
/lm_sensors-3.3.1.tar.bz2
/lm_sensors-3.3.2.tar.bz2
/lm_sensors-3.3.3.tar.bz2

View File

@ -1,44 +0,0 @@
From 9c4da0d42de91406a75c802099451b5dba03bd1f Mon Sep 17 00:00:00 2001
Message-Id: <9c4da0d42de91406a75c802099451b5dba03bd1f.1333368985.git.npajkovs@redhat.com>
From: khali <khali@7894878c-1315-0410-8ee3-d5d059ff63e0>
Date: Thu, 29 Mar 2012 06:33:15 +0000
Subject: [PATCH] PCI bus is always required even if it might be missing on
some platforms. So don't choke is it is missing. Patch from
Jaromir Capik.
git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@6038 7894878c-1315-0410-8ee3-d5d059ff63e0
---
CHANGES | 3 +++
prog/detect/sensors-detect | 2 +-
2 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/CHANGES b/CHANGES
index 167cd15..5b57d72 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,9 @@
lm-sensors CHANGES file
-----------------------
+SVN HEAD
+ sensors-detect: Don't choke on systems without PCI
+
3.3.2 (2012-03-14)
libsensors: Added support for new sysfs attributes
Change sysfs detection to survive upcoming kernel changes
diff --git a/prog/detect/sensors-detect b/prog/detect/sensors-detect
index 709f546..970e26f 100755
--- a/prog/detect/sensors-detect
+++ b/prog/detect/sensors-detect
@@ -2996,7 +2996,7 @@ sub read_sys_dev_pci
my ($dev, @pci_list);
opendir(local *DEVICES, "$devices")
- or die "$devices: $!";
+ or return \@pci_list;
while (defined($dev = readdir(DEVICES))) {
my %record;
--
1.7.7.2

View File

@ -1,33 +0,0 @@
diff -Naur lm_sensors-3.3.2.orig/prog/sensors/sensors.1 lm_sensors-3.3.2/prog/sensors/sensors.1
--- lm_sensors-3.3.2.orig/prog/sensors/sensors.1 2007-10-25 11:59:05.000000000 +0200
+++ lm_sensors-3.3.2/prog/sensors/sensors.1 2012-09-26 22:46:03.000000000 +0200
@@ -49,23 +49,23 @@
is used to generate bus statements suitable for the configuration file.
.SH OPTIONS
-.IP "-c config-file"
+.IP "-c, --config-file config-file"
Specify a configuration file. If no file is specified, the libsensors
default configuration file is used. Use `-c /dev/null' to temporarily
disable this default configuration file.
-.IP -h
+.IP "-h, --help"
Print a help text and exit.
-.IP -s
+.IP "-s, --set"
Evaluate all `set' statements in the configuration file and exit. You must
be `root' to do this. If this parameter is not specified, no `set' statement
is evaluated.
-.IP -A
+.IP "-A, --no-adapter"
Do not show the adapter for each chip.
.IP -u
Raw output. This mode is only meant for debugging.
-.IP -v
+.IP "-v, --version"
Print the program version and exit.
-.IP -f
+.IP "-f, --fahrenheit"
Print the temperatures in degrees Fahrenheit instead of Celsius.
.IP --bus-list
Generate bus statements suitable for using in sensors.conf. Such bus statements

View File

@ -1,6 +1,6 @@
Name: lm_sensors
Version: 3.3.2
Release: 5%{?dist}
Version: 3.3.3
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
@ -16,8 +16,6 @@ Requires: /usr/sbin/dmidecode
Requires(post): systemd-units
BuildRequires: kernel-headers >= 2.2.16, bison, libsysfs-devel, flex, gawk
BuildRequires: rrdtool-devel
Patch0: 0001-PCI-bus-is-always-required-even-if-it-might-be-missi.patch
Patch1: 0002-sensors-man-missing-switches.patch
%description
The lm_sensors package includes a collection of modules for general SMBus
@ -54,8 +52,6 @@ database, and warns of sensor alarms.
%prep
%setup -q
%patch0 -p1
%patch1 -p1
mv prog/init/README prog/init/README.initscripts
chmod -x prog/init/fancontrol.init
@ -158,6 +154,9 @@ fi
%changelog
* Thu Dec 06 2012 Jaromir Capik <jcapik@redhat.com> - 3.3.3-1
- Update to 3.3.3
* Wed Sep 26 2012 Jaromir Capik <jcapik@redhat.com> - 3.3.2-5
- #856120 - sensors - Inconsistency between man page and help

View File

@ -1 +1 @@
f357ba00b080ab102a170f7bf8bb2578 lm_sensors-3.3.2.tar.bz2
73c2fcccdab6049d289c5e0c596192a1 lm_sensors-3.3.3.tar.bz2