X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=lm_sensors.spec;h=c12aa24972192654cdd59db1399c10771fc7fe49;hb=0bd0d06a7563d35f37dbc70c61edcd09fa481551;hp=c08c9010084beaf3a22dc1fd27fdfc500ca44cd9;hpb=c14db41276fe7006fbea63fd4057adf8aae3f512;p=packages%2Flm_sensors.git

diff --git a/lm_sensors.spec b/lm_sensors.spec
index c08c901..c12aa24 100644
--- a/lm_sensors.spec
+++ b/lm_sensors.spec
@@ -1,27 +1,30 @@
 #
 # Conditional build:
-# _without_dist_kernel		without kernel for distributions
-# _without_smp                  without build smp package
+%bcond_without	dist_kernel	# without kernel for distributions
+%bcond_without	smp		# don't build SMP modules
+%bcond_with	kernel		# build kernel modules
+%bcond_without	userspace	# don't build userspace utilities
 #
 %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.8.0
-%define _rel	1.1
+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:	228d3536e51f017e45aa5f21973ced0d
+# 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
@@ -29,8 +32,11 @@ BuildRequires:	perl-modules >= 5.6
 BuildRequires:	rpm-perlprov >= 3.0.3-16
 BuildRequires:	rpmbuild(macros) >= 1.118
 BuildRequires:	rrdtool-devel
-%{!?_without_dist_kernel:BuildRequires:	i2c-devel >= 2.8.0}
-%{!?_without_dist_kernel:BuildRequires:	kernel-headers >= 2.4.0}
+%if %{with kernel} && %{with dist_kernel}
+BuildRequires:	kernel-i2c-devel >= 2.8.3
+BuildRequires:	kernel-headers >= 2.4.0
+BuildRequires:	kernel-headers < 2.5.0
+%endif
 Requires:	dmidecode
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 Obsoletes:	liblm_sensors1
@@ -62,8 +68,9 @@ SMBus 
 Summary:	Sensord daemon
 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.
@@ -78,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
@@ -106,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.
@@ -131,9 +138,9 @@ Summary(pl):	Modu
 Group:		Applications/System
 Release:	%{_rel}@%{_kernel_ver_str}
 Requires(post,postun):	/sbin/depmod
-%{!?_without_dist_kernel:%requires_releq_kernel_up}
-%{!?_without_dist_kernel:Requires:	i2c >= 2.8.0}
-Provides:	%{name}-modules = %{version}
+%{?with_dist_kernel:%requires_releq_kernel_up}
+%{?with_dist_kernel:Requires:	kernel-i2c >= 2.8.2}
+Provides:	%{name}-modules = %{version}-%{release}
 Obsoletes:	%{name}-modules
 Obsoletes:	kernel-misc-lm_sensors
 
@@ -149,9 +156,9 @@ Summary(pl):	Modu
 Group:		Applications/System
 Release:	%{_rel}@%{_kernel_ver_str}
 Requires(post,postun):	/sbin/depmod
-%{!?_without_dist_kernel:%requires_releq_kernel_smp}
-%{!?_without_dist_kernel:Requires:	i2c >= 2.8.0}
-Provides:	%{name}-modules = %{version}
+%{?with_dist_kernel:%requires_releq_kernel_smp}
+%{?with_dist_kernel:Requires:	kernel-smp-i2c >= 2.8.2}
+Provides:	%{name}-modules = %{version}-%{release}
 Obsoletes:	%{name}-modules
 Obsoletes:	kernel-smp-misc-lm_sensors
 
@@ -165,11 +172,13 @@ Modu
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
+%patch3 -p1
 
 %build
-%if %{?_without_smp:0}%{!?_without_smp:1}
+%if %{with kernel} && %{with smp}
 # SMP
-%{__make} \
+%{__make} all-kernel-busses all-kernel-chips \
 	CC="%{kgcc}" \
 	OPTS="%{rpmcflags} -D__KERNEL_SMP=1" \
 	LINUX=/dev/null \
@@ -177,18 +186,8 @@ Modu
 	I2C_HEADERS=%{_kernelsrcdir}/include \
 	SMP=1
 
-%{__make} install-kernel-busses \
-	MODPREF=kernel-smp-modules
-	CC="%{kgcc}" \
-	OPTS="%{rpmcflags}" \
-	LINUX=/dev/null \
-	LINUX_HEADERS=%{_kernelsrcdir}/include \
-	I2C_HEADERS=%{_kernelsrcdir}/include \
-	SMP=1
-%{__make} install-kernel-chips \
-	MODPREF=kernel-smp-modules
-	CC="%{kgcc}" \
-	OPTS="%{rpmcflags}" \
+%{__make} install-kernel-busses install-kernel-chips \
+	MODPREF=kernel-smp-modules \
 	LINUX=/dev/null \
 	LINUX_HEADERS=%{_kernelsrcdir}/include \
 	I2C_HEADERS=%{_kernelsrcdir}/include \
@@ -197,47 +196,70 @@ Modu
 %{__make} clean
 %endif
 
+%if %{with kernel}
 # UP
-%{__make} \
+%{__make} all-kernel-busses all-kernel-chips \
 	CC="%{kgcc}" \
 	OPTS="%{rpmcflags}" \
 	LINUX=/dev/null \
 	LINUX_HEADERS=%{_kernelsrcdir}/include \
 	I2C_HEADERS=%{_kernelsrcdir}/include \
-	PROG_EXTRA:="sensord dump" \
 	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=/dev/null \
+	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}
 
-%{__make} install \
+%{__make} user_install \
 	DESTDIR=$RPM_BUILD_ROOT \
 	PREFIX=%{_prefix} \
 	ETCDIR=%{_sysconfdir} \
+	LIBDIR=%{_libdir} \
 	MANDIR=%{_mandir} \
-	PROG_EXTRA:="sensord dump" \
-	MODPREF=/lib/modules/%{_kernel_ver}
-	CC="%{kgcc}" \
-	OPTS="%{rpmcflags} -D__KERNEL_SMP=1" \
+	PROG_EXTRA:="sensord" \
 	LINUX=/dev/null \
 	LINUX_HEADERS=%{_kernelsrcdir}/include \
-	I2C_HEADERS=%{_kernelsrcdir}/include \
-	SMP=0
+	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
 
-%if %{?_without_smp:0}%{!?_without_smp:1}
+# 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
@@ -281,40 +303,51 @@ fi
 %postun -n kernel-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}/decode-*.pl
 %attr(755,root,root) %{_bindir}/sensors
 %attr(755,root,root) %{_sbindir}/sensors-detect
 %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)
 %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
 
+%if %{with kernel}
 %files -n kernel-i2c-%{name}
 %defattr(644,root,root,755)
 %dir /lib/modules/%{_kernel_ver}/kernel/drivers/i2c/busses
@@ -322,7 +355,7 @@ fi
 %dir /lib/modules/%{_kernel_ver}/kernel/drivers/i2c/chips
 /lib/modules/%{_kernel_ver}/kernel/drivers/i2c/chips/*.o*
 
-%if %{?_without_smp:0}%{!?_without_smp:1}
+%if %{with smp}
 %files -n kernel-smp-i2c-%{name}
 %defattr(644,root,root,755)
 %dir /lib/modules/%{_kernel_ver}smp/kernel/drivers/i2c/busses
@@ -330,3 +363,4 @@ fi
 %dir /lib/modules/%{_kernel_ver}smp/kernel/drivers/i2c/chips
 /lib/modules/%{_kernel_ver}smp/kernel/drivers/i2c/chips/*.o*
 %endif
+%endif