- rebuild with new rrdtool

[packages/lm_sensors.git] / lm_sensors.spec

diff --git a/lm_sensors.spec b/lm_sensors.spec
index 5cae3e813e609f243774bd6613f5e0c4df83d452..7e2eb4ed8cdb9863f9a3f69858a1c3368a4b2246 100644 (file)
--- a/lm_sensors.spec
+++ b/lm_sensors.spec
@@ -5,7 +5,7 @@
 %bcond_without kernel          # build kernel 2.4 modules
 %bcond_without userspace       # don't build userspace utilities
 
-%ifarch amd64
+%ifarch %{x8664}
 %undefine with_kernel
 %endif
 
@@ -16,36 +16,38 @@ Summary(pt_BR):     Ferramentas para monitora
 Summary(ru):   õÔÉÌÉÔÙ ÄÌÑ ÍÏÎÉÔÏÒÉÎÇÁ ÁÐÐÁÒÁÔÕÒÙ
 Summary(uk):   õÔÉ̦ÔÉ ÄÌÑ ÍÏΦÔÏÒÉÎÇÕ ÁÐÁÒÁÔÕÒÉ
 Name:          lm_sensors
-Version:       2.8.8
-%define _rel   1
+Version:       2.9.2
+%define _rel   2
 Release:       %{_rel}
 License:       GPL
 Group:         Applications/System
 Source0:       http://secure.netroedge.com/~lm78/archive/%{name}-%{version}.tar.gz
-# Source0-md5: 95cdb083b4d16e2419a2c78b35f608d0
+# Source0-md5: 229f83cfbd081d5e7bd46885efec1c72
 Source1:       sensors.init
 Source2:       sensors.sysconfig
 Patch0:                %{name}-make.patch
 Patch1:                %{name}-ppc.patch
 Patch2:                %{name}-iconv-in-libc.patch
-Patch3:                %{name}-gcc34.patch
+Patch3:                %{name}-sensors-detect-PATH.patch
+Patch4:                %{name}-CAN-2005-2672.patch
 URL:           http://www.lm-sensors.nu/
-BuildRequires: rpmbuild(macros) >= 1.118
+BuildRequires: rpmbuild(macros) >= 1.213
 %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
+BuildRequires: rrdtool-devel >= 1.2.10
 %endif
 %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
+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
-BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 Obsoletes:     liblm_sensors1
+BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _kernelsrcdir           /usr/src/linux-2.4
 
@@ -147,7 +149,7 @@ Group:              Applications/System
 Release:       %{_rel}@%{_kernel_ver_str}
 Requires(post,postun): /sbin/depmod
 %{?with_dist_kernel:%requires_releq_kernel_up}
-%{?with_dist_kernel:Requires:  i2c >= 2.8.2}
+%{?with_dist_kernel:Requires:  i2c >= 2.9.0}
 Provides:      %{name}-modules = %{version}-%{release}
 Obsoletes:     kernel-misc-lm_sensors
 
@@ -164,7 +166,7 @@ Group:              Applications/System
 Release:       %{_rel}@%{_kernel_ver_str}
 Requires(post,postun): /sbin/depmod
 %{?with_dist_kernel:%requires_releq_kernel_smp}
-%{?with_dist_kernel:Requires:  i2c >= 2.8.2}
+%{?with_dist_kernel:Requires:  i2c >= 2.9.0}
 Provides:      %{name}-modules = %{version}-%{release}
 Obsoletes:     kernel-smp-misc-lm_sensors
 
@@ -180,16 +182,21 @@ Modu
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 %build
-%if %{with kernel} && %{with smp}
+%if %{with kernel}
 # workaround to avoid unresolved dmi* symbols in i2c-piix4.o
 install -d fakelinux
 :> fakelinux/.config
 %ifarch %{ix86}
 echo 'CONFIG_X86=y' >> fakelinux/.config
 %endif
+%ifarch %{ix86} %{x8664} alpha ppc
+echo 'CONFIG_IPMI_HANDLER=m' >> fakelinux/.config
+%endif
 
+%if %{with smp}
 # SMP
 %{__make} all-kernel-busses all-kernel-chips \
        CC="%{kgcc}" \
@@ -209,7 +216,6 @@ echo 'CONFIG_X86=y' >> fakelinux/.config
 %{__make} clean
 %endif
 
-%if %{with kernel}
 # UP
 %{__make} all-kernel-busses all-kernel-chips \
        CC="%{kgcc}" \
@@ -322,13 +328,14 @@ fi
 %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,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
 %attr(755,root,root) %{_sbindir}/eeprom*
 %attr(755,root,root) %{_sbindir}/fancontrol
 %attr(755,root,root) %{_sbindir}/i2c*
-%ifarch %{ix86} amd64
+%ifarch %{ix86} %{x8664}
 %attr(755,root,root) %{_sbindir}/isadump
 %attr(755,root,root) %{_sbindir}/isaset
 %{_mandir}/man8/isadump.8*
@@ -336,17 +343,19 @@ fi
 %endif
 %attr(755,root,root) %{_sbindir}/pwmconfig
 %attr(755,root,root) %{_libdir}/lib*.so.*.*
-%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/sensors.conf
+%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
+%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/sensors
 %{_mandir}/man8/sensord.8*
 
 %files devel