- fixed requirements

  (PreReq: /sbin/chkconfig for %{name}-sensord not %{name}),
- cosmetics,
- release 4, STBR.

Changed files:
    lm_sensors.spec -> 1.86

diff --git a/lm_sensors.spec b/lm_sensors.spec
index 80933f290c79fc2f0b2bd84ce413891464081679..7e647bbf64ea02d9dde83cfc65b1f19e9d19ef98 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
@@ -10,7 +10,7 @@ Summary(ru):  
 Summary(uk):   õÔÉ̦ÔÉ ÄÌÑ ÍÏΦÔÏÒÉÎÇÕ ÁÐÁÒÁÔÕÒÉ
 Name:          lm_sensors
 Version:       2.6.5
-%define _rel   3
+%define _rel   4
 Release:       %{_rel}
 License:       GPL
 Group:         Applications/System
@@ -26,7 +26,6 @@ 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
@@ -38,7 +37,7 @@ 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
@@ -49,17 +48,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
+PreReq:                /sbin/chkconfig
 Requires:      %{name} = %{version}
 
 %description sensord
@@ -174,9 +174,9 @@ 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
 
@@ -221,6 +221,8 @@ rm -rf $RPM_BUILD_ROOT
 
 %post -p /sbin/ldconfig
 
+%postun        -p /sbin/ldconfig
+
 %post sensord
 /sbin/chkconfig --add sensors
 if [ -f /var/lock/subsys/sensors ]; then
@@ -239,15 +241,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}
@@ -271,7 +271,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