From 7149d2de51d7eb17815a0373384edd78502ad3f0 Mon Sep 17 00:00:00 2001 From: cvsdist Date: Thu, 9 Sep 2004 08:00:10 +0000 Subject: [PATCH] auto-import changelog data from lm_sensors-2.8.1-1.src.rpm Fri Oct 24 2003 Phil Knirsch 2.8.1-1 - Update to latest upstream version 2.8.1 Wed Jul 23 2003 Phil Knirsch 2.8.0-1 - Update to latest upstream version 2.8.0 Fri Jun 27 2003 Phil Knirsch 2.6.5-6.1 - rebuilt Fri Jun 27 2003 Phil Knirsch 2.6.5-6 - Included prog/init scripts and README (#90606). - Require kernel-utils for dmidecode (#88367, #65057). --- .cvsignore | 2 +- lm_sensors-2.8.0-utf8.patch | 11 +++++++++ lm_sensors.spec | 47 ++++++++++++++++++++++++------------- sources | 2 +- 4 files changed, 44 insertions(+), 18 deletions(-) create mode 100644 lm_sensors-2.8.0-utf8.patch diff --git a/.cvsignore b/.cvsignore index 712f4b5..ef44326 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -lm_sensors-2.6.5.tar.gz +lm_sensors-2.8.1.tar.gz diff --git a/lm_sensors-2.8.0-utf8.patch b/lm_sensors-2.8.0-utf8.patch new file mode 100644 index 0000000..d02af65 --- /dev/null +++ b/lm_sensors-2.8.0-utf8.patch @@ -0,0 +1,11 @@ +--- lm_sensors-2.8.0/prog/detect/sensors-detect.utf8 2003-07-08 15:07:59.000000000 +0200 ++++ lm_sensors-2.8.0/prog/detect/sensors-detect 2003-07-23 12:40:03.000000000 +0200 +@@ -1394,7 +1394,7 @@ + "*** Terminating.\n"; + exit(-1); + } +- my $towrite = pack "C", $_[1]; ++ my $towrite = pack "C", ($_[1] & 0xff); + sysseek IOPORTS, $_[0], 0 or return -1; + my $nrchars = syswrite IOPORTS, $towrite, 1; + return -1 if not defined $nrchars or $nrchars != 1; diff --git a/lm_sensors.spec b/lm_sensors.spec index 6ca71e0..cd588d3 100644 --- a/lm_sensors.spec +++ b/lm_sensors.spec @@ -1,16 +1,16 @@ Name: lm_sensors -Version: 2.6.5 -Release: 5 +Version: 2.8.1 +Release: 1 URL: http://secure.netroedge.com/~lm78/ Source: http://secure.netroedge.com/~lm78/archive/lm_sensors-%{version}.tar.gz -Patch1: lm_sensors-2.5.2-redhat.patch -Patch2: lm_sensors-2.5.5-glibc22.patch -Patch3: lm_sensors-2.6.5-utf8.patch -Patch4: lm_sensors-2.6.5-fixinstall.patch +Patch1: lm_sensors-2.5.5-glibc22.patch +Patch2: lm_sensors-2.8.0-redhat.patch +Patch3: lm_sensors-2.8.0-utf8.patch Summary: Hardware monitoring tools. Group: Applications/System License: GPL Buildroot: %{_tmppath}/%{name}-root +Requires: kernel-utils BuildPrereq: kernel-headers >= 2.2.16 ExclusiveArch: alpha %{ix86} @@ -30,24 +30,26 @@ when building applications that make use of sensor data. %prep %setup -q -%patch1 -p1 -b .redhat -%patch2 -p1 -b .glibc22 +%patch1 -p1 -b .glibc22 +%patch2 -p1 -b .redhat %patch3 -p1 -b .utf8 -%patch4 -p1 -b .fixinstall %build -mkdir -p kernel/include/linux/ -ln -s /usr/src/linux-2.4/include/linux/i2c* kernel/include/linux/ -#make LINUX_HEADERS=/usr/include LINUX=/usr/src/linux-2.4 -make +mkdir -p kernel/include/linux +ln -sf /usr/include/linux/* kernel/include/linux +make user %install [ "$RPM_BUILD_ROOT" != "/" ] && rm -fr $RPM_BUILD_ROOT -%{makeinstall} +make prefix=/usr exec_prefix=/usr bindir=/usr/bin sbindir=/usr/sbin sysconfdir=/etc datadir=/usr/share includedir=/usr/include libdir=/usr/lib libexecdir=/usr/libexec localstatedir=/var sharedstatedir=/usr/com mandir=/usr/share/man infodir=/usr/share/info DESTDIR=$RPM_BUILD_ROOT user_install chmod 755 $RPM_BUILD_ROOT%{_libdir}/*.so* # remove dmidecode from the buildroot rm -f $RPM_BUILD_ROOT%{_sbindir}/dmidecode +mv prog/init/README prog/init/README.initscripts + +# Remove userland kernel headers, belong in glibc-kernheaders. +rm -rf $RPM_BUILD_ROOT%{_includedir}/linux %clean [ "$RPM_BUILD_ROOT" != "/" ] && rm -fr $RPM_BUILD_ROOT @@ -58,7 +60,7 @@ rm -f $RPM_BUILD_ROOT%{_sbindir}/dmidecode %files %defattr(-,root,root) -%doc BACKGROUND BUGS CHANGES CONTRIBUTORS COPYING doc INSTALL QUICKSTART README* TODO +%doc BACKGROUND BUGS CHANGES CONTRIBUTORS COPYING doc INSTALL QUICKSTART README* TODO prog/init/* %config %{_sysconfdir}/sensors.conf %{_bindir}/sensors %{_libdir}/*.so.* @@ -72,7 +74,20 @@ rm -f $RPM_BUILD_ROOT%{_sbindir}/dmidecode %{_libdir}/lib*.so %changelog -* Wed Jan 22 2003 Tim Powers +* Fri Oct 24 2003 Phil Knirsch 2.8.1-1 +- Update to latest upstream version 2.8.1 + +* Wed Jul 23 2003 Phil Knirsch 2.8.0-1 +- Update to latest upstream version 2.8.0 + +* Fri Jun 27 2003 Phil Knirsch 2.6.5-6.1 +- rebuilt + +* Fri Jun 27 2003 Phil Knirsch 2.6.5-6 +- Included prog/init scripts and README (#90606). +- Require kernel-utils for dmidecode (#88367, #65057). + +* Wed Jan 22 2003 Tim Powers 2.6.5-5 - rebuilt * Wed Dec 04 2002 Phil Knirsch 2.6.5-4 diff --git a/sources b/sources index f51a3b3..1899b61 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -297a3e6173562ff92bd7467f744125db lm_sensors-2.6.5.tar.gz +2ea0d608404aced13211174e03b1268a lm_sensors-2.8.1.tar.gz