- rebuild with new rrdtool

[packages/lm_sensors.git] / lm_sensors.spec

diff --git a/lm_sensors.spec b/lm_sensors.spec
index e8f374c0b2f79d669da2dce9c9d80f096d2bb1d3..7e2eb4ed8cdb9863f9a3f69858a1c3368a4b2246 100644 (file)
--- a/lm_sensors.spec
+++ b/lm_sensors.spec
@@ -16,20 +16,20 @@ Summary(pt_BR):     Ferramentas para monitora
 Summary(ru):   õÔÉÌÉÔÙ ÄÌÑ ÍÏÎÉÔÏÒÉÎÇÁ ÁÐÐÁÒÁÔÕÒÙ
 Summary(uk):   õÔÉ̦ÔÉ ÄÌÑ ÍÏΦÔÏÒÉÎÇÕ ÁÐÁÒÁÔÕÒÉ
 Name:          lm_sensors
-Version:       2.9.1
+Version:       2.9.2
 %define _rel   2
 Release:       %{_rel}
 License:       GPL
 Group:         Applications/System
 Source0:       http://secure.netroedge.com/~lm78/archive/%{name}-%{version}.tar.gz
-# Source0-md5: f5af615e39441d95471bdb72a3f01709
+# Source0-md5: 229f83cfbd081d5e7bd46885efec1c72
 Source1:       sensors.init
 Source2:       sensors.sysconfig
 Patch0:                %{name}-make.patch
 Patch1:                %{name}-ppc.patch
 Patch2:                %{name}-iconv-in-libc.patch
 Patch3:                %{name}-sensors-detect-PATH.patch
-Patch4:                %{name}-ipmi.patch
+Patch4:                %{name}-CAN-2005-2672.patch
 URL:           http://www.lm-sensors.nu/
 BuildRequires: rpmbuild(macros) >= 1.213
 %if %{with userspace}
@@ -37,7 +37,7 @@ BuildRequires:        bison
 BuildRequires: flex >= 2.5.1
 BuildRequires: perl-modules >= 5.6
 BuildRequires: rpm-perlprov >= 3.0.3-16
-BuildRequires: rrdtool-devel
+BuildRequires: rrdtool-devel >= 1.2.10
 %endif
 %if %{with kernel} && %{with dist_kernel}
 BuildRequires: kernel24-i2c-devel >= 2.9.0
@@ -149,7 +149,7 @@ Group:              Applications/System
 Release:       %{_rel}@%{_kernel_ver_str}
 Requires(post,postun): /sbin/depmod
 %{?with_dist_kernel:%requires_releq_kernel_up}
-%{?with_dist_kernel:Requires:  i2c >= 2.8.2}
+%{?with_dist_kernel:Requires:  i2c >= 2.9.0}
 Provides:      %{name}-modules = %{version}-%{release}
 Obsoletes:     kernel-misc-lm_sensors
 
@@ -166,7 +166,7 @@ Group:              Applications/System
 Release:       %{_rel}@%{_kernel_ver_str}
 Requires(post,postun): /sbin/depmod
 %{?with_dist_kernel:%requires_releq_kernel_smp}
-%{?with_dist_kernel:Requires:  i2c >= 2.8.2}
+%{?with_dist_kernel:Requires:  i2c >= 2.9.0}
 Provides:      %{name}-modules = %{version}-%{release}
 Obsoletes:     kernel-smp-misc-lm_sensors
 
@@ -185,7 +185,7 @@ Modu
 %patch4 -p1
 
 %build
-%if %{with kernel} && %{with smp}
+%if %{with kernel}
 # workaround to avoid unresolved dmi* symbols in i2c-piix4.o
 install -d fakelinux
 :> fakelinux/.config
@@ -196,6 +196,7 @@ echo 'CONFIG_X86=y' >> fakelinux/.config
 echo 'CONFIG_IPMI_HANDLER=m' >> fakelinux/.config
 %endif
 
+%if %{with smp}
 # SMP
 %{__make} all-kernel-busses all-kernel-chips \
        CC="%{kgcc}" \
@@ -215,7 +216,6 @@ echo 'CONFIG_IPMI_HANDLER=m' >> fakelinux/.config
 %{__make} clean
 %endif
 
-%if %{with kernel}
 # UP
 %{__make} all-kernel-busses all-kernel-chips \
        CC="%{kgcc}" \