diff --git a/.cvsignore b/.cvsignore index 687581d..712f4b5 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -lm_sensors-2.6.3.tar.gz +lm_sensors-2.6.5.tar.gz diff --git a/lm_sensors.spec b/lm_sensors.spec index af47364..6ca71e0 100644 --- a/lm_sensors.spec +++ b/lm_sensors.spec @@ -1,14 +1,15 @@ Name: lm_sensors -Version: 2.6.3 -Release: 2 -URL: http://www.netroedge.com/~lm78/ -Source: http://www.netroedge.com/~lm78/archive/lm_sensors-%{version}.tar.gz +Version: 2.6.5 +Release: 5 +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 -Patch3: lm_sensors-2.5.5-glibc22.patch -Patch4: lm_sensors-2.5.5-csb5.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 Summary: Hardware monitoring tools. Group: Applications/System -Copyright: GPL +License: GPL Buildroot: %{_tmppath}/%{name}-root BuildPrereq: kernel-headers >= 2.2.16 ExclusiveArch: alpha %{ix86} @@ -30,8 +31,9 @@ when building applications that make use of sensor data. %prep %setup -q %patch1 -p1 -b .redhat -%patch3 -p1 -b .glibc22 -%patch4 -p1 -b .csb5 +%patch2 -p1 -b .glibc22 +%patch3 -p1 -b .utf8 +%patch4 -p1 -b .fixinstall %build mkdir -p kernel/include/linux/ @@ -44,6 +46,9 @@ make %{makeinstall} chmod 755 $RPM_BUILD_ROOT%{_libdir}/*.so* +# remove dmidecode from the buildroot +rm -f $RPM_BUILD_ROOT%{_sbindir}/dmidecode + %clean [ "$RPM_BUILD_ROOT" != "/" ] && rm -fr $RPM_BUILD_ROOT @@ -58,7 +63,7 @@ chmod 755 $RPM_BUILD_ROOT%{_libdir}/*.so* %{_bindir}/sensors %{_libdir}/*.so.* %{_mandir}/man*/* -%{_sbindir}/sensors-detect +%{_sbindir}/* %files devel %defattr(-,root,root) @@ -67,7 +72,27 @@ chmod 755 $RPM_BUILD_ROOT%{_libdir}/*.so* %{_libdir}/lib*.so %changelog -* Fri Jun 21 2002 Tim Powers +* Wed Jan 22 2003 Tim Powers +- rebuilt + +* Wed Dec 04 2002 Phil Knirsch 2.6.5-4 +- Bump release and try to rebuild. + +* Tue Dec 3 2002 Tim Powers 2.6.5-3 +- don't include dmidecode, conflicts with kernel-utils + +* Fri Nov 29 2002 Phil Knirsch 2.6.5-2 +- Added patch to fix utf8 problem with sensors-detect. +- Fixed Copyright: to License: in specfile + +* Fri Nov 29 2002 Phil Knirsch 2.6.5-1 +- Updated userlevel to 2.6.5. +- Include all the /usr/sbin/ apps (like dmidecode). + +* Fri Oct 04 2002 Phil Knirsch 2.6.3-3 +- Removed Serverworks patch as it is already in sensors-detect. + +* Fri Jun 21 2002 Tim Powers 2.6.3-2 - automated rebuild * Tue Jun 18 2002 Phil Knirsch 2.6.3-1 diff --git a/sources b/sources index 0be1723..f51a3b3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -de7657a0c9ef8574aeaf2c4695b042ec lm_sensors-2.6.3.tar.gz +297a3e6173562ff92bd7467f744125db lm_sensors-2.6.5.tar.gz