- use %service and adapterize

Changed files:
    lm_sensors.spec -> 1.150

diff --git a/lm_sensors.spec b/lm_sensors.spec
index 5c12af59f07ec521fb0b0f91018fa474dfa401c9..376ab5e877a0b72d8c016df1d18dace9b4a39599 100644 (file)
--- a/lm_sensors.spec
+++ b/lm_sensors.spec
@@ -6,7 +6,7 @@
 %bcond_without dist_kernel     # without kernel for distributions
 %bcond_without smp             # don't build SMP modules
 %bcond_without kernel          # build kernel 2.4 modules
-                               # (NOTE: KERNEL 2.6 MODULES ARE NOT BUILD FROM FROM THIS SPEC)
+                               # (NOTE: KERNEL 2.6 MODULES ARE NOT BUILT FROM FROM THIS SPEC)
 %bcond_without userspace       # don't build userspace utilities
 
 %ifarch %{x8664}
@@ -35,7 +35,7 @@ Patch2:               %{name}-iconv-in-libc.patch
 Patch3:                %{name}-sensors-detect-PATH.patch
 Patch4:                %{name}-CAN-2005-2672.patch
 URL:           http://www.lm-sensors.nu/
-BuildRequires: rpmbuild(macros) >= 1.213
+BuildRequires: rpmbuild(macros) >= 1.268
 %if %{with userspace}
 BuildRequires: bison
 BuildRequires: flex >= 2.5.1
@@ -44,9 +44,9 @@ BuildRequires:        rpm-perlprov >= 3.0.3-16
 BuildRequires: rrdtool-devel >= 1.2.10
 %endif
 %if %{with kernel} && %{with dist_kernel}
-BuildRequires: kernel24-i2c-devel >= 2.9.0
-BuildRequires: kernel24-headers >= 2.4.0
 BuildRequires: kernel24-headers < 2.5.0
+BuildRequires: kernel24-headers >= 2.4.0
+BuildRequires: kernel24-i2c-devel >= 2.9.0
 %endif
 Requires:      dev >= 2.9.0-13
 Requires:      dmidecode
@@ -147,9 +147,9 @@ Bibliotecas est
 Summary:       Sensord daemon
 Summary(pl):   Demon sensord
 Group:         Daemons
-PreReq:                rc-scripts
 Requires(post,preun):  /sbin/chkconfig
 Requires:      %{name} = %{version}-%{release}
+Requires:      rc-scripts
 
 %description sensord
 Sensord daemon.
@@ -160,8 +160,8 @@ Demon sensord.
 %package -n kernel24-i2c-%{name}
 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}
+Group:         Applications/System
 Requires(post,postun): /sbin/depmod
 %{?with_dist_kernel:%requires_releq_kernel_up}
 %{?with_dist_kernel:Requires:  i2c >= 2.9.0}
@@ -177,8 +177,8 @@ Modu
 %package -n kernel24-smp-i2c-%{name}
 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}
+Group:         Applications/System
 Requires(post,postun): /sbin/depmod
 %{?with_dist_kernel:%requires_releq_kernel_smp}
 %{?with_dist_kernel:Requires:  i2c >= 2.9.0}
@@ -308,20 +308,15 @@ rm -rf $RPM_BUILD_ROOT
 %postun        libs -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
+if [ "$1" = 1 ]; then
        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
+/sbin/chkconfig --add sensors
+%service sensors restart "sensors daemon"
 
 %preun sensord
 if [ "$1" = "0" ]; then
-       if [ -f /var/lock/subsys/sensors ]; then
-               /etc/rc.d/init.d/sensors stop >&2
-       fi
+       %service sensors stop
        /sbin/chkconfig --del sensors
 fi