- don't try to build isadump on ppc/sparc*

- pass LIBDIR for lib64 support
- release 2

Changed files:
    lm_sensors.spec -> 1.108

diff --git a/lm_sensors.spec b/lm_sensors.spec
index 8b691c39c63d25fc712bf03a73a633d0898a744b..b9b2fc9c3d7e634c801ed524d59576fd13fb8eb8 100644 (file)
--- a/lm_sensors.spec
+++ b/lm_sensors.spec
@@ -13,7 +13,7 @@ Summary(ru):  
 Summary(uk):   õÔÉ̦ÔÉ ÄÌÑ ÍÏΦÔÏÒÉÎÇÕ ÁÐÁÒÁÔÕÒÉ
 Name:          lm_sensors
 Version:       2.8.3
-%define _rel   1
+%define _rel   2
 Release:       %{_rel}
 License:       GPL
 Group:         Applications/System
@@ -171,6 +171,11 @@ Modu
 %patch0 -p1
 %patch1 -p1
 
+%ifarch ppc sparc sparc64 sparcv9
+# no isadump
+%{__perl} -pi -e 's@ prog/dump @ @' Makefile
+%endif
+
 %build
 %if %{with kernel} && %{with smp}
 # SMP
@@ -207,10 +212,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,8 +244,9 @@ 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
@@ -309,7 +316,9 @@ fi
 %attr(755,root,root) %{_sbindir}/eeprom*
 %attr(755,root,root) %{_sbindir}/fancontrol
 %attr(755,root,root) %{_sbindir}/i2c*
+%ifnarch ppc sparc sparc64 sparcv9
 %attr(755,root,root) %{_sbindir}/isadump
+%endif
 %attr(755,root,root) %{_sbindir}/pwmconfig
 %attr(755,root,root) %{_libdir}/lib*.so.*.*
 %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/sensors.conf