- 2.7.0 (i2c 2.7.0 required!)

[packages/lm_sensors.git] / lm_sensors.spec

diff --git a/lm_sensors.spec b/lm_sensors.spec
index 618cd01d2c0232962368d1a74b54e6c43344d3fc..370c805ea28cd370a3b3748c018bf24f60429c13 100644 (file)
--- a/lm_sensors.spec
+++ b/lm_sensors.spec
@@ -1,7 +1,7 @@
 # conditional build
 # _without_dist_kernel         without kernel for distributions
 #
-%include        /usr/lib/rpm/macros.perl
+%include       /usr/lib/rpm/macros.perl
 
 Summary:       Hardware health monitoring
 Summary(pl):   Monitor stanu sprzêtu
@@ -9,8 +9,8 @@ Summary(pt_BR): Ferramentas para monitora
 Summary(ru):   õÔÉÌÉÔÙ ÄÌÑ ÍÏÎÉÔÏÒÉÎÇÁ ÁÐÐÁÒÁÔÕÒÙ
 Summary(uk):   õÔÉ̦ÔÉ ÄÌÑ ÍÏΦÔÏÒÉÎÇÕ ÁÐÁÒÁÔÕÒÉ
 Name:          lm_sensors
-Version:       2.6.4
-%define _rel   4
+Version:       2.7.0
+%define _rel   1
 Release:       %{_rel}
 License:       GPL
 Group:         Applications/System
@@ -25,18 +25,18 @@ BuildRequires:      flex >= 2.5.1
 BuildRequires: perl-modules >= 5.6
 BuildRequires: rpm-perlprov >= 3.0.3-16
 BuildRequires: rrdtool-devel
-%{!?_without_dist_kernel:BuildRequires:        i2c-devel >= 2.6.0}
-PreReq:                /sbin/chkconfig
-PreReq:                /sbin/ldconfig
+%{!?_without_dist_kernel:BuildRequires:        i2c-devel >= 2.7.0}
 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.
 
 %description -l pl
-Narzêdzie do monitorowania sprzêtu w systemach Linuksowych
+Narzêdzie do monitorowania sprzêtu w systemach linuksowych
 wyposa¿onych w sprzêt monitoruj±cy, taki jak LM78 lub LM75.
 
 %description -l pt_BR
@@ -47,17 +47,18 @@ hardware.
 %description -l ru
 ðÁËÅÔ lm_sensors ÓÏÄÅÒÖÉÔ ÎÁÂÏÒ ÍÏÄÕÌÅÊ ÄÌÑ ÓÔÁÎÄÁÒÔÎÏÇÏ ÄÏÓÔÕÐÁ Ë
 SMBus É ÍÏÎÉÔÏÒÉÎÇÁ. ÷îéíáîéå: ÄÌÑ ÜÔÏÇÏ ÎÅÏÂÈÏÄÉÍÁ ÓÐÅÃÉÁÌØÎÁÑ
-ÐÏÄÄÅÒÖËÁ, ÏÔÓÕÔÓÔ×ÕÀÝÁÑ × ÓÔÁÎÄÁÒÔÎÙÈ ÓÔÁÒÙÈ ÑÄÒÁÈ 2.2.XX !
+ÐÏÄÄÅÒÖËÁ, ÏÔÓÕÔÓÔ×ÕÀÝÁÑ × ÓÔÁÎÄÁÒÔÎÙÈ ÓÔÁÒÙÈ ÑÄÒÁÈ 2.2.XX!
 
 %description -l uk
 ðÁËÅÔ lm_sensors ͦÓÔÉÔØ ÎÁÂ¦Ò ÍÏÄÕÌ¦× ÄÌÑ ÓÔÁÎÄÁÒÔÎÏÇÏ ÄÏÓÔÕÐÕ ÄÏ
 SMBus ÔÁ ÍÏΦÔÏÒÉÎÇÕ. õ÷áçá: ÄÌÑ ÃØÏÇÏ ÐÏÔÒ¦ÂÎÁ ÓÐÅæÁÌØÎÁ ЦÄÔÒÉÍËÁ,
-ÑËÁ צÄÓÕÔÎÑ Õ ÓÔÁÎÄÁÒÔÎÉÈ ÓÔÁÒÉÈ ÑÄÒÁÈ 2.2.XX !
+ÑËÁ צÄÓÕÔÎÑ Õ ÓÔÁÎÄÁÒÔÎÉÈ ÓÔÁÒÉÈ ÑÄÒÁÈ 2.2.XX!
 
 %package sensord
 Summary:       Sensord daemon
 Summary(pl):   Demon sensord
 Group:         Daemon
+Requires(post,preun):  /sbin/chkconfig
 Requires:      %{name} = %{version}
 
 %description sensord
@@ -125,9 +126,9 @@ Summary:    Kernel modules for various buses and monitor chips
 Summary(pl):   Modu³y j±dra dla ró¿nego rodzaju sensorów
 Group:         Applications/System
 Release:       %{_rel}@%{_kernel_ver_str}
-Prereq:                /sbin/depmod
+Requires(post,postun): /sbin/depmod
 %{!?_without_dist_kernel:%requires_releq_kernel_up}
-%{!?_without_dist_kernel:Requires:     i2c >= 2.6.0}
+%{!?_without_dist_kernel:Requires:     i2c >= 2.7.0}
 Provides:      %{name}-modules = %{version}
 Obsoletes:     %{name}-modules
 
@@ -142,9 +143,9 @@ Summary:    Kernel modules for various buses and monitor chips
 Summary(pl):   Modu³y j±dra dla ró¿nego rodzaju sensorów
 Group:         Applications/System
 Release:       %{_rel}@%{_kernel_ver_str}
-Prereq:                /sbin/depmod
+Requires(post,postun): /sbin/depmod
 %{!?_without_dist_kernel:%requires_releq_kernel_smp}
-%{!?_without_dist_kernel:Requires:     i2c >= 2.6.0}
+%{!?_without_dist_kernel:Requires:     i2c >= 2.7.0}
 Provides:      %{name}-modules = %{version}
 Obsoletes:     %{name}-modules
 
@@ -162,6 +163,7 @@ Modu
 %build
 #up
 %{__make} \
+       CC=%{kgcc} \
        OPTS="%{rpmcflags}" \
        LINUX=/dev/null \
        LINUX_HEADERS=%{_kernelsrcdir}/include \
@@ -171,14 +173,15 @@ Modu
 %{__make} install-kernel \
        MODDIR=kernel-up-modules
 %{__make} install-kernel-busses \
-        MODPREF=kernel-up-modules
+       MODPREF=kernel-up-modules
 %{__make} install-kernel-chips \
-        MODPREF=kernel-up-modules
+       MODPREF=kernel-up-modules
 
 %{__make} clean
 
 #smp
 %{__make} \
+       CC=%{kgcc} \
        OPTS="%{rpmcflags} -D__KERNEL_SMP=1" \
        LINUX=/dev/null \
        LINUX_HEADERS=%{_kernelsrcdir}/include \
@@ -215,7 +218,8 @@ install kernel-up-modules/misc/* $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/misc
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post -p /sbin/ldconfig
+%post  -p /sbin/ldconfig
+%postun        -p /sbin/ldconfig
 
 %post sensord
 /sbin/chkconfig --add sensors
@@ -235,15 +239,13 @@ if [ "$1" = "0" ]; then
        /sbin/chkconfig --del sensors
 fi
 
-%postun        -p /sbin/ldconfig
-
 %post -n kernel-misc-%{name}
 /sbin/depmod -a
 
-%post -n kernel-smp-misc-%{name}
+%postun -n kernel-misc-%{name}
 /sbin/depmod -a
 
-%postun -n kernel-misc-%{name}
+%post -n kernel-smp-misc-%{name}
 /sbin/depmod -a
 
 %postun -n kernel-smp-misc-%{name}
@@ -256,7 +258,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
@@ -265,7 +269,7 @@ fi
 %{_mandir}/man1/*
 %{_mandir}/man5/*
 
-%files sensord 
+%files sensord
 %defattr(644,root,root,755)
 %attr(754,root,root) %{_sbindir}/sensord
 %attr(754,root,root) /etc/rc.d/init.d/sensors