- rel 0.7

- some install "sorcery"
- more aplications
- sensord moved to separate package (not everyone wants this, eg. me)

Changed files:
    lm_sensors.spec -> 1.69

diff --git a/lm_sensors.spec b/lm_sensors.spec
index 04497263699a75c7878eb1a5f609442ad7952b94..647f50480a9b66fa0d01933a9603306f0da55155 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
-%define         _rel 0.2
+%define         _rel 0.7
 
 Summary:       Hardware health monitoring
 Summary(pl):   Monitor stanu sprzêtu
@@ -52,6 +52,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
@@ -151,7 +163,6 @@ Modu
        LINUX=/dev/null \
        LINUX_HEADERS=%{_kernelsrcdir}/include \
        I2C_HEADERS=%{_kernelsrcdir}/include \
-       PROG_EXTRA:=sensord \
        SMP=0
 
 %{__make} install-kernel \
@@ -169,9 +180,12 @@ Modu
        LINUX=/dev/null \
        LINUX_HEADERS=%{_kernelsrcdir}/include \
        I2C_HEADERS=%{_kernelsrcdir}/include \
-       PROG_EXTRA:=sensord \
+       PROG_EXTRA:="sensord dump" \
        SMP=1
 
+cd prog/eepromer
+%{__make}
+
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_sbindir},%{_mandir}/man8} \
@@ -182,11 +196,13 @@ install -d $RPM_BUILD_ROOT{%{_sbindir},%{_mandir}/man8} \
        PREFIX=%{_prefix} \
        ETCDIR=%{_sysconfdir} \
        MANDIR=%{_mandir} \
+       PROG_EXTRA:="sensord dump" \
        MODDIR=/lib/modules/%{_kernel_ver}smp/misc \
-       MODPREF=/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/sensord/sensord $RPM_BUILD_ROOT%{_sbindir}
+install prog/eepromer/{eeprom,eepromer} $RPM_BUILD_ROOT%{_sbindir}
+#install prog/sensord/sensord.8 $RPM_BUILD_ROOT%{_mandir}/man8
 
 install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/sensors
 install %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/sensors
@@ -233,15 +249,20 @@ fi
 %files
 %defattr(644,root,root,755)
 %doc BACKGROUND BUGS CHANGES README README.thinkpad TODO doc/[^k]*
+%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
+%attr(755,root,root) %{_sbindir}/eeprom*
 %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