- rel 5

- fix lm_sensors-make.patch
- add %{_kernel24} and %{kernel_ver} macros to separate dmicode from 2.2 tree

Changed files:
    lm_sensors.spec -> 1.80

diff --git a/lm_sensors.spec b/lm_sensors.spec
index 618cd01d2c0232962368d1a74b54e6c43344d3fc..119d1601d505cf2c9c23cb4175c3c8dd44b4f825 100644 (file)
--- a/lm_sensors.spec
+++ b/lm_sensors.spec
@@ -3,6 +3,9 @@
 #
 %include        /usr/lib/rpm/macros.perl
 
+%define                _kernel_ver     %(grep UTS_RELEASE %{_kernelsrcdir}/include/linux/version.h 2>/dev/null | cut -d'"' -f2)
+%define                _kernel_ver_str %(echo %{_kernel_ver} | sed s/-/_/g)
+
 Summary:       Hardware health monitoring
 Summary(pl):   Monitor stanu sprzêtu
 Summary(pt_BR):        Ferramentas para monitoração do hardware
@@ -10,7 +13,7 @@ Summary(ru):  
 Summary(uk):   õÔÉ̦ÔÉ ÄÌÑ ÍÏΦÔÏÒÉÎÇÕ ÁÐÁÒÁÔÕÒÉ
 Name:          lm_sensors
 Version:       2.6.4
-%define _rel   4
+%define _rel   5
 Release:       %{_rel}
 License:       GPL
 Group:         Applications/System
@@ -31,6 +34,8 @@ PreReq:               /sbin/ldconfig
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 Obsoletes:     liblm_sensors1
 
+%define                _kernel24       %(echo %{_kernel_ver} | grep -q '2\.[012]\.' ; echo $?)
+
 %description
 Tools for monitoring the hardware health of Linux systems containing
 hardware health monitoring hardware such as the LM78 and LM75.
@@ -256,7 +261,9 @@ fi
 %doc prog/{config,daemon,eeprom,eepromer/README*,matorb,maxilife,xeon}
 %attr(755,root,root) %{_bindir}/sensors
 %attr(755,root,root) %{_sbindir}/sensors-detect
+%if %{_kernel24}
 %attr(755,root,root) %{_sbindir}/dmidecode
+%endif
 %attr(755,root,root) %{_sbindir}/eeprom*
 %attr(755,root,root) %{_sbindir}/i2c*
 %attr(755,root,root) %{_sbindir}/isadump