From 32c33c86c0fab5cb94f663c6cfe517e0b74bf9a79532a920da9c459bbb1a7b3f Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Mon, 21 Jan 2008 00:12:42 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/sensors?expand=0&rev=30 --- lm_sensors-3.0.0.dif | 18 ----- sensors.changes | 6 ++ sensors.spec | 161 ++++++++++++++++++++++--------------------- 3 files changed, 88 insertions(+), 97 deletions(-) diff --git a/lm_sensors-3.0.0.dif b/lm_sensors-3.0.0.dif index 2c398ff..3827320 100644 --- a/lm_sensors-3.0.0.dif +++ b/lm_sensors-3.0.0.dif @@ -2,24 +2,6 @@ Index: Makefile =================================================================== --- Makefile.orig +++ Makefile -@@ -38,7 +38,7 @@ DEBUG := 0 - DESTDIR := - - # This is the prefix that will be used for almost all directories below. --PREFIX := /usr/local -+PREFIX := /usr - - # Your C compiler - CC := gcc -@@ -71,7 +71,7 @@ LIBINCLUDEDIR := $(INCLUDEDIR)/sensors - - # You should not need to change this. It is the base directory under which the - # manual pages will be installed. --MANDIR := $(PREFIX)/man -+MANDIR := $(PREFIX)/share/man - - MACHINE := $(shell uname -m) - @@ -133,7 +133,7 @@ ifeq ($(DEBUG),1) ALL_CPPFLAGS += -DDEBUG ALL_CFLAGS += -O -g diff --git a/sensors.changes b/sensors.changes index ff699b9..90a7619 100644 --- a/sensors.changes +++ b/sensors.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sat Jan 19 11:03:05 CET 2008 - jdelvare@suse.de + +- Pass PREFIX and MANDIR on the command line from the spec file + rather than patching the Makefile. This is easier to maintain. + ------------------------------------------------------------------- Tue Dec 18 10:45:45 CET 2007 - jdelvare@suse.de diff --git a/sensors.spec b/sensors.spec index 4a237b4..35f3cc1 100644 --- a/sensors.spec +++ b/sensors.spec @@ -1,7 +1,7 @@ # # spec file for package sensors (Version 3.0.0) # -# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # @@ -14,7 +14,7 @@ Name: sensors BuildRequires: bison flex rrdtool-devel sysfsutils Url: http://www.lm-sensors.org/ Version: 3.0.0 -Release: 9 +Release: 18 Summary: Hardware health monitoring for Linux License: GPL v2 or later Group: System/Monitoring @@ -129,10 +129,10 @@ Authors: %build RPM_OPT_FLAGS="$RPM_OPT_FLAGS" - make PROG_EXTRA:=sensord LIBDIR=%{_libdir} user + make PROG_EXTRA:=sensord PREFIX=%{_prefix} MANDIR=%{_mandir} LIBDIR=%{_libdir} user %install - make user_install PROG_EXTRA:=sensord LIBDIR=%{_libdir} DESTDIR=$RPM_BUILD_ROOT + make PROG_EXTRA:=sensord PREFIX=%{_prefix} MANDIR=%{_mandir} LIBDIR=%{_libdir} DESTDIR=$RPM_BUILD_ROOT install cd doc/ mkdir -p $RPM_BUILD_ROOT/%{_docdir}/sensors cp -a FAQ $RPM_BUILD_ROOT/%{_docdir}/sensors/ @@ -201,53 +201,56 @@ rm -f $RPM_BUILD_ROOT/usr/src/linux/include/sensors.h %doc /usr/share/man/man3/*.3.gz %changelog -* Tue Dec 18 2007 - jdelvare@suse.de +* Sat Jan 19 2008 jdelvare@suse.de +- Pass PREFIX and MANDIR on the command line from the spec file + rather than patching the Makefile. This is easier to maintain. +* Tue Dec 18 2007 jdelvare@suse.de - Fix voltage references in sensors.conf. Fixed upstream in: http://www.lm-sensors.org/changeset/5076 -* Tue Dec 11 2007 - jdelvare@suse.de +* Tue Dec 11 2007 jdelvare@suse.de - Fix rrd support in sensord. Fixed upstream in: http://www.lm-sensors.org/changeset/5069 -* Fri Nov 30 2007 - jdelvare@suse.de +* Fri Nov 30 2007 jdelvare@suse.de - Remove obsolete Requires tags. Since version 3.0.0, it is no longer mandatory to provide a configuration file to libsensors. -* Thu Nov 29 2007 - jdelvare@suse.de +* Thu Nov 29 2007 jdelvare@suse.de - Add missing Conflicts tag. -* Tue Nov 27 2007 - jdelvare@suse.de +* Tue Nov 27 2007 jdelvare@suse.de - Add a link to the init script. -* Mon Nov 26 2007 - jdelvare@suse.de +* Mon Nov 26 2007 jdelvare@suse.de - Update to lm_sensors version 3.0.0 * Completely rewritten library, much smaller * Supports all devices supported by the kernel (contains no device-specific code) * libsensors has a new SONAME (libsensors.so.4) * fancontrol.pl is gone -* Thu Nov 22 2007 - jdelvare@suse.de +* Thu Nov 22 2007 jdelvare@suse.de - Drop local changes to sensors-detect that are no longer relevant. - Drop local changes to sensord.init: we no longer package it. -* Wed Nov 21 2007 - jdelvare@suse.de +* Wed Nov 21 2007 jdelvare@suse.de - Add missing Requires to libsensors3-devel. This is a cosmetic change only, as the requirement was already drawn indirectly. -* Mon Nov 05 2007 - jdelvare@suse.de +* Mon Nov 05 2007 jdelvare@suse.de - Add split provides to subpackages libsensors3-devel and sensord so that an update will work as designed. -* Fri Nov 02 2007 - jdelvare@suse.de +* Fri Nov 02 2007 jdelvare@suse.de - Fix two rpmlint warnings. One of them was about a missing dependency between libsensors3-devel and libsensors3, which was breaking the build of other packages. -* Fri Nov 02 2007 - jdelvare@suse.de +* Fri Nov 02 2007 jdelvare@suse.de - Package libsensors separately. I've named the package "libsensors3" because it is going to fade out quickly in favor of the new, incompatible version from lm-sensors 3. - Don't remove the build root before installing. rpmlint was compaining about that. -* Thu Nov 01 2007 - jdelvare@suse.de +* Thu Nov 01 2007 jdelvare@suse.de - Fix packaging breakage introduced by the following change: ppc and ia64 packages do not include isadump nor isaset. -* Wed Oct 31 2007 - jdelvare@suse.de +* Wed Oct 31 2007 jdelvare@suse.de - Package sensord separately. - Don't include redundant or outdated initalization scripts in the documentation tree. -* Sun Oct 28 2007 - jdelvare@suse.de +* Sun Oct 28 2007 jdelvare@suse.de - Update to lm_sensors version 2.10.5 * Support for the SMSC SCH3112, SCH3114, SCH3116 * libsensors fixes for the thmc50, bmcsensors, lm93, adm1026 @@ -257,20 +260,20 @@ rm -f $RPM_BUILD_ROOT/usr/src/linux/include/sensors.h * Detect new Winbond chips - useful_addresses.html is no longer part of the package. - lm_sensors-dont-probe-i2c-isa.dif: Drop, bug fixed upstream. -* Mon Oct 15 2007 - jdelvare@suse.de +* Mon Oct 15 2007 jdelvare@suse.de - Do not include i2c tools, they have their own package now. -* Mon Sep 03 2007 - jdelvare@suse.de +* Mon Sep 03 2007 jdelvare@suse.de - Run ldconfig in %%post and %%postun. rpmlint was complaining that this was missing. -* Tue Aug 28 2007 - werner@suse.de +* Tue Aug 28 2007 werner@suse.de - Remove hard coded modules introduced by last change -* Tue Aug 14 2007 - hvogel@suse.de +* Tue Aug 14 2007 hvogel@suse.de - Add sysconfig metadata [#300069] -* Mon Aug 13 2007 - jdelvare@suse.de +* Mon Aug 13 2007 jdelvare@suse.de - Don't probe i2c-isa as a regular i2c bus. This regression was introduced in lm_sensors 2.10.4. Fixed upstream in: http://www.lm-sensors.org/changeset/4649 -* Wed Aug 01 2007 - werner@suse.de +* Wed Aug 01 2007 werner@suse.de - Update to lm_sensors version 2.10.4 * added support for recent devices and cips like dme1737, applesmc, abituguru3, f71882fg, w83627ehf (kernel 2.4) @@ -280,142 +283,142 @@ rm -f $RPM_BUILD_ROOT/usr/src/linux/include/sensors.h * support block reads with specified length of I2C devices * A lot of fixes and enhancements * Add both patches form us for fancontrol and pwmconfig -* Wed Jun 27 2007 - jdelvare@suse.de +* Wed Jun 27 2007 jdelvare@suse.de - Don't package the decode-edid.pl script. It requires parse-edid from the read-edid package, which isn't included in Suse. -* Thu Jun 21 2007 - dmueller@suse.de +* Thu Jun 21 2007 dmueller@suse.de - adjust buildrequires -* Mon Jun 04 2007 - jdelvare@suse.de +* Mon Jun 04 2007 jdelvare@suse.de - Don't build on s390 nor s390x. -* Mon May 28 2007 - jdelvare@suse.de +* Mon May 28 2007 jdelvare@suse.de - Fix two rpmlint errors: /etc/init.d/lm_sensors shouldn't be marked as a config file, and was missing a Short-Description tag. -* Wed May 09 2007 - jdelvare@suse.de +* Wed May 09 2007 jdelvare@suse.de - lm_sensors-no-xeon-script.patch: The decode-xeon.pl script is outdated. It was never ported to work with 2.6 kernels, so it is of no use on recent Suse distributions. Stop shipping it. - Drop a legacy patch to sensors/main.c related to the configuration file name, which is no longer needed. -* Fri May 04 2007 - jdelvare@suse.de +* Fri May 04 2007 jdelvare@suse.de - Don't package outdated driver documentation. The up-to-date driver documentation is in the kernel-source package. (bug #271302) - Two minor cleanups to the spec file. -* Thu Apr 12 2007 - jdelvare@suse.de +* Thu Apr 12 2007 jdelvare@suse.de - lm_sensors-2.8.3-nodump.patch: Removed, should no longer be needed. Since lm_sensors 2.8.6, isadump is only compiled on i386 and x86_64. - Likewise, no need to patch prog/dump/isadump.c for powerpc, as it won't be compiled for these architectures anyway. -* Thu Apr 05 2007 - werner@suse.de +* Thu Apr 05 2007 werner@suse.de - Update to lm_sensors version 2.10.3 which added support for recent devices and support for kernel 2.6.22. -* Thu Mar 29 2007 - ro@suse.de +* Thu Mar 29 2007 ro@suse.de - added bison,flex to buildreq -* Mon Feb 19 2007 - werner@suse.de +* Mon Feb 19 2007 werner@suse.de - Make README.SuSE encoding independend (bug #246130) -* Tue Jan 30 2007 - werner@suse.de +* Tue Jan 30 2007 werner@suse.de - Update to lm_sensors version 2.10.2 which added support for recent devices. -* Mon Nov 13 2006 - werner@suse.de +* Mon Nov 13 2006 werner@suse.de - Update to lm_sensors version 2.10.1 which also includes the fix for bug #192092 by not overwriting chip settings - Remove notify warn message from pdb about overwriting settings -* Mon Jun 26 2006 - werner@suse.de +* Mon Jun 26 2006 werner@suse.de - Load i2c-dev kernel module instead of i2c-sensor (bug #188126) -* Tue Feb 28 2006 - werner@suse.de +* Tue Feb 28 2006 werner@suse.de - Update to version 2.10.0 for better udev support (bug #151931) - Add i2c-0 to static device list for udev (bug #151931) -* Wed Jan 25 2006 - mls@suse.de +* Wed Jan 25 2006 mls@suse.de - converted neededforbuild to BuildRequires -* Wed Jan 11 2006 - werner@suse.de +* Wed Jan 11 2006 werner@suse.de - Include fan control in lm_sensors service script (bug #141958) -* Tue Dec 13 2005 - werner@suse.de +* Tue Dec 13 2005 werner@suse.de - Do not to handle module variables from package Modules (#137963) -* Thu Nov 10 2005 - werner@suse.de +* Thu Nov 10 2005 werner@suse.de - Add postun section to run insserv_clean (bug #132934) -* Fri Oct 14 2005 - werner@suse.de +* Fri Oct 14 2005 werner@suse.de - Update to lm_sensors version 2.9.2 -* Thu Aug 25 2005 - werner@suse.de +* Thu Aug 25 2005 werner@suse.de - Security fix in pwmconfig (bug #112925) -* Wed May 11 2005 - schwab@suse.de +* Wed May 11 2005 schwab@suse.de - Add freetype2 and libart_lgpl to nfb, needed by rrdtool. -* Mon May 09 2005 - werner@suse.de +* Mon May 09 2005 werner@suse.de - Update to lm_sensors-2.9.1 - Use insserv to enable rc script (bug #76174) -* Thu Feb 17 2005 - werner@suse.de +* Thu Feb 17 2005 werner@suse.de - Update to lm_sensors-2.9.0 (bug #50681) -* Mon Aug 30 2004 - werner@suse.de +* Mon Aug 30 2004 werner@suse.de - Update to newest lm_sensors-2.8.7 to be compatible to the current kernel version. -* Tue May 04 2004 - werner@suse.de +* Tue May 04 2004 werner@suse.de - Fix bug #35502 (missing w83627hf entries) by updating to lm_sensors-2.8.6 which includes a better parser for sysfs -* Tue Apr 13 2004 - ro@suse.de +* Tue Apr 13 2004 ro@suse.de - remove kernel-source from neededforbuild (not needed any longer) -* Wed Mar 10 2004 - werner@suse.de +* Wed Mar 10 2004 werner@suse.de - Add workaround for missing w83627hf chip driver (bug #35501) -* Tue Mar 09 2004 - werner@suse.de +* Tue Mar 09 2004 werner@suse.de - A few changes for kernel 2.6 (bug #35500) -* Fri Mar 05 2004 - pth@suse.de +* Fri Mar 05 2004 pth@suse.de - Remove no-strict-aliasing and fix the code instead. Patch was also sent to upstream maintainers for inclusion. -* Fri Mar 05 2004 - ro@suse.de +* Fri Mar 05 2004 ro@suse.de - added libpng to neededforbuild (for rrdtool) - use no-strict-aliasing -* Wed Jan 28 2004 - ro@suse.de +* Wed Jan 28 2004 ro@suse.de - update to 2.8.3 - use buildroot and build as user -* Fri Sep 12 2003 - ro@suse.de +* Fri Sep 12 2003 ro@suse.de - configure kernel-source if needed -* Mon Jul 21 2003 - werner@suse.de +* Mon Jul 21 2003 werner@suse.de - Update to lm_sensors 2.8.0 -* Thu Jun 05 2003 - ro@suse.de +* Thu Jun 05 2003 ro@suse.de - compile using headers from kernel-source not glibc -* Wed Mar 19 2003 - olh@suse.de +* Wed Mar 19 2003 olh@suse.de - add lm_sensors-2.7.0-nodump.patch to fix dependency tree -* Thu Feb 27 2003 - werner@suse.de +* Thu Feb 27 2003 werner@suse.de - Fix location of sensors program in boot script -* Tue Feb 11 2003 - werner@suse.de +* Tue Feb 11 2003 werner@suse.de - Update due to kernel interface update (anything else is a bug) -* Mon Dec 02 2002 - werner@suse.de +* Mon Dec 02 2002 werner@suse.de - Update to lm_sensors 2.4.6 -* Wed Nov 06 2002 - werner@suse.de +* Wed Nov 06 2002 werner@suse.de - Fix bug # 21583: sensors shouldn't segfault on missing argument. -* Wed Sep 04 2002 - werner@suse.de +* Wed Sep 04 2002 werner@suse.de - Fix boot scripts to be usable (bug #18868) - Install some progs which are described in FAQ -* Wed Aug 28 2002 - fehr@suse.de +* Wed Aug 28 2002 fehr@suse.de - updated to current version 2.6.4 of lm_sensors -* Thu Aug 01 2002 - werner@suse.de +* Thu Aug 01 2002 werner@suse.de - Use _libdir macro for 64bit architectures -* Wed Jul 31 2002 - werner@suse.de +* Wed Jul 31 2002 werner@suse.de - Install sensord daemon for logging (bug #17316) -* Tue Jun 18 2002 - ke@suse.de +* Tue Jun 18 2002 ke@suse.de - Fix typo in README.SuSE [# 14790]. -* Mon Aug 06 2001 - uli@suse.de +* Mon Aug 06 2001 uli@suse.de - fixed to build on PPC -* Wed Jul 04 2001 - werner@suse.de +* Wed Jul 04 2001 werner@suse.de - update to 2.6.0 -* Mon Apr 16 2001 - werner@suse.de +* Mon Apr 16 2001 werner@suse.de - update to 2.5.5 -* Thu Apr 05 2001 - uli@suse.de +* Thu Apr 05 2001 uli@suse.de - removed lx_suse from neededforbuild -* Thu Dec 14 2000 - werner@suse.de +* Thu Dec 14 2000 werner@suse.de - Group tag -* Mon Jun 19 2000 - ro@suse.de +* Mon Jun 19 2000 ro@suse.de - update to 2.5.0 -* Wed Jun 07 2000 - uli@suse.de +* Wed Jun 07 2000 uli@suse.de - moved docs to %%{_docdir} -* Fri Feb 11 2000 - ro@suse.de +* Fri Feb 11 2000 ro@suse.de - removed requires kernmod (package eliminated) -* Wed Feb 02 2000 - werner@suse.de +* Wed Feb 02 2000 werner@suse.de - No asm/io.h if sys/io.h is included -* Wed Feb 02 2000 - werner@suse.de +* Wed Feb 02 2000 werner@suse.de - No sys/perm.h or sys/io.h on ppc and sparc -* Tue Feb 01 2000 - werner@suse.de +* Tue Feb 01 2000 werner@suse.de - New package sensors (version 2.4.3 corresponds with current used kernel i2c patch) - Prefix is /usr, mandir is /usr/share/man, and kernel