- don't build kernel modules by default (modules are in kernel)

[packages/lm_sensors.git] / lm_sensors.spec

diff --git a/lm_sensors.spec b/lm_sensors.spec
index b9b2fc9c3d7e634c801ed524d59576fd13fb8eb8..c12aa24972192654cdd59db1399c10771fc7fe49 100644 (file)
--- a/lm_sensors.spec
+++ b/lm_sensors.spec
@@ -2,7 +2,7 @@
 # Conditional build:
 %bcond_without dist_kernel     # without kernel for distributions
 %bcond_without smp             # don't build SMP modules
-%bcond_without kernel          # don't build kernel modules
+%bcond_with    kernel          # build kernel modules
 %bcond_without userspace       # don't build userspace utilities
 #
 %include       /usr/lib/rpm/macros.perl
@@ -12,17 +12,19 @@ Summary(pt_BR):     Ferramentas para monitora
 Summary(ru):   õÔÉÌÉÔÙ ÄÌÑ ÍÏÎÉÔÏÒÉÎÇÁ ÁÐÐÁÒÁÔÕÒÙ
 Summary(uk):   õÔÉ̦ÔÉ ÄÌÑ ÍÏΦÔÏÒÉÎÇÕ ÁÐÁÒÁÔÕÒÉ
 Name:          lm_sensors
-Version:       2.8.3
-%define _rel   2
+Version:       2.8.7
+%define _rel   1
 Release:       %{_rel}
 License:       GPL
 Group:         Applications/System
 Source0:       http://secure.netroedge.com/~lm78/archive/%{name}-%{version}.tar.gz
-# Source0-md5: bb5dff9faa23e414e99383258cd1f532
+# Source0-md5: 64b4a4f547b2e1eab8a574d871867ca5
 Source1:       sensors.init
 Source2:       sensors.sysconfig
 Patch0:                %{name}-make.patch
 Patch1:                %{name}-ppc.patch
+Patch2:                %{name}-iconv-in-libc.patch
+Patch3:                %{name}-gcc34.patch
 URL:           http://www.lm-sensors.nu/
 BuildRequires: bison
 BuildRequires: flex >= 2.5.1
@@ -68,7 +70,7 @@ Summary(pl):  Demon sensord
 Group:         Daemons
 PreReq:                rc-scripts
 Requires(post,preun):  /sbin/chkconfig
-Requires:      %{name} = %{version}
+Requires:      %{name} = %{version}-%{release}
 
 %description sensord
 Sensord daemon.
@@ -83,7 +85,7 @@ Summary(pt_BR):       Arquivos necess
 Summary(ru):   æÁÊÌÙ ÒÁÚÒÁÂÏÔÞÉËÁ ÄÌÑ ÐÒÏÇÒÁÍÍ, ÉÓÐÏÌØÚÕÀÝÉÈ lm_sensors
 Summary(uk):   æÁÊÌÉ ÐÒÏÇÒÁͦÓÔÁ ÄÌÑ ÐÒÏÇÒÁÍ, Ñ˦ ×ÉËÏÒÉÓÔÏ×ÕÀÔØ lm_sensors
 Group:         Development/Libraries
-Requires:      %{name} = %{version}
+Requires:      %{name} = %{version}-%{release}
 Obsoletes:     liblm_sensors1-devel
 
 %description devel
@@ -111,7 +113,7 @@ Summary(pt_BR):     Bibliotecas est
 Summary(ru):   óÔÁÔÉÞÅÓËÁÑ ÂÉÂÌÉÏÔÅËÁ ÄÌÑ ÐÒÏÇÒÁÍÍ, ÉÓÐÏÌØÚÕÀÝÉÈ lm_sensors
 Summary(uk):   óÔÁÔÉÞÎÁ ¦Â̦ÏÔÅËÁ ÄÌÑ ÐÒÏÇÒÁÍ, Ñ˦ ×ÉËÏÒÉÓÔÏ×ÕÀÔØ lm_sensors
 Group:         Development/Libraries
-Requires:      %{name}-devel = %{version}
+Requires:      %{name}-devel = %{version}-%{release}
 
 %description static
 Static libraries for lm_sensors.
@@ -138,7 +140,7 @@ Release:    %{_rel}@%{_kernel_ver_str}
 Requires(post,postun): /sbin/depmod
 %{?with_dist_kernel:%requires_releq_kernel_up}
 %{?with_dist_kernel:Requires:  kernel-i2c >= 2.8.2}
-Provides:      %{name}-modules = %{version}
+Provides:      %{name}-modules = %{version}-%{release}
 Obsoletes:     %{name}-modules
 Obsoletes:     kernel-misc-lm_sensors
 
@@ -156,7 +158,7 @@ Release:    %{_rel}@%{_kernel_ver_str}
 Requires(post,postun): /sbin/depmod
 %{?with_dist_kernel:%requires_releq_kernel_smp}
 %{?with_dist_kernel:Requires:  kernel-smp-i2c >= 2.8.2}
-Provides:      %{name}-modules = %{version}
+Provides:      %{name}-modules = %{version}-%{release}
 Obsoletes:     %{name}-modules
 Obsoletes:     kernel-smp-misc-lm_sensors
 
@@ -170,11 +172,8 @@ Modu
 %setup -q
 %patch0 -p1
 %patch1 -p1
-
-%ifarch ppc sparc sparc64 sparcv9
-# no isadump
-%{__perl} -pi -e 's@ prog/dump @ @' Makefile
-%endif
+%patch2 -p1
+%patch3 -p1
 
 %build
 %if %{with kernel} && %{with smp}
@@ -316,21 +315,24 @@ fi
 %attr(755,root,root) %{_sbindir}/eeprom*
 %attr(755,root,root) %{_sbindir}/fancontrol
 %attr(755,root,root) %{_sbindir}/i2c*
-%ifnarch ppc sparc sparc64 sparcv9
+%ifarch %{ix86} amd64
 %attr(755,root,root) %{_sbindir}/isadump
+%{_mandir}/man8/isadump.8*
 %endif
 %attr(755,root,root) %{_sbindir}/pwmconfig
 %attr(755,root,root) %{_libdir}/lib*.so.*.*
 %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/sensors.conf
-%{_mandir}/man1/*
-%{_mandir}/man5/*
+%{_mandir}/man1/sensors.1*
+%{_mandir}/man5/sensors.conf.5*
+%{_mandir}/man8/i2c*.8*
+%{_mandir}/man8/sensors-detect.8*
 
 %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/*
+%{_mandir}/man8/sensord.8*
 
 %files devel
 %defattr(644,root,root,755)