- updated to 2.5.2

- spec adapterized
- removed old patches (obsoleted)
- added user_ret patch to fix problems with latest kernels

Changed files:
    lm_sensors.spec -> 1.17

diff --git a/lm_sensors.spec b/lm_sensors.spec
index ad419264db2f66b8fb6da75b8e74764c0b3408a2..1791f1ad766af7aa2544a1bea7614eb5c99245db 100644 (file)
--- a/lm_sensors.spec
+++ b/lm_sensors.spec
@@ -1,20 +1,19 @@
 Summary:       Hardware health monitoring
 Summary(pl):   Monitor stanu sprzêtu
 Name:          lm_sensors
-Version:       2.3.4
+Version:       2.5.2
 Release:       1
-Copyright:      GPL
-Group:          Utilities/System
-Group(pl):      Narzêdzia/System
+License:       GPL
+Group:         Applications/System
+Group(de):     Applikationen/System
+Group(pl):     Aplikacje/System
 Source0:       http://www.netroedge.com/~lm78/archive/%{name}-%{version}.tar.gz
-Patch0:                lm_sensors-DESTDIR.patch
-Patch1:                lm_sensors-opts.patch
+Patch0:                %{name}-make.patch
+Patch1:                %{name}-user_ret.patch
 Prereq:                /sbin/depmod
-Requires:       %{name}-modules = %{version}
+Requires:      %{name}-modules = %{version}
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define        _sysconfdir     /etc
-
 %description
 Tools for monitoring the hardware health of Linux systems containing
 hardware health monitoring hardware such as the LM78 and LM75.
@@ -24,11 +23,13 @@ Narz
 w sprzêt monitoruj±cy, taki jak LM78 and LM75.
 
 %package devel
-Summary:        Header files for lm_sensors
+Summary:       Header files for lm_sensors
 Summary(pl):   Pliki nag³ówkowe dla lm_sensors
-Group:          Development/Libraries
-Group(pl):      Programowanie/Biblioteki
-Requires:       %{name} = %{version}
+Group:         Development/Libraries
+Group(de):     Entwicklung/Libraries
+Group(fr):     Development/Librairies
+Group(pl):     Programowanie/Biblioteki
+Requires:      %{name} = %{version}
 
 %description devel
 Header files for lm_sensors.
@@ -39,9 +40,11 @@ Pliki nag
 %package static
 Summary:       Static libraries for lm_sensors
 Summary(pl):   Biblioteki statyczne dla lm_sensors
-Group:          Development/Libraries
-Group(pl):      Programowanie/Biblioteki
-Requires:       %{name}-devel = %{version}
+Group:         Development/Libraries
+Group(de):     Entwicklung/Libraries
+Group(fr):     Development/Librairies
+Group(pl):     Programowanie/Biblioteki
+Requires:      %{name}-devel = %{version}
 
 %description static
 Statis libraries for lm_sensors.
@@ -50,10 +53,11 @@ Statis libraries for lm_sensors.
 Biblioteki statyczne dla lm_sensors.
 
 %package modules
-Summary:       Kernel modules for various buses and monitor chips
+Summary:       Kernel modules for various buses and monitor chips
 Summary(pl):   Modu³y j±dra dla ró¿nego rodzaju sensorów
-Group:                 Utilities/System
-Group(pl):      Narzêdzia/System
+Group:         Applications/System
+Group(de):     Applikationen/System
+Group(pl):     Aplikacje/System
 
 %description modules
 Kernel modules for various buses and monitor chips.
@@ -64,15 +68,15 @@ Modu
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p0
+%patch1 -p1
 
 %build
 %{__make} OPTS="$RPM_OPT_FLAGS" 
 
 %install
-rm -fr $RPM_BUILD_ROOT
+rm -rf $RPM_BUILD_ROOT
 
-REL=`grep UTS_RELEASE /usr/src/linux/include/linux/version.h 2>/dev/null | cut -d\" -f2`
+REL=`grep UTS_RELEASE %{_prefix}/src/linux/include/linux/version.h 2>/dev/null | cut -d\" -f2`
 
 make   install \
        DESTDIR=$RPM_BUILD_ROOT \
@@ -86,7 +90,7 @@ strip --strip-unneeded $RPM_BUILD_ROOT%{_libdir}/lib*.so.*.*
 
 gzip -9nf $RPM_BUILD_ROOT%{_mandir}/man[135]/* \
        CHANGES README* BUGS CONTRIBUTORS TODO BACKGROUND
-gzip -9nrf doc/*
+gzip -9nf doc/* || :
 
 %post   -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
@@ -98,23 +102,24 @@ gzip -9nrf doc/*
 /sbin/depmod -a
 
 %clean
-rm -fr $RPM_BUILD_ROOT
+rm -rf $RPM_BUILD_ROOT
 
 %files 
 %defattr(644,root,root,755)
 %doc {CHANGES,README*,BUGS,CONTRIBUTORS,TODO,BACKGROUND}.gz 
 %doc doc/*.gz doc/busses doc/chips
 %attr(755,root,root) %{_bindir}/sensors
+%attr(755,root,root) %{_sbindir}/sensors-detect
 %attr(755,root,root) %{_libdir}/lib*.so.*.*
 %config %{_sysconfdir}/sensors.conf
 %{_mandir}/man1/*
 %{_mandir}/man5/*
 
 %files devel
+%defattr(644,root,root,755)
 %doc doc/developers doc/kernel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/lib*.so
-%attr(755,root,root) %{_libdir}/lib*.so.0
 %{_includedir}/sensors
 %{_includedir}/linux/*
 %{_mandir}/man3/*