SPECS (AC-branch): lm_sensors.spec - Ac is not Th! In Ac we SUPPOR...
marcus
marcus at pld-linux.org
Wed Nov 22 16:03:22 CET 2006
Author: marcus Date: Wed Nov 22 15:03:22 2006 GMT
Module: SPECS Tag: AC-branch
---- Log message:
- Ac is not Th! In Ac we SUPPORT kernel 2.4. Rel.2.
---- Files affected:
SPECS:
lm_sensors.spec (1.157 -> 1.157.2.1)
---- Diffs:
================================================================
Index: SPECS/lm_sensors.spec
diff -u SPECS/lm_sensors.spec:1.157 SPECS/lm_sensors.spec:1.157.2.1
--- SPECS/lm_sensors.spec:1.157 Tue Sep 26 16:59:04 2006
+++ SPECS/lm_sensors.spec Wed Nov 22 16:03:17 2006
@@ -3,6 +3,17 @@
# - unpackaged:
# /usr/sbin/fancontrol.pl
#
+# Conditional build:
+%bcond_without dist_kernel # without kernel for distributions
+%bcond_without smp # don't build SMP modules
+%bcond_without kernel # build kernel 2.4 modules
+ # (NOTE: KERNEL 2.6 MODULES ARE NOT BUILT FROM FROM THIS SPEC)
+%bcond_without userspace # don't build userspace utilities
+
+%ifarch %{x8664}
+%undefine with_kernel
+%endif
+
%include /usr/lib/rpm/macros.perl
Summary: Hardware health monitoring
Summary(pl): Monitor stanu sprzętu
@@ -11,7 +22,8 @@
Summary(uk): őÔÉĚŚÔÉ ÄĚŃ ÍĎÎŚÔĎŇÉÎÇŐ ÁĐÁŇÁÔŐŇÉ
Name: lm_sensors
Version: 2.10.1
-Release: 1
+%define _rel 2
+Release: %{_rel}
License: GPL
Group: Applications/System
Source0: http://dl.lm-sensors.org/lm-sensors/releases/%{name}-%{version}.tar.gz
@@ -24,17 +36,25 @@
Patch3: %{name}-sensors-detect-PATH.patch
URL: http://www.lm-sensors.nu/
BuildRequires: rpmbuild(macros) >= 1.268
+%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 >= 1.2.10
-BuildRequires: sysfsutils-devel
+%endif
+%if %{with kernel} && %{with dist_kernel}
+BuildRequires: kernel24-headers < 2.5.0
+BuildRequires: kernel24-headers >= 2.4.0
+BuildRequires: kernel24-i2c-devel >= 2.9.0
+%endif
Requires: dev >= 2.9.0-13
Requires: dmidecode
Obsoletes: liblm_sensors1
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+%define _kernelsrcdir /usr/src/linux-2.4
+
%description
Tools for monitoring the hardware health of Linux systems containing
hardware health monitoring hardware such as the LM78 and LM75.
@@ -137,6 +157,40 @@
%description sensord -l pl
Demon sensord.
+%package -n kernel24-i2c-%{name}
+Summary: Kernel modules for various buses and monitor chips
+Summary(pl): Moduły jądra dla różnego rodzaju sensorów
+Release: %{_rel}@%{_kernel_ver_str}
+Group: Applications/System
+Requires(post,postun): /sbin/depmod
+%{?with_dist_kernel:%requires_releq_kernel_up}
+%{?with_dist_kernel:Requires: i2c >= 2.9.0}
+Provides: %{name}-modules = %{version}-%{release}
+Obsoletes: kernel-misc-lm_sensors
+
+%description -n kernel24-i2c-%{name}
+Kernel modules for various buses and monitor chips.
+
+%description -n kernel24-i2c-%{name} -l pl
+Moduły jądra dla różnego rodzaju sensorów monitorujących.
+
+%package -n kernel24-smp-i2c-%{name}
+Summary: Kernel modules for various buses and monitor chips
+Summary(pl): Moduły jądra dla różnego rodzaju sensorów
+Release: %{_rel}@%{_kernel_ver_str}
+Group: Applications/System
+Requires(post,postun): /sbin/depmod
+%{?with_dist_kernel:%requires_releq_kernel_smp}
+%{?with_dist_kernel:Requires: i2c >= 2.9.0}
+Provides: %{name}-modules = %{version}-%{release}
+Obsoletes: kernel-smp-misc-lm_sensors
+
+%description -n kernel24-smp-i2c-%{name}
+Kernel SMP modules for various buses and monitor chips.
+
+%description -n kernel24-smp-i2c-%{name} -l pl
+Moduły jądra SMP dla różnego rodzaju sensorów monitorujących.
+
%prep
%setup -q
%patch0 -p1
@@ -145,6 +199,48 @@
%patch3 -p1
%build
+%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}" \
+ OPTS="%{rpmcflags} -D__KERNEL_SMP=1" \
+ LINUX=`pwd`/fakelinux \
+ LINUX_HEADERS=%{_kernelsrcdir}/include \
+ I2C_HEADERS=%{_kernelsrcdir}/include \
+ SMP=1
+
+%{__make} install-kernel-busses install-kernel-chips \
+ MODPREF=kernel-smp-modules \
+ LINUX=`pwd`/fakelinux \
+ LINUX_HEADERS=%{_kernelsrcdir}/include \
+ I2C_HEADERS=%{_kernelsrcdir}/include \
+ SMP=1
+
+%{__make} clean
+%endif
+
+# UP
+%{__make} all-kernel-busses all-kernel-chips \
+ CC="%{kgcc}" \
+ OPTS="%{rpmcflags}" \
+ LINUX=`pwd`/fakelinux \
+ LINUX_HEADERS=%{_kernelsrcdir}/include \
+ I2C_HEADERS=%{_kernelsrcdir}/include \
+ SMP=0
+%endif
+
+%if %{with userspace}
%{__make} user \
CC="%{__cc}" \
OPTS="%{rpmcflags}" \
@@ -158,10 +254,22 @@
%{__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=`pwd`/fakelinux \
+ 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}
@@ -183,6 +291,15 @@
# 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
+install kernel-smp-modules/kernel/drivers/i2c/chips/*.o \
+ $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}smp/kernel/drivers/i2c/chips
+%endif
%clean
rm -rf $RPM_BUILD_ROOT
@@ -203,6 +320,19 @@
/sbin/chkconfig --del sensors
fi
+%post -n kernel24-i2c-%{name}
+%depmod %{_kernel_ver}
+
+%postun -n kernel24-i2c-%{name}
+%depmod %{_kernel_ver}
+
+%post -n kernel24-smp-i2c-%{name}
+%depmod %{_kernel_ver}smp
+
+%postun -n kernel24-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}
@@ -252,6 +382,25 @@
%attr(754,root,root) /etc/rc.d/init.d/sensors
%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/sensors
%{_mandir}/man8/sensord.8*
+%endif
+
+%if %{with kernel}
+%files -n kernel24-i2c-%{name}
+%defattr(644,root,root,755)
+%dir /lib/modules/%{_kernel_ver}/kernel/drivers/i2c/busses
+/lib/modules/%{_kernel_ver}/kernel/drivers/i2c/busses/*.o*
+%dir /lib/modules/%{_kernel_ver}/kernel/drivers/i2c/chips
+/lib/modules/%{_kernel_ver}/kernel/drivers/i2c/chips/*.o*
+
+%if %{with smp}
+%files -n kernel24-smp-i2c-%{name}
+%defattr(644,root,root,755)
+%dir /lib/modules/%{_kernel_ver}smp/kernel/drivers/i2c/busses
+/lib/modules/%{_kernel_ver}smp/kernel/drivers/i2c/busses/*.o*
+%dir /lib/modules/%{_kernel_ver}smp/kernel/drivers/i2c/chips
+/lib/modules/%{_kernel_ver}smp/kernel/drivers/i2c/chips/*.o*
+%endif
+%endif
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
%changelog
@@ -259,18 +408,11 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
-Revision 1.157 2006/09/26 14:59:04 wolvverine
-- up to 2.10.1
-
-Revision 1.156 2006/06/14 21:56:17 areq
-- BR sysfsutils-devel
+Revision 1.157.2.1 2006/11/22 15:03:17 marcus
+- Ac is not Th! In Ac we SUPPORT kernel 2.4. Rel.2.
-Revision 1.155 2006/05/20 13:08:04 wolf
-- rel 2
-
-Revision 1.154 2006/05/20 12:40:00 wolf
-- remove everything kernel related -- 2.4 is not supported in th
-- cut changelog
+Revision 1.153.2.1 2006/09/05 09:28:34 hawk
+- release 2
Revision 1.153 2006/04/11 09:50:30 hawk
- release 1
@@ -289,3 +431,498 @@
Revision 1.148 2006/01/13 17:04:55 arekm
- no smp on sparc
+
+Revision 1.147 2005/11/01 23:28:25 glen
+- rel 3@
+
+Revision 1.146 2005/11/01 23:26:13 qboosh
+- unified: -libs just before -devel
+
+Revision 1.145 2005/11/01 23:20:55 qboosh
+- pl for -libs
+
+Revision 1.144 2005/11/01 21:18:24 glen
+- -libs split
+
+Revision 1.143 2005/10/14 19:42:08 arekm
+- rebuild with new rrdtool
+
+Revision 1.142 2005/10/07 14:48:48 qboosh
+- updated to 2.9.2, removed obsolete ipmi patch
+- updated CAN-2005-2672 patch (use mktemp instead of non-existing tempfile)
+
+Revision 1.141 2005/09/06 17:04:43 arekm
+- rel 4
+
+Revision 1.140 2005/08/31 07:46:01 adamg
+- fix for CAN-2005-2672 (insecure temporary file creation)
+- release 3
+
+Revision 1.139 2005/05/18 13:57:13 qboosh
+- prepare fake .config even when no smp
+
+Revision 1.138 2005/05/11 15:27:01 qboosh
+- use x8664 macro
+
+Revision 1.137 2005/04/28 14:39:14 hawk
+- enabled compilation of i2c-ipmi and bmcsensors modules
+- release 2 (1 will be for Ra)
+
+Revision 1.136 2005/04/24 16:47:47 qboosh
+- updated to 2.9.1, updated make patch, removed obsolete gcc34 patch
+
+Revision 1.135 2005/03/24 13:49:13 hawk
+- release 5 (4 will be for Ra)
+
+Revision 1.134 2005/03/05 22:20:27 qboosh
+- reverted bogus BR
+
+Revision 1.133 2005/03/05 21:25:35 paszczus
+- really reverted. no more commit today
+
+Revision 1.132 2005/03/05 21:23:39 paszczus
+- reverted, too tired, too blind...
+
+Revision 1.130 2005/03/05 19:16:16 paszczus
+- cleanups
+- builds on amd64 so release 4
+- STBR
+
+Revision 1.129 2005/03/05 19:10:47 paszczus
+- maybe this way?
+
+Revision 1.128 2005/03/05 19:06:12 paszczus
+- fix build on amd64 (by piotr.budny (at) gmail.com)
+
+Revision 1.127 2005/02/18 19:06:00 megabajt
+- fixed sensors-detect path
+- release 3
+
+Revision 1.126 2005/02/07 21:55:45 qboosh
+- release 2
+
+Revision 1.125 2005/02/07 18:59:30 qboosh
+- use kernel24-headers deps
+
+Revision 1.124 2005/02/04 13:28:09 qboosh
+- needs dev with i2c-[0-9] devices; release 1
+
+Revision 1.123 2004/12/31 15:04:12 charles
+- updated to 2.9.0
+- kernel-i2c-devel up to >= 2.9.0
+- rel. 0.1 (/me build only userspace)
+
+Revision 1.122 2004/11/08 22:18:21 qboosh
+- updated to 2.8.8
+
+Revision 1.121 2004/09/12 17:22:58 havner
+- wrr
+
+Revision 1.120 2004/09/12 17:09:09 havner
+- no kernel modules on amd64
+
+Revision 1.119 2004/08/27 10:40:32 qboosh
+- userspace BRs moved to bcond
+
+Revision 1.118 2004/07/27 14:31:24 qboosh
+- build kernel24 modules, workaround to avoid unresolved syms in i2c-piix4
+- package isaset utility on x86,amd64
+
+Revision 1.117 2004/06/13 08:48:36 arekm
+- don't build kernel modules by default (modules are in kernel)
+
+Revision 1.116 2004/05/12 07:06:50 pluto
+- ops, %patch3.
+
+Revision 1.115 2004/05/12 07:01:38 pluto
+- minor gcc 3.4 fix.
+
+Revision 1.114 2004/05/08 14:49:31 qboosh
+- isadump is built on x86+amd64, no workaround needed; rel 2
+
+Revision 1.113 2004/04/18 15:46:03 qboosh
+- fixed manuals packaging; warning: sysfs support requires kernel > 2.6.4
+
+Revision 1.112 2004/04/18 15:25:51 qboosh
+- added iconv-in-libc patch (pointed by Maciek Pasternacki)
+
+Revision 1.111 2004/04/15 11:12:21 pawelk
+- updated to 2.8.6 (works with kernel 2.6.5)
+- some strange req commented out
+
+Revision 1.110 2004/03/07 12:42:45 grzegol
+- updated to 2.8.5
+- strict internal deps
+
+Revision 1.109 2004/02/12 23:07:41 cieciwa
+- version 2.8.4,
+- _rel 1,
+- patches not updated.
+
+Revision 1.108 2004/01/18 10:45:52 qboosh
+- don't try to build isadump on ppc/sparc*
+- pass LIBDIR for lib64 support
+- release 2
+
+Revision 1.107 2004/01/17 14:06:33 qboosh
+- updated to 2.8.3 (sysfs support updated for kernel 2.6.1+)
+- updated make patch
+
+Revision 1.106 2003/12/20 14:33:10 qboosh
+- linux/i2c-dev.h moved to glibc-kernel-headers (since 7:2.0-2); release 2
+
+Revision 1.105 2003/12/13 23:44:44 qboosh
+- cleanup
+
+Revision 1.104 2003/12/13 23:38:05 qboosh
+- md5
+
+Revision 1.103 2003/12/13 23:37:21 qboosh
+- updated to 2.8.2 (library supports sysfs at last!)
+- updated make patch, removed obsolete ddc-fix patch
+- new-style bconds, added kernel/userspace bconds
+- keep away userspace from kernel stuff
+
+Revision 1.102 2003/10/21 08:24:17 qboosh
+- PreReq: rc-scripts in -sensord
+
+Revision 1.101 2003/10/14 20:39:00 qboosh
+- 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???)
+
+Revision 1.100 2003/08/04 16:52:38 arekmat
+- removed dmidecode (old)
+- added requires for new dmidecode
+
+Revision 1.99 2003/07/26 01:06:41 qboosh
+- pre-2.4 install scheme no longer supported - updated BR
+- updated md5
+
+Revision 1.98 2003/07/25 23:50:16 qboosh
+- 2.8.0, updated make patch; BR+R i2c 2.8.0
+ (warning: using with old i2c means Oops!)
+- renamed kernel*-misc-* to kernel*-i2c-*
+- fixed .init (note that _modprobe displays its own message)
+
+Revision 1.97 2003/07/10 13:48:33 trojan
+- added using depmod macro
+
+Revision 1.96 2003/05/28 12:59:37 malekith
+- massive attack: source-md5
+
+Revision 1.95 2003/05/25 05:50:14 misi3k
+- massive attack s/pld.org.pl/pld-linux.org/
+
+Revision 1.94 2003/05/16 08:53:05 trojan
+- fixed depmod in %post and %postun when build with _without_dist_kernel
+
+Revision 1.93 2003/05/15 17:08:39 bszx
+- added _without_smp bcond in the way like in alsa-driver
+
+Revision 1.92 2003/05/14 14:42:44 qboosh
+- added depmod options so modules can be installed for kernel other than running
+
+Revision 1.91 2003/05/10 14:45:46 wiget
+- fix building with not-running kernel
+
+Revision 1.90 2003/01/19 18:51:12 qboosh
+- fixed typo in Group
+
+Revision 1.89 2003/01/07 23:09:37 qboosh
+- 2.7.0 (i2c 2.7.0 required!)
+
+Revision 1.88 2002/12/05 09:21:48 gotar
+- Prereq -> Requires(post,postun): /sbin/depmod
+
+Revision 1.87 2002/12/05 00:16:04 qboosh
+- more specific Requires
+
+Revision 1.86 2002/12/04 21:05:58 gotar
+- fixed requirements
+ (PreReq: /sbin/chkconfig for %{name}-sensord not %{name}),
+- cosmetics,
+- release 4, STBR.
+
+Revision 1.85 2002/11/15 00:02:37 jack
+- removed definition of %{_kernel_ver_str} and %{_kernel_ver} macros -
+ it's defined in rpm's macros (/usr/lib/rpm/*/macros) and only makes
+ troubles with 2.4 pack's ;)
+- bumped release.
+
+Revision 1.84 2002/11/07 10:48:57 misiek
+- use kgcc
+
+Revision 1.83 2002/11/02 11:32:23 ankry
+- rel. 2 (rebuild against kernel 2.2.22-4)
+
+Revision 1.82 2002/10/23 08:11:13 aflinta
+- updated back to version 2.6.5
+
+Revision 1.81 2002/10/12 12:58:44 marcus
+- rel.6. (for kernel 2.2.22-3)
+
+Revision 1.80 2002/10/01 18:10:48 dzimi
+- rel 5
+- fix lm_sensors-make.patch
+- add %{_kernel24} and %{kernel_ver} macros to separate dmicode from 2.2 tree
+
+Revision 1.79 2002/10/01 15:35:20 kloczek
+- back to 2.6.4 (2.6.5 dont't builds on kenel 2.2).
+
+Revision 1.78 2002/09/30 14:34:46 kloczek
+- use correct path to kernel sources.
+
+Revision 1.77 2002/09/22 12:03:10 aflinta
+- updated to version 2.6.5
+
+Revision 1.76 2002/09/12 10:08:30 marcus
+- build against kernel 2.2.21-7
+
+Revision 1.75 2002/08/25 11:36:59 marcus
+- fix for ppc
+- rel.2.
+
+Revision 1.74 2002/08/18 18:04:09 kloczek
+- cosmetics.
+
+Revision 1.73 2002/07/23 17:37:37 blues
+- release 1
+- it's done, I think. comments in sysconfig-file TODO
+
+Revision 1.72 2002/07/23 17:30:26 blues
+- pre and post moved to sensord package
+
+Revision 1.71 2002/07/23 17:20:22 blues
+- more programs build
+
+Revision 1.70 2002/07/23 17:12:13 blues
+- more docs, cleanups in docs
+
+Revision 1.69 2002/07/23 17:02:00 blues
+- rel 0.7
+- some install "sorcery"
+- more aplications
+- sensord moved to separate package (not everyone wants this, eg. me)
+
+Revision 1.68 2002/07/23 15:42:44 blues
+- rel 0.2
+- some install fixes
+- updated patch
+- little cut of changelog
+
+Revision 1.67 2002/07/23 13:52:17 blues
+- 2.6.4 - started update
+
+Revision 1.66 2002/07/21 17:01:16 kloczek
+- merge translations from KSI and use new %doc.
+
+Revision 1.65 2002/07/21 16:48:09 jajcus
+- Release: 3 STBR
+- init script improved
+
+Revision 1.64 2002/06/17 07:48:17 qboosh
+- updated URLs
+
+Revision 1.63 2002/06/07 12:39:19 mkochano
+- Corrected source uri.
+
+Revision 1.62 2002/05/25 21:41:14 qboosh
+- new %doc
+
+Revision 1.61 2002/05/22 18:03:57 marcus
+- fixed %{_rel} using
+
+Revision 1.60 2002/05/12 08:33:16 blues
+- release 2
+- rebuild with changed init-script
+
+Revision 1.59 2002/03/27 20:04:04 qboosh
+- updated to 2.6.3
+
+Revision 1.58 2002/03/17 16:06:25 dzimi
+- update release numbers to build with new kernel release
+
+Revision 1.57 2002/03/04 22:43:03 marcus
+- use new macros (ver-rel)
+- rel.11
+
+Revision 1.56 2002/03/03 20:45:50 misiek
+- BR: rpm-perlprov, too
+
+Revision 1.55 2002/03/03 20:44:52 misiek
+BR: perl-modules
+
+Revision 1.54 2002/02/26 15:39:54 qboosh
+- use requires_releq_kernel_{up,smp} macros, release 10
+
+Revision 1.53 2002/02/23 21:48:50 saq
+- change Conflicts: wrong-kernel to Requires: right-kernel
+- release 9, STBR
+
+Revision 1.52 2002/02/23 03:36:24 kloczek
+- adapterized.
+
+Revision 1.51 2002/02/22 23:29:13 kloczek
+- removed all Group fields translations (oure rpm now can handle translating
+ Group field using gettext).
+
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/SPECS/lm_sensors.spec?r1=1.157&r2=1.157.2.1&f=u
More information about the pld-cvs-commit
mailing list