- 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 86c4518cdf1cf168878ffa732d3f9b8c8e0d22d4..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.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: e38406adca7db7e1e761269e4de8b248
+# 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
@@ -31,7 +33,7 @@ BuildRequires:        rpm-perlprov >= 3.0.3-16
 BuildRequires: rpmbuild(macros) >= 1.118
 BuildRequires: rrdtool-devel
 %if %{with kernel} && %{with dist_kernel}
-BuildRequires: kernel-i2c-devel >= 2.8.2
+BuildRequires: kernel-i2c-devel >= 2.8.3
 BuildRequires: kernel-headers >= 2.4.0
 BuildRequires: kernel-headers < 2.5.0
 %endif
@@ -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,6 +172,8 @@ Modu
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
+%patch3 -p1
 
 %build
 %if %{with kernel} && %{with smp}
@@ -207,10 +211,11 @@ Modu
 %{__make} user \
        CC="%{__cc}" \
        OPTS="%{rpmcflags}" \
+       LIBDIR=%{_libdir} \
        LINUX=/dev/null \
        LINUX_HEADERS=%{_kernelsrcdir}/include \
        I2C_HEADERS=/usr/include \
-       PROG_EXTRA:="sensord dump"
+       PROG_EXTRA:="sensord"
 
 %{__make} -C prog/eepromer \
        CC="%{__cc}" \
@@ -238,18 +243,20 @@ install -d $RPM_BUILD_ROOT{%{_sbindir},%{_mandir}/man8} \
        DESTDIR=$RPM_BUILD_ROOT \
        PREFIX=%{_prefix} \
        ETCDIR=%{_sysconfdir} \
+       LIBDIR=%{_libdir} \
        MANDIR=%{_mandir} \
-       PROG_EXTRA:="sensord dump" \
+       PROG_EXTRA:="sensord" \
        LINUX=/dev/null \
        LINUX_HEADERS=%{_kernelsrcdir}/include \
        I2C_HEADERS=/usr/include
 
 install prog/eepromer/{eeprom,eepromer}        $RPM_BUILD_ROOT%{_sbindir}
-#install prog/dump/{i2c{dump,set},isadump} $RPM_BUILD_ROOT%{_sbindir}
-#install prog/detect/i2cdetect $RPM_BUILD_ROOT%{_sbindir}
 
 install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/sensors
 install %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/sensors
+
+# i2c API for userspace - included in glibc-kernel-headers
+rm -f $RPM_BUILD_ROOT%{_includedir}/linux/i2c-dev.h
 %endif
 
 %if %{with kernel} && %{with smp}
@@ -308,19 +315,24 @@ fi
 %attr(755,root,root) %{_sbindir}/eeprom*
 %attr(755,root,root) %{_sbindir}/fancontrol
 %attr(755,root,root) %{_sbindir}/i2c*
+%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)
@@ -328,8 +340,6 @@ fi
 %attr(755,root,root) %{_libdir}/lib*.so
 %{_includedir}/sensors
 %{_includedir}/linux/sensors.h
-# i2c userspace header - should be in glibc-kernel-headers
-%{_includedir}/linux/i2c-dev.h
 %{_mandir}/man3/*
 
 %files static