X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=blobdiff_plain;f=lm_sensors.spec;h=894362c766ddaef11c2d531da73ce54b06ddae25;hb=70acc6d639cf786640c90e9a650eaa8970f96479;hp=2a82c92a03607e7bf3a0facc26c74e09ad1ca1db;hpb=04f5bd0248150b4c68f77a4648cee7c7aa160fd9;p=packages%2Flm_sensors.git

diff --git a/lm_sensors.spec b/lm_sensors.spec
index 2a82c92..894362c 100644
--- a/lm_sensors.spec
+++ b/lm_sensors.spec
@@ -1,35 +1,54 @@
-# conditional build
-# _without_dist_kernel		without kernel for distributions
 #
-%include	/usr/lib/rpm/macros.perl
+# Conditional build:
+%bcond_without	dist_kernel	# without kernel for distributions
+%bcond_without	smp		# don't build SMP modules
+%bcond_without	kernel		# build kernel 2.4 modules
+%bcond_without	userspace	# don't build userspace utilities
+
+%ifarch amd64
+%undefine with_kernel
+%endif
 
+%include	/usr/lib/rpm/macros.perl
 Summary:	Hardware health monitoring
 Summary(pl):	Monitor stanu sprzêtu
 Summary(pt_BR):	Ferramentas para monitoração do hardware
 Summary(ru):	õÔÉÌÉÔÙ ÄÌÑ ÍÏÎÉÔÏÒÉÎÇÁ ÁÐÐÁÒÁÔÕÒÙ
 Summary(uk):	õÔÉ̦ÔÉ ÄÌÑ ÍÏΦÔÏÒÉÎÇÕ ÁÐÁÒÁÔÕÒÉ
 Name:		lm_sensors
-Version:	2.6.5
-%define _rel	4
+Version:	2.9.1
+%define _rel	1
 Release:	%{_rel}
 License:	GPL
 Group:		Applications/System
 Source0:	http://secure.netroedge.com/~lm78/archive/%{name}-%{version}.tar.gz
+# Source0-md5:	f5af615e39441d95471bdb72a3f01709
 Source1:	sensors.init
 Source2:	sensors.sysconfig
 Patch0:		%{name}-make.patch
 Patch1:		%{name}-ppc.patch
+Patch2:		%{name}-iconv-in-libc.patch
+Patch3:		%{name}-sensors-detect-PATH.patch
 URL:		http://www.lm-sensors.nu/
+BuildRequires:	rpmbuild(macros) >= 1.118
+%if %{with userspace}
 BuildRequires:	bison
 BuildRequires:	flex >= 2.5.1
 BuildRequires:	perl-modules >= 5.6
 BuildRequires:	rpm-perlprov >= 3.0.3-16
 BuildRequires:	rrdtool-devel
-%{!?_without_dist_kernel:BuildRequires:	i2c-devel >= 2.6.0}
-BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+%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
+%endif
+Requires:	dev >= 2.9.0-13
+Requires:	dmidecode
 Obsoletes:	liblm_sensors1
+BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define		_kernel24	%(echo %{_kernel_ver} | grep -q '2\.[012]\.' ; echo $?)
+%define		_kernelsrcdir		/usr/src/linux-2.4
 
 %description
 Tools for monitoring the hardware health of Linux systems containing
@@ -57,9 +76,10 @@ SMBus 
 %package sensord
 Summary:	Sensord daemon
 Summary(pl):	Demon sensord
-Group:		Daemon
+Group:		Daemons
+PreReq:		rc-scripts
 Requires(post,preun):	/sbin/chkconfig
-Requires:	%{name} = %{version}
+Requires:	%{name} = %{version}-%{release}
 
 %description sensord
 Sensord daemon.
@@ -74,7 +94,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
@@ -102,7 +122,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.
@@ -121,99 +141,145 @@ Bibliotecas est
 ðÁËÅÔ lm_sensors-static ͦÓÔÉÔØ ÓÔÁÔÉÞΦ ¦Â̦ÏÔÅËÉ, ÎÅÏÂȦÄΦ ÄÌÑ
 ÐÏÂÕÄÏ×É ÐÒÏÇÒÁÍ, Ñ˦ ×ÉËÏÒÉÓÔÏ×ÕÀÔØ ÄÁΦ ÓÅÎÓÏÒ¦×.
 
-%package -n kernel-misc-%{name}
+%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}
-Prereq:		/sbin/depmod
-%{!?_without_dist_kernel:%requires_releq_kernel_up}
-%{!?_without_dist_kernel:Requires:	i2c >= 2.6.0}
-Provides:	%{name}-modules = %{version}
-Obsoletes:	%{name}-modules
+Requires(post,postun):	/sbin/depmod
+%{?with_dist_kernel:%requires_releq_kernel_up}
+%{?with_dist_kernel:Requires:	i2c >= 2.8.2}
+Provides:	%{name}-modules = %{version}-%{release}
+Obsoletes:	kernel-misc-lm_sensors
 
-%description -n kernel-misc-%{name}
+%description -n kernel24-i2c-%{name}
 Kernel modules for various buses and monitor chips.
 
-%description -n kernel-misc-%{name} -l pl
+%description -n kernel24-i2c-%{name} -l pl
 Modu³y j±dra dla ró¿nego rodzaju sensorów monitoruj±cych.
 
-%package -n kernel-smp-misc-%{name}
+%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}
-Prereq:		/sbin/depmod
-%{!?_without_dist_kernel:%requires_releq_kernel_smp}
-%{!?_without_dist_kernel:Requires:	i2c >= 2.6.0}
-Provides:	%{name}-modules = %{version}
-Obsoletes:	%{name}-modules
+Requires(post,postun):	/sbin/depmod
+%{?with_dist_kernel:%requires_releq_kernel_smp}
+%{?with_dist_kernel:Requires:	i2c >= 2.8.2}
+Provides:	%{name}-modules = %{version}-%{release}
+Obsoletes:	kernel-smp-misc-lm_sensors
 
-%description -n kernel-smp-misc-%{name}
+%description -n kernel24-smp-i2c-%{name}
 Kernel SMP modules for various buses and monitor chips.
 
-%description -n kernel-smp-misc-%{name} -l pl
+%description -n kernel24-smp-i2c-%{name} -l pl
 Modu³y j±dra SMP dla ró¿nego rodzaju sensorów monitoruj±cych.
 
 %prep
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
+%patch3 -p1
 
 %build
-#up
-%{__make} \
-	CC=%{kgcc} \
-	OPTS="%{rpmcflags}" \
-	LINUX=/dev/null \
+%if %{with kernel} && %{with smp}
+# workaround to avoid unresolved dmi* symbols in i2c-piix4.o
+install -d fakelinux
+:> fakelinux/.config
+%ifarch %{ix86}
+echo 'CONFIG_X86=y' >> fakelinux/.config
+%endif
+
+# SMP
+%{__make} all-kernel-busses all-kernel-chips \
+	CC="%{kgcc}" \
+	OPTS="%{rpmcflags} -D__KERNEL_SMP=1" \
+	LINUX=`pwd`/fakelinux \
 	LINUX_HEADERS=%{_kernelsrcdir}/include \
 	I2C_HEADERS=%{_kernelsrcdir}/include \
-	SMP=0
+	SMP=1
 
-%{__make} install-kernel \
-	MODDIR=kernel-up-modules
-%{__make} install-kernel-busses \
-	MODPREF=kernel-up-modules
-%{__make} install-kernel-chips \
-	MODPREF=kernel-up-modules
+%{__make} install-kernel-busses install-kernel-chips \
+	MODPREF=kernel-smp-modules \
+	LINUX=`pwd`/fakelinux \
+	LINUX_HEADERS=%{_kernelsrcdir}/include \
+	I2C_HEADERS=%{_kernelsrcdir}/include \
+	SMP=1
 
 %{__make} clean
+%endif
 
-#smp
-%{__make} \
-	CC=%{kgcc} \
-	OPTS="%{rpmcflags} -D__KERNEL_SMP=1" \
-	LINUX=/dev/null \
+%if %{with kernel}
+# UP
+%{__make} all-kernel-busses all-kernel-chips \
+	CC="%{kgcc}" \
+	OPTS="%{rpmcflags}" \
+	LINUX=`pwd`/fakelinux \
 	LINUX_HEADERS=%{_kernelsrcdir}/include \
 	I2C_HEADERS=%{_kernelsrcdir}/include \
-	PROG_EXTRA:="sensord dump" \
-	SMP=1
+	SMP=0
+%endif
+
+%if %{with userspace}
+%{__make} user \
+	CC="%{__cc}" \
+	OPTS="%{rpmcflags}" \
+	LIBDIR=%{_libdir} \
+	LINUX=/dev/null \
+	LINUX_HEADERS=%{_kernelsrcdir}/include \
+	I2C_HEADERS=/usr/include \
+	PROG_EXTRA:="sensord"
 
-cd prog/eepromer
-%{__make}
+%{__make} -C prog/eepromer \
+	CC="%{__cc}" \
+	CFLAGS="%{rpmcflags} -I../../kernel/include"
+%endif
 
 %install
 rm -rf $RPM_BUILD_ROOT
+
+%if %{with kernel}
+%{__make} install-kernel-busses install-kernel-chips \
+	DESTDIR=$RPM_BUILD_ROOT \
+	MODPREF=/lib/modules/%{_kernel_ver} \
+	LINUX=`pwd`/fakelinux \
+	LINUX_HEADERS=%{_kernelsrcdir}/include \
+	I2C_HEADERS=%{_kernelsrcdir}/include \
+	SMP=0
+%endif
+
+%if %{with userspace}
 install -d $RPM_BUILD_ROOT{%{_sbindir},%{_mandir}/man8} \
-	$RPM_BUILD_ROOT{/etc/{rc.d/init.d,sysconfig},/lib/modules/%{_kernel_ver}/misc}
+	$RPM_BUILD_ROOT/etc/{rc.d/init.d,sysconfig}
 
-%{__make} install \
+%{__make} user_install \
 	DESTDIR=$RPM_BUILD_ROOT \
 	PREFIX=%{_prefix} \
 	ETCDIR=%{_sysconfdir} \
+	LIBDIR=%{_libdir} \
 	MANDIR=%{_mandir} \
-	PROG_EXTRA:="sensord dump" \
-	MODDIR=/lib/modules/%{_kernel_ver}smp/misc \
-	MODPREF=/lib/modules/%{_kernel_ver}smp
+	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
 
-install kernel-up-modules/misc/* $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/misc
+# 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}
+install -d $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}smp/kernel/drivers/i2c/{busses,chips}
+install kernel-smp-modules/kernel/drivers/i2c/busses/*.o \
+	$RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}smp/kernel/drivers/i2c/busses
+install kernel-smp-modules/kernel/drivers/i2c/chips/*.o \
+	$RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}smp/kernel/drivers/i2c/chips
+%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -239,59 +305,81 @@ if [ "$1" = "0" ]; then
 	/sbin/chkconfig --del sensors
 fi
 
-%post -n kernel-misc-%{name}
-/sbin/depmod -a
+%post	-n kernel24-i2c-%{name}
+%depmod %{_kernel_ver}
 
-%postun -n kernel-misc-%{name}
-/sbin/depmod -a
+%postun -n kernel24-i2c-%{name}
+%depmod %{_kernel_ver}
 
-%post -n kernel-smp-misc-%{name}
-/sbin/depmod -a
+%post	-n kernel24-smp-i2c-%{name}
+%depmod %{_kernel_ver}smp
 
-%postun -n kernel-smp-misc-%{name}
-/sbin/depmod -a
+%postun -n kernel24-smp-i2c-%{name}
+%depmod %{_kernel_ver}smp
 
+%if %{with userspace}
 %files
 %defattr(644,root,root,755)
 %doc BACKGROUND BUGS CHANGES README README.thinkpad TODO doc/{busses,chips}
 %doc doc/{FAQ,donations,fan-divisors,progs,temperature-sensors,*html,vid}
-%doc prog/{config,daemon,eeprom,eepromer/README*,matorb,maxilife,xeon}
+%doc prog/{config,daemon,eepromer/README*,matorb,maxilife}
+%attr(755,root,root) %{_bindir}/ddcmon
+%attr(755,root,root) %{_bindir}/decode-*.pl
 %attr(755,root,root) %{_bindir}/sensors
 %attr(755,root,root) %{_sbindir}/sensors-detect
-%if %{_kernel24}
-%attr(755,root,root) %{_sbindir}/dmidecode
-%endif
 %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
+%attr(755,root,root) %{_sbindir}/isaset
+%{_mandir}/man8/isadump.8*
+%{_mandir}/man8/isaset.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/*
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/sensors.conf
+%{_mandir}/man1/sensors.1*
+%{_mandir}/man5/sensors.conf.5*
+%{_mandir}/man8/fancontrol.8*
+%{_mandir}/man8/i2c*.8*
+%{_mandir}/man8/pwmconfig.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/*
+%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/sensors
+%{_mandir}/man8/sensord.8*
 
 %files devel
 %defattr(644,root,root,755)
 %doc doc/{developers,kernel}
 %attr(755,root,root) %{_libdir}/lib*.so
 %{_includedir}/sensors
-%{_includedir}/linux/*
+%{_includedir}/linux/sensors.h
 %{_mandir}/man3/*
 
 %files static
 %defattr(644,root,root,755)
 %{_libdir}/libsensors.a
+%endif
 
-%files -n kernel-misc-%{name}
+%if %{with kernel}
+%files -n kernel24-i2c-%{name}
 %defattr(644,root,root,755)
-/lib/modules/%{_kernel_ver}/misc/*
+%dir /lib/modules/%{_kernel_ver}/kernel/drivers/i2c/busses
+/lib/modules/%{_kernel_ver}/kernel/drivers/i2c/busses/*.o*
+%dir /lib/modules/%{_kernel_ver}/kernel/drivers/i2c/chips
+/lib/modules/%{_kernel_ver}/kernel/drivers/i2c/chips/*.o*
 
-%files -n kernel-smp-misc-%{name}
+%if %{with smp}
+%files -n kernel24-smp-i2c-%{name}
 %defattr(644,root,root,755)
-/lib/modules/%{_kernel_ver}smp/misc/*
+%dir /lib/modules/%{_kernel_ver}smp/kernel/drivers/i2c/busses
+/lib/modules/%{_kernel_ver}smp/kernel/drivers/i2c/busses/*.o*
+%dir /lib/modules/%{_kernel_ver}smp/kernel/drivers/i2c/chips
+/lib/modules/%{_kernel_ver}smp/kernel/drivers/i2c/chips/*.o*
+%endif
+%endif