- up to 2.8.1, updated make patch, fixed broken make parameters

- added ddc-fix patch (build fix - did they even test it before release???)

Changed files:
    lm_sensors-ddc-fix.patch -> 1.1
    lm_sensors-make.patch -> 1.8
    lm_sensors.spec -> 1.101

diff --git a/lm_sensors-ddc-fix.patch b/lm_sensors-ddc-fix.patch
new file mode 100644 (file)
index 0000000..b6b70aa
--- /dev/null
+++ b/lm_sensors-ddc-fix.patch
@@ -0,0 +1,13 @@
+--- lm_sensors-2.8.1/prog/sensord/chips.c.orig 2003-07-29 17:59:51.000000000 +0200
++++ lm_sensors-2.8.1/prog/sensord/chips.c      2003-10-14 20:54:50.119945024 +0200
+@@ -953,7 +953,9 @@
+ 
+ static const FeatureDescriptor ddcmon_features[] = {
+   { fmtID_DDCMON, NULL, DataType_other, 0, 0,
+-    { SENSORS_DDCMON_ID, -1 } },
++    { SENSORS_DDCMON_MAN_ID, -1 } },
++  { fmtID_DDCMON, NULL, DataType_other, 0, 0,
++    { SENSORS_DDCMON_PROD_ID, -1 } },
+   { fmtInt, NULL, DataType_other, 0, 0,
+     { SENSORS_DDCMON_SERIAL, -1 } },
+   { fmtIntCrossInt, NULL, DataType_other, 0, 0,

diff --git a/lm_sensors-make.patch b/lm_sensors-make.patch
index b588e0566061a0788e1ab3caffb41f1fb1015079..6e4ea084a6ae8b20fd93c779372237c7d68c19b5 100644 (file)
--- a/lm_sensors-make.patch
+++ b/lm_sensors-make.patch
@@ -83,13 +83,13 @@ diff -Nur lm_sensors-2.8.0.orig/lib/Module.mk lm_sensors-2.8.0/lib/Module.mk
  
  
  user_install :: install-lib
-diff -Nur lm_sensors-2.8.0.orig/Makefile lm_sensors-2.8.0/Makefile
---- lm_sensors-2.8.0.orig/Makefile     2003-07-08 11:06:50.000000000 +0200
-+++ lm_sensors-2.8.0/Makefile  2003-07-25 23:13:29.000000000 +0200
+diff -Nur lm_sensors-2.8.1.orig/Makefile lm_sensors-2.8.1/Makefile
+--- lm_sensors-2.8.1.orig/Makefile     2003-07-08 11:06:50.000000000 +0200
++++ lm_sensors-2.8.1/Makefile  2003-07-25 23:13:29.000000000 +0200
 @@ -186,7 +186,8 @@
  # ARCPPFLAGS/ARCFLAGS are used to create archive object files (static libraries).
  # LIBCPPFLAGS/LIBCFLAGS are for shared library objects.
- ALL_CPPFLAGS := -I. -Ikernel/include -I$(I2C_HEADERS) -I$(LINUX_HEADERS)
+ ALL_CPPFLAGS := -I. -Ikernel/include -I$(I2C_HEADERS)
 -ALL_CFLAGS := -Wall -O2 
 +OPTS = -O2
 +ALL_CFLAGS := -Wall $(OPTS)

diff --git a/lm_sensors.spec b/lm_sensors.spec
index c08c9010084beaf3a22dc1fd27fdfc500ca44cd9..3713f1108555dca949bf98cd623d85747a4635d4 100644 (file)
--- a/lm_sensors.spec
+++ b/lm_sensors.spec
@@ -4,24 +4,24 @@
 # _without_smp                  without build smp package
 #
 %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.1
+%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: 2ea0d608404aced13211174e03b1268a
 Source1:       sensors.init
 Source2:       sensors.sysconfig
 Patch0:                %{name}-make.patch
 Patch1:                %{name}-ppc.patch
+Patch2:                %{name}-ddc-fix.patch
 URL:           http://www.lm-sensors.nu/
 BuildRequires: bison
 BuildRequires: flex >= 2.5.1
@@ -29,8 +29,9 @@ 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:        i2c-devel >= 2.8.1}
 %{!?_without_dist_kernel:BuildRequires:        kernel-headers >= 2.4.0}
+%{!?_without_dist_kernel:BuildRequires:        kernel-headers < 2.5.0}
 Requires:      dmidecode
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 Obsoletes:     liblm_sensors1
@@ -165,6 +166,7 @@ Modu
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 %if %{?_without_smp:0}%{!?_without_smp:1}
@@ -178,7 +180,7 @@ Modu
        SMP=1
 
 %{__make} install-kernel-busses \
-       MODPREF=kernel-smp-modules
+       MODPREF=kernel-smp-modules \
        CC="%{kgcc}" \
        OPTS="%{rpmcflags}" \
        LINUX=/dev/null \
@@ -186,7 +188,7 @@ Modu
        I2C_HEADERS=%{_kernelsrcdir}/include \
        SMP=1
 %{__make} install-kernel-chips \
-       MODPREF=kernel-smp-modules
+       MODPREF=kernel-smp-modules \
        CC="%{kgcc}" \
        OPTS="%{rpmcflags}" \
        LINUX=/dev/null \
@@ -222,7 +224,7 @@ install -d $RPM_BUILD_ROOT{%{_sbindir},%{_mandir}/man8} \
        ETCDIR=%{_sysconfdir} \
        MANDIR=%{_mandir} \
        PROG_EXTRA:="sensord dump" \
-       MODPREF=/lib/modules/%{_kernel_ver}
+       MODPREF=/lib/modules/%{_kernel_ver} \
        CC="%{kgcc}" \
        OPTS="%{rpmcflags} -D__KERNEL_SMP=1" \
        LINUX=/dev/null \