X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=blobdiff_plain;f=lm_sensors.spec;h=2e20efe7cd8d03342654b3c29f30e0c6fafed285;hb=c0bf4e6541a0ee3cb2a3c598fc4ba178840c8951;hp=668e0e10c922fb1990c200a95f2170b8734822db;hpb=9b710d906ac0e3cbb6e67758a17f59f8bd6da4c0;p=packages%2Flm_sensors.git

diff --git a/lm_sensors.spec b/lm_sensors.spec
index 668e0e1..2e20efe 100644
--- a/lm_sensors.spec
+++ b/lm_sensors.spec
@@ -1,334 +1,366 @@
+# TODO
+# - a big trigger warning how to use fancontrol and to init it first
 #
-# Conditional build:
-# _without_dist_kernel		without kernel for distributions
-# _without_smp                  without build smp package
-#
-%include	/usr/lib/rpm/macros.perl
+%define		cmodule		/etc/sysconfig/sensors_modules
+%define		cdaemon		/etc/sysconfig/sensors
+%define		smodule		/etc/rc.d/init.d/sensors_modules
+%define		sdaemon		/etc/rc.d/init.d/sensors
 
+%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):	õÔÉ̦ÔÉ ÄÌÑ ÍÏΦÔÏÒÉÎÇÕ ÁÐÁÒÁÔÕÒÉ
+Summary(pl.UTF-8):	Monitor stanu sprzętu
+Summary(pt_BR.UTF-8):	Ferramentas para monitoração do hardware
+Summary(ru.UTF-8):	Утилиты для мониторинга аппаратуры
+Summary(uk.UTF-8):	Утиліти для моніторингу апаратури
 Name:		lm_sensors
-Version:	2.7.0
-%define _rel	1
-Release:	%{_rel}
-License:	GPL
+Version:	3.0.3
+Release:	2
+License:	GPL v2+
 Group:		Applications/System
-Source0:	http://secure.netroedge.com/~lm78/archive/%{name}-%{version}.tar.gz
+Source0:	http://dl.lm-sensors.org/lm-sensors/releases/%{name}-%{version}.tar.bz2
+# Source0-md5:	e88b236228ac2a50821217015b8fd0fa
 Source1:	sensors.init
 Source2:	sensors.sysconfig
-Patch0:		%{name}-make.patch
-Patch1:		%{name}-ppc.patch
-URL:		http://www.lm-sensors.nu/
+Source3:	fancontrol.init
+Source4:	fancontrol.sysconfig
+Source5:	sensors.sh
+Source6:	sensors_modules.init
+Source7:	sensors_modules.sysconfig
+Patch0:		%{name}-ppc.patch
+Patch1:		%{name}-iconv-in-libc.patch
+Patch2:		%{name}-sensors-detect-PATH.patch
+Patch3:		%{name}-make.patch
+URL:		http://www.lm-sensors.org/
 BuildRequires:	bison
 BuildRequires:	flex >= 2.5.1
-BuildRequires:	perl-modules >= 5.6
+BuildRequires:	perl-modules >= 1:5.6
 BuildRequires:	rpm-perlprov >= 3.0.3-16
-BuildRequires:	rrdtool-devel
-%{!?_without_dist_kernel:BuildRequires:	i2c-devel >= 2.7.0}
+BuildRequires:	rpmbuild(macros) >= 1.268
+BuildRequires:	rrdtool-devel >= 1.2.10
+Requires:	%{name}-config
+Requires:	%{name}-libs = %{version}-%{release}
+Requires:	dev >= 2.9.0-13
+Requires:	uname(release) >= 2.6.5
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
-Obsoletes:	liblm_sensors1
-
-%define		_kernel24	%(echo %{_kernel_ver} | grep -q '2\.[012]\.' ; echo $?)
 
 %description
 Tools for monitoring the hardware health of Linux systems containing
 hardware health monitoring hardware such as the LM78 and LM75.
 
-%description -l pl
-Narzêdzie do monitorowania sprzêtu w systemach linuksowych
-wyposa¿onych w sprzêt monitoruj±cy, taki jak LM78 lub LM75.
+%description -l pl.UTF-8
+Narzędzie do monitorowania sprzętu w systemach linuksowych
+wyposażonych w sprzęt monitorujący, taki jak LM78 lub LM75.
 
-%description -l pt_BR
-Ferramentas para monitoração do hardware. Contém uma coleção de
-módulos para acesso genérico ao barramento SMBus e monitoração de
+%description -l pt_BR.UTF-8
+Ferramentas para monitoração do hardware. Contém uma coleção de
+módulos para acesso genérico ao barramento SMBus e monitoração de
 hardware.
 
-%description -l ru
-ðÁËÅÔ lm_sensors ÓÏÄÅÒÖÉÔ ÎÁÂÏÒ ÍÏÄÕÌÅÊ ÄÌÑ ÓÔÁÎÄÁÒÔÎÏÇÏ ÄÏÓÔÕÐÁ Ë
-SMBus É ÍÏÎÉÔÏÒÉÎÇÁ. ÷îéíáîéå: ÄÌÑ ÜÔÏÇÏ ÎÅÏÂÈÏÄÉÍÁ ÓÐÅÃÉÁÌØÎÁÑ
-ÐÏÄÄÅÒÖËÁ, ÏÔÓÕÔÓÔ×ÕÀÝÁÑ × ÓÔÁÎÄÁÒÔÎÙÈ ÓÔÁÒÙÈ ÑÄÒÁÈ 2.2.XX!
+%description -l ru.UTF-8
+Пакет lm_sensors содержит набор модулей для стандартного доступа к
+SMBus и мониторинга. ВНИМАНИЕ: для этого необходима специальная
+поддержка, отсутствующая в стандартных старых ядрах 2.2.XX!
 
-%description -l uk
-ðÁËÅÔ lm_sensors ͦÓÔÉÔØ ÎÁÂ¦Ò ÍÏÄÕÌ¦× ÄÌÑ ÓÔÁÎÄÁÒÔÎÏÇÏ ÄÏÓÔÕÐÕ ÄÏ
-SMBus ÔÁ ÍÏΦÔÏÒÉÎÇÕ. õ÷áçá: ÄÌÑ ÃØÏÇÏ ÐÏÔÒ¦ÂÎÁ ÓÐÅæÁÌØÎÁ ЦÄÔÒÉÍËÁ,
-ÑËÁ צÄÓÕÔÎÑ Õ ÓÔÁÎÄÁÒÔÎÉÈ ÓÔÁÒÉÈ ÑÄÒÁÈ 2.2.XX!
+%description -l uk.UTF-8
+Пакет lm_sensors містить набір модулів для стандартного доступу до
+SMBus та моніторингу. УВАГА: для цього потрібна спеціальна підтримка,
+яка відсутня у стандартних старих ядрах 2.2.XX!
 
-%package sensord
-Summary:	Sensord daemon
-Summary(pl):	Demon sensord
-Group:		Daemons
-Requires(post,preun):	/sbin/chkconfig
-Requires:	%{name} = %{version}
+%package libs
+Summary:	lm_sensors library
+Summary(pl.UTF-8):	Biblioteka lm_sensors
+Group:		Libraries
+Obsoletes:	liblm_sensors1
+Conflicts:	lm_sensors <= 2.9.2-2
 
-%description sensord
-Sensord daemon.
+%description libs
+lm_sensors library.
 
-%description sensord -l pl
-Demon sensord.
+%description libs -l pl.UTF-8
+Biblioteka lm_sensors.
 
 %package devel
 Summary:	Header files for lm_sensors
-Summary(pl):	Pliki nag³ówkowe dla lm_sensors
-Summary(pt_BR):	Arquivos necessários ao desenvolvimento de programas que usem o lm_sensors
-Summary(ru):	æÁÊÌÙ ÒÁÚÒÁÂÏÔÞÉËÁ ÄÌÑ ÐÒÏÇÒÁÍÍ, ÉÓÐÏÌØÚÕÀÝÉÈ lm_sensors
-Summary(uk):	æÁÊÌÉ ÐÒÏÇÒÁͦÓÔÁ ÄÌÑ ÐÒÏÇÒÁÍ, Ñ˦ ×ÉËÏÒÉÓÔÏ×ÕÀÔØ lm_sensors
+Summary(pl.UTF-8):	Pliki nagłówkowe dla lm_sensors
+Summary(pt_BR.UTF-8):	Arquivos necessários ao desenvolvimento de programas que usem o lm_sensors
+Summary(ru.UTF-8):	Файлы разработчика для программ, использующих lm_sensors
+Summary(uk.UTF-8):	Файли програміста для програм, які використовують lm_sensors
 Group:		Development/Libraries
-Requires:	%{name} = %{version}
+Requires:	%{name}-libs = %{version}-%{release}
 Obsoletes:	liblm_sensors1-devel
 
 %description devel
 Header files for lm_sensors.
 
-%description devel -l pl
-Pliki nag³ówkowe dla lm_sensors.
+%description devel -l pl.UTF-8
+Pliki nagłówkowe dla lm_sensors.
 
-%description devel -l pt_BR
-Arquivos necessários ao desenvolvimento de programas que usem o
+%description devel -l pt_BR.UTF-8
+Arquivos necessários ao desenvolvimento de programas que usem o
 lm_sensors.
 
-%description devel -l ru
-ðÁËÅÔ lm_sensors-devel ×ËÌÀÞÁÅÔ ÈÅÄÅÒÙ É ÂÉÂÌÉÏÔÅËÉ, ÎÅÏÂÈÏÄÉÍÙÅ ÄÌÑ
-ÐÏÓÔÒÏÅÎÉÑ ÐÒÏÇÒÁÍÍ, ÉÓÐÏÌØÚÕÀÝÉÈ ÄÁÎÎÙÅ ÓÅÎÓÏÒÏ×.
+%description devel -l ru.UTF-8
+Пакет lm_sensors-devel включает хедеры и библиотеки, необходимые для
+построения программ, использующих данные сенсоров.
 
-%description devel -l uk
-ðÁËÅÔ lm_sensors-devel ͦÓÔÉÔØ ÈÅÄÅÒÉ ÔÁ ¦Â̦ÏÔÅËÉ, ÎÅÏÂȦÄΦ ÄÌÑ
-ÐÏÂÕÄÏ×É ÐÒÏÇÒÁÍ, Ñ˦ ×ÉËÏÒÉÓÔÏ×ÕÀÔØ ÄÁΦ ÓÅÎÓÏÒ¦×.
+%description devel -l uk.UTF-8
+Пакет lm_sensors-devel містить хедери та бібліотеки, необхідні для
+побудови програм, які використовують дані сенсорів.
 
 %package static
 Summary:	Static libraries for lm_sensors
-Summary(pl):	Biblioteki statyczne dla lm_sensors
-Summary(pt_BR):	Bibliotecas estáticas para desenvolvimento com lm_sensors
-Summary(ru):	óÔÁÔÉÞÅÓËÁÑ ÂÉÂÌÉÏÔÅËÁ ÄÌÑ ÐÒÏÇÒÁÍÍ, ÉÓÐÏÌØÚÕÀÝÉÈ lm_sensors
-Summary(uk):	óÔÁÔÉÞÎÁ ¦Â̦ÏÔÅËÁ ÄÌÑ ÐÒÏÇÒÁÍ, Ñ˦ ×ÉËÏÒÉÓÔÏ×ÕÀÔØ lm_sensors
+Summary(pl.UTF-8):	Biblioteki statyczne dla lm_sensors
+Summary(pt_BR.UTF-8):	Bibliotecas estáticas para desenvolvimento com lm_sensors
+Summary(ru.UTF-8):	Статическая библиотека для программ, использующих lm_sensors
+Summary(uk.UTF-8):	Статична бібліотека для програм, які використовують lm_sensors
 Group:		Development/Libraries
-Requires:	%{name}-devel = %{version}
+Requires:	%{name}-devel = %{version}-%{release}
 
 %description static
 Static libraries for lm_sensors.
 
-%description static -l pl
+%description static -l pl.UTF-8
 Biblioteki statyczne dla lm_sensors.
 
-%description static -l pt_BR
-Bibliotecas estáticas para desenvolvimento com lm_sensors
+%description static -l pt_BR.UTF-8
+Bibliotecas estáticas para desenvolvimento com lm_sensors
 
-%description static -l ru
-ðÁËÅÔ lm_sensors-static ×ËÌÀÞÁÅÔ ÓÔÁÔÉÞÅÓËÉÅ ÂÉÂÌÉÏÔÅËÉ, ÎÅÏÂÈÏÄÉÍÙÅ
-ÄÌÑ ÐÏÓÔÒÏÅÎÉÑ ÐÒÏÇÒÁÍÍ, ÉÓÐÏÌØÚÕÀÝÉÈ ÄÁÎÎÙÅ ÓÅÎÓÏÒÏ×.
+%description static -l ru.UTF-8
+Пакет lm_sensors-static включает статические библиотеки, необходимые
+для построения программ, использующих данные сенсоров.
 
-%description static -l uk
-ðÁËÅÔ lm_sensors-static ͦÓÔÉÔØ ÓÔÁÔÉÞΦ ¦Â̦ÏÔÅËÉ, ÎÅÏÂȦÄΦ ÄÌÑ
-ÐÏÂÕÄÏ×É ÐÒÏÇÒÁÍ, Ñ˦ ×ÉËÏÒÉÓÔÏ×ÕÀÔØ ÄÁΦ ÓÅÎÓÏÒ¦×.
+%description static -l uk.UTF-8
+Пакет lm_sensors-static містить статичні бібліотеки, необхідні для
+побудови програм, які використовують дані сенсорів.
 
-%package -n kernel-misc-%{name}
-Summary:	Kernel modules for various buses and monitor chips
-Summary(pl):	Modu³y j±dra dla ró¿nego rodzaju sensorów
+%package config-default
+Summary:	Default sensors configuration files
+Summary(pl.UTF-8):	Domyślne pliki konfiguracyjne lm_sensors
 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.7.0}
-Provides:	%{name}-modules = %{version}
-Obsoletes:	%{name}-modules
-
-%description -n kernel-misc-%{name}
-Kernel modules for various buses and monitor chips.
-
-%description -n kernel-misc-%{name} -l pl
-Modu³y j±dra dla ró¿nego rodzaju sensorów monitoruj±cych.
-
-%package -n kernel-smp-misc-%{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}
-Requires(post,postun):	/sbin/depmod
-%{!?_without_dist_kernel:%requires_releq_kernel_smp}
-%{!?_without_dist_kernel:Requires:	i2c >= 2.7.0}
-Provides:	%{name}-modules = %{version}
-Obsoletes:	%{name}-modules
-
-%description -n kernel-smp-misc-%{name}
-Kernel SMP modules for various buses and monitor chips.
+Requires:	%{name} = %{version}-%{release}
+Provides:	%{name}-config
 
-%description -n kernel-smp-misc-%{name} -l pl
-Modu³y j±dra SMP dla ró¿nego rodzaju sensorów monitoruj±cych.
+%description config-default
+Default configuration files for lm_sensors.
 
-%prep
-%setup -q
-%patch0 -p1
-%patch1 -p1
+%description config-default -l pl.UTF-8
+Domyślne pliki konfiguracyjne lm_sensors.
 
-%build
+%package sensord
+Summary:	Sensord daemon
+Summary(pl.UTF-8):	Demon sensord
+Group:		Daemons
+Requires(post,preun):	/sbin/chkconfig
+Requires:	%{name} = %{version}-%{release}
+Requires:	%{name}-config
+Requires:	rc-scripts
 
-%if %{?_without_smp:0}%{!?_without_smp:1}
+%description sensord
+Sensord daemon.
 
-#smp
-%{__make} \
-	CC="%{kgcc}" \
-	OPTS="%{rpmcflags} -D__KERNEL_SMP=1" \
-	LINUX=/dev/null \
-	LINUX_HEADERS=%{_kernelsrcdir}/include \
-	I2C_HEADERS=%{_kernelsrcdir}/include \
-	SMP=1
+%description sensord -l pl.UTF-8
+Demon sensord.
 
+%package fancontrol
+Summary:	Fancontrol daemon
+Summary(pl.UTF-8):	Demon sterowania wiatraczkami
+Group:		Daemons
+Requires(post,preun):	/sbin/chkconfig
+Requires:	%{name} = %{version}-%{release}
+Requires:	%{name}-sensord = %{version}-%{release}
+Requires:	rc-scripts
 
-%{__make} install-kernel \
-	MODDIR=kernel-smp-modules \
-	CC="%{kgcc}" \
-	OPTS="%{rpmcflags}" \
-	LINUX=/dev/null \
-	LINUX_HEADERS=%{_kernelsrcdir}/include \
-	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}" \
-	LINUX=/dev/null \
-	LINUX_HEADERS=%{_kernelsrcdir}/include \
-	I2C_HEADERS=%{_kernelsrcdir}/include \
-	SMP=1
+%description fancontrol
+Fancontrol daemon monitors current temperature of the computer and
+adjusts fans speed acordingly.
 
-%{__make} clean
+It is crucial to correctly configure this daemon (via running service
+fancontrol init) and ensuring, that the temperature levels are set not
+to burn the insides of the computer!
 
-%endif
+%description fancontrol -l pl.UTF-8
+Demon fancontrol monitoruje obecną temperaturę komputera i ustawia
+odpowiednio prędkość wiatraków.
 
-#up
-%{__make} \
-	CC="%{kgcc}" \
-	OPTS="%{rpmcflags}" \
-	LINUX=/dev/null \
-	LINUX_HEADERS=%{_kernelsrcdir}/include \
-	I2C_HEADERS=%{_kernelsrcdir}/include \
-	PROG_EXTRA:="sensord dump" \
-	SMP=0
+Kluczowym jest, aby poprawnie skonfigurować tego demona (poprzez
+uruchomienie service fancontrol init) oraz upewnić się, że progi
+temperatury są ustawione poprawnie, by nie spalić wnętrza komputera!
 
-cd prog/eepromer
-%{__make}
+%prep
+%setup -q
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
 
+%build
+%{__make} user \
+	CC="%{__cc}" \
+	OPTS="%{rpmcflags}" \
+	SYSFS_SUPPORT:=1 \
+	PROG_EXTRA:="sensord"
 
 %install
 rm -rf $RPM_BUILD_ROOT
+
 install -d $RPM_BUILD_ROOT{%{_sbindir},%{_mandir}/man8} \
-	$RPM_BUILD_ROOT{/etc/{rc.d/init.d,sysconfig},/lib/modules/%{_kernel_ver}smp/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}/misc \
-	MODPREF=/lib/modules/%{_kernel_ver}
-	CC="%{kgcc}" \
-	OPTS="%{rpmcflags} -D__KERNEL_SMP=1" \
-	LINUX=/dev/null \
-	LINUX_HEADERS=%{_kernelsrcdir}/include \
-	I2C_HEADERS=%{_kernelsrcdir}/include \
-	SMP=0
-
-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}
+	PROG_EXTRA:="sensord" \
+	SYSFS_SUPPORT:=1
 
 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}
-install kernel-smp-modules/misc/* $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}smp/misc
-%endif
+install %{SOURCE3} $RPM_BUILD_ROOT/etc/rc.d/init.d/fancontrol
+install %{SOURCE4} $RPM_BUILD_ROOT/etc/sysconfig/fancontrol
+install %{SOURCE5} $RPM_BUILD_ROOT%{_bindir}
+install %{SOURCE6} $RPM_BUILD_ROOT/etc/rc.d/init.d/sensors_modules
+install %{SOURCE7} $RPM_BUILD_ROOT/etc/sysconfig/sensors_modules
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post	-p /sbin/ldconfig
-%postun	-p /sbin/ldconfig
+%post	libs -p /sbin/ldconfig
+%postun	libs -p /sbin/ldconfig
 
-%post sensord
-/sbin/chkconfig --add sensors
-if [ -f /var/lock/subsys/sensors ]; then
-	/etc/rc.d/init.d/sensors restart >&2
-else
-	echo "You have to configure sensors modules in /etc/sysconfig/sensors"
-	echo
-	echo "Run \"/etc/rc.d/init.d/sensors start\" to start sensors daemon." >&2
+%post
+if [ -f "%{cmodule}" ]; then
+	/sbin/chkconfig --add sensors_modules
+	%service sensors_modules restart "sensors modules"
+	if [ -f "%{sdaemon}" ]; then
+		/sbin/chkconfig --add sensors
+		%service sensors restart "sensors deamon"
+	fi
 fi
 
-%preun sensord
+%preun
 if [ "$1" = "0" ]; then
-	if [ -f /var/lock/subsys/sensors ]; then
-		/etc/rc.d/init.d/sensors stop >&2
+	if [ -f "%{sdaemon}" ]; then
+		%service sensors stop
+		/sbin/chkconfig --del sensors
 	fi
-	/sbin/chkconfig --del sensors
+	%service sensors_modules stop
+	/sbin/chkconfig --del sensors_modules
 fi
 
-%post	-n kernel-misc-%{name}
-/sbin/depmod -a %{!?_without_dist_kernel:-F /boot/System.map-%{_kernel_ver} }%{_kernel_ver}
+%post config-default
+if [ "$1" = 1 ]; then
+cat << EOF
+ *********************************************************************
+ *                                                                   *
+ *  NOTE:                                                            *
+ *  You have to configure sensors to match your motherboard sensors  *
+ *  in  /etc/sensors.conf  and  /etc/sysconfig/sensors_modules. Use  *
+ *  sensors-detect script which  can  help you find proper modules.  *
+ *                                                                   *
+ *********************************************************************
+EOF
+fi
+if [ -f "%{smodule}" ]; then
+	/sbin/chkconfig --add sensors_modules
+	%service sensors_modules restart "sensors modules"
+fi
+if [ -f "%{sdaemon}" ]; then
+	/sbin/chkconfig --add sensors
+	%service sensors restart "sensors daemon"
+fi
+
+%preun config-default
+if [ "$1" = "0" ]; then
+	if [ -f "%{sdaemon}" ]; then
+		%service sensors stop
+		/sbin/chkconfig --del sensors
+	fi
+	if [ -f "%{smodule}" ]; then
+		%service sensors_modules stop
+		/sbin/chkconfig --del sensors_modules
+	fi
+fi
+
+%post sensord
+if [ -f "%{cmodule}" ]; then
+	/sbin/chkconfig --add sensors
+	%service sensors restart "sensors daemon"
+fi
 
-%postun -n kernel-misc-%{name}
-/sbin/depmod -a %{!?_without_dist_kernel:-F /boot/System.map-%{_kernel_ver} }%{_kernel_ver}
+%preun sensord
+if [ "$1" = "0" ]; then
+	%service sensors stop
+	/sbin/chkconfig --del sensors
+fi
 
-%post	-n kernel-smp-misc-%{name}
-/sbin/depmod -a %{!?_without_dist_kernel:-F /boot/System.map-%{_kernel_ver}smp }%{_kernel_ver}smp
+%post fancontrol
+if [ "$1" = 1 ]; then
+	echo "You have to configure fancontrol by running service fancontrol init first."
+fi
+/sbin/chkconfig --add fancontrol
+%service fancontrol restart "fancontrol daemon"
 
-%postun -n kernel-smp-misc-%{name}
-/sbin/depmod -a %{!?_without_dist_kernel:-F /boot/System.map-%{_kernel_ver}smp }%{_kernel_ver}smp
+%preun fancontrol
+if [ "$1" = "0" ]; then
+	%service fancontrol stop
+	/sbin/chkconfig --del fancontrol
+fi
 
 %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 CHANGES README doc/chips
+%doc doc/{donations,fan-divisors,progs,temperature-sensors,vid}
+%doc prog/{daemon,maxilife}
+%attr(755,root,root) %{_bindir}/sensors-conf-convert
 %attr(755,root,root) %{_bindir}/sensors
+%attr(755,root,root) %{_bindir}/sensors.sh
 %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}/i2c*
+%ifarch %{ix86} %{x8664}
 %attr(755,root,root) %{_sbindir}/isadump
-%attr(755,root,root) %{_libdir}/lib*.so.*.*
-%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/sensors.conf
-%{_mandir}/man1/*
-%{_mandir}/man5/*
+%attr(755,root,root) %{_sbindir}/isaset
+%{_mandir}/man8/isadump.8*
+%{_mandir}/man8/isaset.8*
+%endif
+%{_mandir}/man1/sensors.1*
+%{_mandir}/man5/sensors.conf.5*
+%attr(754,root,root) /etc/rc.d/init.d/sensors_modules
 
-%files sensord
+%files config-default
 %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) %{_sysconfdir}/sensors3.conf
+%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/sensors_modules
+
+%files libs
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libsensors.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libsensors.so.4
 
 %files devel
 %defattr(644,root,root,755)
-%doc doc/{developers,kernel}
-%attr(755,root,root) %{_libdir}/lib*.so
+%doc doc/developers doc/libsensors-API.txt
+%attr(755,root,root) %{_libdir}/libsensors.so
 %{_includedir}/sensors
-%{_includedir}/linux/*
-%{_mandir}/man3/*
+%{_mandir}/man3/libsensors.3*
 
 %files static
 %defattr(644,root,root,755)
 %{_libdir}/libsensors.a
 
-%files -n kernel-misc-%{name}
+%files sensord
 %defattr(644,root,root,755)
-/lib/modules/%{_kernel_ver}/misc/*
+%attr(754,root,root) %{_sbindir}/sensord
+%attr(754,root,root) /etc/rc.d/init.d/sensors
+%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/sensors
+%{_mandir}/man8/sensors-detect.8*
+%{_mandir}/man8/sensord.8*
 
-%if %{?_without_smp:0}%{!?_without_smp:1}
-%files -n kernel-smp-misc-%{name}
+%files fancontrol
 %defattr(644,root,root,755)
-/lib/modules/%{_kernel_ver}smp/misc/*
-%endif
+%attr(755,root,root) %{_sbindir}/fancontrol
+%attr(755,root,root) %{_sbindir}/pwmconfig
+%attr(754,root,root) /etc/rc.d/init.d/fancontrol
+%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/fancontrol
+%{_mandir}/man8/fancontrol.8*
+%{_mandir}/man8/pwmconfig.8*