diff --git a/lm_sensors-2.8.3-redhat.patch b/lm_sensors-2.8.3-redhat.patch new file mode 100644 index 0000000..465c85d --- /dev/null +++ b/lm_sensors-2.8.3-redhat.patch @@ -0,0 +1,83 @@ +--- lm_sensors-2.8.3/prog/init/lm_sensors.init.redhat 2003-02-25 03:50:46.000000000 +0100 ++++ lm_sensors-2.8.3/prog/init/lm_sensors.init 2004-02-04 16:59:07.482175057 +0100 +@@ -39,7 +39,7 @@ + [ -e /var/lock/subsys/sensors ] || /sbin/modprobe -r i2c-proc &>/dev/null + + CONFIG=/etc/sysconfig/lm_sensors +-PSENSORS=/usr/local/bin/sensors ++PSENSORS=/usr/bin/sensors + + # Source function library. + . /etc/init.d/functions +--- lm_sensors-2.8.3/Makefile.redhat 2003-12-29 20:29:16.000000000 +0100 ++++ lm_sensors-2.8.3/Makefile 2004-02-04 16:44:02.674488462 +0100 +@@ -44,7 +44,7 @@ + # may be used mistakenly. Note: This should point to the directory + # *above* the linux/ subdirectory, so to /usr/local/include in the + # above example. +-I2C_HEADERS := /usr/local/include ++I2C_HEADERS := /usr/src/linux/include + #I2C_HEADERS := $(LINUX_HEADERS) + + # Uncomment the third line on SMP systems if the magic invocation fails. It +@@ -63,8 +63,8 @@ + + # Uncomment the second line if you are a developer. This will enable many + # additional warnings at compile-time +-WARN := 0 +-#WARN := 1 ++#WARN := 0 ++WARN := 1 + + # Uncomment the second line if you want to get (loads of) debug information + # at run-time. +@@ -77,7 +77,7 @@ + DESTDIR := + + # This is the prefix that will be used for almost all directories below. +-PREFIX := /usr/local ++PREFIX := $(prefix) + + # This is the main modules directory into which the modules will be installed. + # The magic invocation will return something like this: +@@ -89,11 +89,11 @@ + + # This is the directory where sensors.conf will be installed, if no other + # configuration file is found +-ETCDIR := /etc ++ETCDIR := $(sysconfdir) + + # You should not need to change this. It is the directory into which the + # library files (both static and shared) will be installed. +-LIBDIR := $(PREFIX)/lib ++LIBDIR := $(libdir) + + EXLDFLAGS := -Wl,-rpath,$(LIBDIR) + +@@ -104,8 +104,8 @@ + # Note that not all programs in this package are really installed; + # some are just examples. You can always install them by hand, of + # course. +-BINDIR := $(PREFIX)/bin +-SBINDIR := $(PREFIX)/sbin ++BINDIR := $(bindir) ++SBINDIR := $(sbindir) + + # You should not need to change this. It is the basic directory into which + # include files will be installed. The actual directory will be +@@ -113,13 +113,13 @@ + # for library include files. If PREFIX equals the default /usr/local/bin, + # you will be able to use '#include ' regardless of the + # current kernel selected. +-INCLUDEDIR := $(PREFIX)/include ++INCLUDEDIR := $(includedir) + SYSINCLUDEDIR := $(INCLUDEDIR)/linux + 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 := $(mandir) + + MACHINE := $(shell uname -m) + diff --git a/lm_sensors.spec b/lm_sensors.spec index e0a66a2..ce1c922 100644 --- a/lm_sensors.spec +++ b/lm_sensors.spec @@ -1,10 +1,10 @@ Name: lm_sensors Version: 2.8.3 -Release: 1 +Release: 4 URL: http://secure.netroedge.com/~lm78/ Source: http://secure.netroedge.com/~lm78/archive/lm_sensors-%{version}.tar.gz Patch1: lm_sensors-2.5.5-glibc22.patch -Patch2: lm_sensors-2.8.2-redhat.patch +Patch2: lm_sensors-2.8.3-redhat.patch Patch3: lm_sensors-2.8.0-utf8.patch Patch4: lm_sensors-2.8.2-expr.patch Summary: Hardware monitoring tools. @@ -63,7 +63,7 @@ rm -rf $RPM_BUILD_ROOT%{_includedir}/linux %files %defattr(-,root,root) %doc BACKGROUND BUGS CHANGES CONTRIBUTORS COPYING doc INSTALL QUICKSTART README* TODO prog/init/* -%config %{_sysconfdir}/sensors.conf +%config(noreplace) %{_sysconfdir}/sensors.conf %{_bindir}/* %{_libdir}/*.so.* %{_mandir}/man*/* @@ -76,6 +76,15 @@ rm -rf $RPM_BUILD_ROOT%{_includedir}/linux %{_libdir}/lib*.so %changelog +* Fri Feb 13 2004 Elliot Lee +- rebuilt + +* Thu Feb 05 2004 Phil Knirsch 2.8.3-3 +- Modified sensors.conf to a noreplace config file. + +* Wed Feb 04 2004 Phil Knirsch 2.8.3-2 +- Fixed newly included initscript (#114608). + * Thu Jan 29 2004 Phil Knirsch 2.8.3-1 - Updated to latest upstream version 2.8.3