- back to 2.6.5

[packages/lm_sensors.git] / lm_sensors.spec

diff --git a/lm_sensors.spec b/lm_sensors.spec
index 6c4a5929b07a7ee40a781703ac869c4f98fe4b15..b5919d0b75641acf28587f33867e5142b5405cae 100644 (file)
--- a/lm_sensors.spec
+++ b/lm_sensors.spec
@@ -1,8 +1,10 @@
-
 # conditional build
 # _without_dist_kernel         without kernel for distributions
+#
 %include        /usr/lib/rpm/macros.perl
-%define         _rel 0.1
+
+%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
@@ -10,7 +12,8 @@ Summary(pt_BR):       Ferramentas para monitora
 Summary(ru):   õÔÉÌÉÔÙ ÄÌÑ ÍÏÎÉÔÏÒÉÎÇÁ ÁÐÐÁÒÁÔÕÒÙ
 Summary(uk):   õÔÉ̦ÔÉ ÄÌÑ ÍÏΦÔÏÒÉÎÇÕ ÁÐÁÒÁÔÕÒÉ
 Name:          lm_sensors
-Version:       2.6.4
+Version:       2.6.5
+%define _rel   1
 Release:       %{_rel}
 License:       GPL
 Group:         Applications/System
@@ -18,17 +21,21 @@ Source0:    http://secure.netroedge.com/~lm78/archive/%{name}-%{version}.tar.gz
 Source1:       sensors.init
 Source2:       sensors.sysconfig
 Patch0:                %{name}-make.patch
+Patch1:                %{name}-ppc.patch
 URL:           http://www.lm-sensors.nu/
 BuildRequires: bison
 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
 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.
@@ -52,6 +59,18 @@ SMBus 
 SMBus ÔÁ ÍÏΦÔÏÒÉÎÇÕ. õ÷áçá: ÄÌÑ ÃØÏÇÏ ÐÏÔÒ¦ÂÎÁ ÓÐÅæÁÌØÎÁ ЦÄÔÒÉÍËÁ,
 ÑËÁ צÄÓÕÔÎÑ Õ ÓÔÁÎÄÁÒÔÎÉÈ ÓÔÁÒÉÈ ÑÄÒÁÈ 2.2.XX !
 
+%package sensord
+Summary:       Sensord daemon
+Summary(pl):   Demon sensord
+Group:         Daemon
+Requires:      %{name} = %{version}
+
+%description sensord
+Sensord daemon.
+
+%description sensord -l pl
+Demon sensord.
+
 %package devel
 Summary:       Header files for lm_sensors
 Summary(pl):   Pliki nag³ówkowe dla lm_sensors
@@ -142,7 +161,8 @@ Modu
 
 %prep
 %setup -q
-#%patch0 -p1
+%patch0 -p1
+%patch1 -p1
 
 %build
 #up
@@ -154,21 +174,25 @@ Modu
        SMP=0
 
 %{__make} install-kernel \
-        MODDIR=kernel-up-modules
+       MODDIR=kernel-up-modules
 %{__make} install-kernel-busses \
-        MODDIR=kernel-up-modules
+        MODPREF=kernel-up-modules
 %{__make} install-kernel-chips \
-        MODDIR=kernel-up-modules
+        MODPREF=kernel-up-modules
 
 %{__make} clean
 
 #smp
 %{__make} \
-        OPTS="%{rpmcflags} -D__KERNEL_SMP=1" \
-        LINUX=/dev/null \
-        LINUX_HEADERS=%{_kernelsrcdir}/include \
-        I2C_HEADERS=%{_kernelsrcdir}/include \
-        SMP=1
+       OPTS="%{rpmcflags} -D__KERNEL_SMP=1" \
+       LINUX=/dev/null \
+       LINUX_HEADERS=%{_kernelsrcdir}/include \
+       I2C_HEADERS=%{_kernelsrcdir}/include \
+       PROG_EXTRA:="sensord dump" \
+       SMP=1
+
+cd prog/eepromer
+%{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -180,32 +204,35 @@ install -d $RPM_BUILD_ROOT{%{_sbindir},%{_mandir}/man8} \
        PREFIX=%{_prefix} \
        ETCDIR=%{_sysconfdir} \
        MANDIR=%{_mandir} \
-       MODDIR=/lib/modules/%{_kernel_ver}smp/misc
+       PROG_EXTRA:="sensord dump" \
+       MODDIR=/lib/modules/%{_kernel_ver}smp/misc \
+       MODPREF=/lib/modules/%{_kernel_ver}smp
 
-install prog/sensord/sensord $RPM_BUILD_ROOT%{_sbindir}
-install prog/sensord/sensord.8 $RPM_BUILD_ROOT%{_mandir}/man8
+install prog/eepromer/{eeprom,eepromer}        $RPM_BUILD_ROOT%{_sbindir}
+install prog/dump/{i2c{dump,set},isadump} $RPM_BUILD_ROOT%{_sbindir}
+install prog/detect/i2cdetect $RPM_BUILD_ROOT%{_sbindir}
 
 install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/sensors
 install %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/sensors
 
-install kernel-up-modules/* $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/misc
+install kernel-up-modules/misc/* $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/misc
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post
-/sbin/ldconfig
+%post -p /sbin/ldconfig
+
+%post sensord
 /sbin/chkconfig --add sensors
 if [ -f /var/lock/subsys/sensors ]; then
        /etc/rc.d/init.d/sensors restart >&2
 else
-       echo "You have to configure sensors modules."
-       echo "Please edit /etc/sysconfig/sensors file according to your hardware."
+       echo "You have to configure sensors modules in /etc/sysconfig/sensors"
        echo
        echo "Run \"/etc/rc.d/init.d/sensors start\" to start sensors daemon." >&2
 fi
 
-%preun
+%preun sensord
 if [ "$1" = "0" ]; then
        if [ -f /var/lock/subsys/sensors ]; then
                /etc/rc.d/init.d/sensors stop >&2
@@ -229,21 +256,32 @@ fi
 
 %files
 %defattr(644,root,root,755)
-%doc BACKGROUND BUGS CHANGES README README.thinkpad TODO doc/[^k]*
+%doc BACKGROUND BUGS CHANGES README README.thinkpad TODO doc/{busses,chips}
+%doc doc/{FAQ,donations,fan-divisors,progs,temperature-sensors,*html,vid}
+%doc prog/{config,daemon,eeprom,eepromer/README*,matorb,maxilife,xeon}
 %attr(755,root,root) %{_bindir}/sensors
 %attr(755,root,root) %{_sbindir}/sensors-detect
-%attr(754,root,root) %{_sbindir}/sensord
-%attr(754,root,root) /etc/rc.d/init.d/sensors
+%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
 %attr(755,root,root) %{_libdir}/lib*.so.*.*
 %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/sensors.conf
-%config(noreplace) %verify(not size mtime md5) /etc/sysconfig/sensors
 %{_mandir}/man1/*
 %{_mandir}/man5/*
+
+%files sensord 
+%defattr(644,root,root,755)
+%attr(754,root,root) %{_sbindir}/sensord
+%attr(754,root,root) /etc/rc.d/init.d/sensors
+%config(noreplace) %verify(not size mtime md5) /etc/sysconfig/sensors
 %{_mandir}/man8/*
 
 %files devel
 %defattr(644,root,root,755)
-%doc doc/developers doc/kernel
+%doc doc/{developers,kernel}
 %attr(755,root,root) %{_libdir}/lib*.so
 %{_includedir}/sensors
 %{_includedir}/linux/*