rpms/lm_sensors/devel sensord.init, NONE, 1.1 sensord.sysconfig, NONE, 1.1 lm_sensors-2.10.0-kernel26.patch, 1.1, 1.2 lm_sensors.spec, 1.46, 1.47 lm_sensors-2.5.5-glibc22.patch, 1.2, NONE lm_sensors-2.8.3-redhat.patch, 1.3, NONE lm_sensors-2.8.3-rpath.patch, 1.1, NONE lm_sensors.init, 1.6, NONE
Hans de Goede (jwrdegoede)
fedora-extras-commits at redhat.com
Tue Jul 10 20:58:10 UTC 2007
Author: jwrdegoede
Update of /cvs/extras/rpms/lm_sensors/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14516
Modified Files:
lm_sensors-2.10.0-kernel26.patch lm_sensors.spec
Added Files:
sensord.init sensord.sysconfig
Removed Files:
lm_sensors-2.5.5-glibc22.patch lm_sensors-2.8.3-redhat.patch
lm_sensors-2.8.3-rpath.patch lm_sensors.init
Log Message:
* Mon Jul 9 2007 Hans de Goede <j.w.r.degoede at hhs.nl> - 2.10.3-3
- Remove no longer needed patches 1, 2 & 6
- Various specfile cleanups to match the Fedora packaging guidelines
this fixes bz 238787 amongst other things
- Use lm_sensors provided initscript instead of our own private one, this
stops the sometimes unnecessary loading of i2c-dev
- No longer ship a static version of the library in -devel
- Compile sensord and eepromer extra programs and put each in its own
subpackage (bz 236904)
--- NEW FILE sensord.init ---
#!/bin/sh
#
# sensord: Hardware sensors monitoring daemon
#
# chkconfig: - 27 73
# description: Starts and stops hardware sensors monitoring daemon.
# config: /etc/sysconfig/sensord
# author: Filip Kalinski <filon at pld.org.pl>
# adapted for fedora by Hans de Goede <j.w.r.degoede at hhs.nl>
# Source function library.
. /etc/rc.d/init.d/functions
# Get service config
if [ -f /etc/sysconfig/sensord ]; then
. /etc/sysconfig/sensord
fi
prog="sensord"
start() {
echo -n $"Starting $prog: "
if [ ! -f /var/lock/subsys/lm_sensors ]; then
echo -n "error lm_sensors service not started"
echo_failure
echo
exit 6
fi
daemon sensord \
${INTERVAL:+-i $INTERVAL} \
${LOG_INTERVAL:+-l $LOG_INTERVAL} \
${RRD_LOGFILE:+-r $RRD_LOGFILE} \
${RRD_INTERVAL:+-t $RRD_INTERVAL} \
-f daemon
RETVAL=$?
echo
[ $RETVAL -eq 0 ] && touch /var/lock/subsys/sensord
}
stop() {
echo -n $"Stopping $prog: "
killproc sensord
RETVAL=$?
echo
[ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/sensord
}
RETVAL=0
# See how we were called.
case "$1" in
start)
start
;;
stop)
stop
;;
status)
status sensord
RETVAL=$?
sensors
;;
restart|force-reload)
stop
start
;;
*)
msg_usage "$0 {start|stop|restart|force-reload|status}"
exit 3
esac
exit $RETVAL
--- NEW FILE sensord.sysconfig ---
# configuration for harware sensors monitoring daemon
# in intevrals use suffix "m" for minutes, "s" for seconds, "h" for hours
# 0 means turning facility off
# interval between scanning alarms
INTERVAL=1m
# interval between logging
LOG_INTERVAL=20m
# interval between RRD logging
# RRD_INTERVAL=1m
# RRD db location
# RRD_LOGFILE=/var/log/sensors.rrd
lm_sensors-2.10.0-kernel26.patch:
Index: lm_sensors-2.10.0-kernel26.patch
===================================================================
RCS file: /cvs/extras/rpms/lm_sensors/devel/lm_sensors-2.10.0-kernel26.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- lm_sensors-2.10.0-kernel26.patch 12 May 2006 14:57:29 -0000 1.1
+++ lm_sensors-2.10.0-kernel26.patch 10 Jul 2007 20:58:05 -0000 1.2
@@ -1,18 +1,3 @@
---- lm_sensors-2.10.0/prog/dump/isadump.c.kernel26 2006-05-12 15:26:05.000000000 +0200
-+++ lm_sensors-2.10.0/prog/dump/isadump.c 2006-05-12 16:45:44.000000000 +0200
-@@ -36,12 +36,7 @@
- #include "superio.h"
-
-
--/* To keep glibc2 happy */
--#if 0 && defined(__GLIBC__) && __GLIBC__ == 2 && __GLIBC_MINOR__ >= 0
- #include <sys/io.h>
--#else
--#include <asm/io.h>
--#endif
-
- #ifdef __powerpc__
- unsigned long isa_io_base = 0; /* XXX for now */
--- lm_sensors-2.10.0/prog/detect/sensors-detect.kernel26 2006-05-12 15:24:05.000000000 +0200
+++ lm_sensors-2.10.0/prog/detect/sensors-detect 2006-05-12 15:24:05.000000000 +0200
@@ -2034,6 +2034,8 @@
Index: lm_sensors.spec
===================================================================
RCS file: /cvs/extras/rpms/lm_sensors/devel/lm_sensors.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- lm_sensors.spec 17 Apr 2007 12:23:16 -0000 1.46
+++ lm_sensors.spec 10 Jul 2007 20:58:05 -0000 1.47
@@ -1,19 +1,18 @@
Name: lm_sensors
Version: 2.10.3
-Release: 2%{?dist}
+Release: 3%{?dist}
URL: http://secure.netroedge.com/~lm78/
Source: http://secure.netroedge.com/~lm78/archive/lm_sensors-%{version}.tar.gz
Source1: lm_sensors.sysconfig
-Source2: lm_sensors.init
-Patch1: lm_sensors-2.5.5-glibc22.patch
-Patch2: lm_sensors-2.8.3-redhat.patch
+# these 2 were taken from PLD-linux, Thanks!
+Source2: sensord.sysconfig
+Source3: sensord.init
Patch3: lm_sensors-2.8.0-utf8.patch
Patch4: lm_sensors-2.8.2-expr.patch
Patch5: lm_sensors-2.10.1-local.patch
-Patch6: lm_sensors-2.8.3-rpath.patch
Patch7: lm_sensors-2.8.7-udev.patch
Patch8: lm_sensors-2.10.0-kernel26.patch
-Summary: Hardware monitoring tools.
+Summary: Hardware monitoring tools
Group: Applications/System
License: GPL
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -22,7 +21,9 @@
%endif
Requires(preun): chkconfig
Requires(post): chkconfig
+Requires(post): /sbin/ldconfig
BuildRequires: kernel-headers >= 2.2.16, bison, libsysfs-devel, flex
+BuildRequires: rrdtool-devel
ExclusiveArch: alpha %{ix86} x86_64
%description
@@ -30,53 +31,85 @@
access and hardware monitoring. NOTE: this requires special support which
is not in standard 2.2-vintage kernels.
+
%package devel
-Summary: Development files for programs which will use lm_sensors.
+Summary: Development files for programs which will use lm_sensors
Group: Development/System
-Requires: lm_sensors = %{version}
+Requires: %{name} = %{version}-%{release}
%description devel
The lm_sensors-devel package includes a header files and libraries for use
when building applications that make use of sensor data.
+
+%package sensord
+Summary: Daemon that periodically logs sensor readings
+Group: System Environment/Daemons
+Requires: %{name} = %{version}-%{release}
+
+%description sensord
+Daemon that periodically logs sensor readings to syslog or a round-robin
+database, and warns of sensor alarms.
+
+
+%package eepromer
+Summary: Programs for reading / writing i2c / smbus eeproms
+Group: Applications/System
+
+%description eepromer
+Programs for reading / writing i2c / smbus eeproms. Notice that writing the
+eeproms in your system is very dangerous and is likely to render your system
+unusable. Do not install, let alone use this, unless you really, _really_ know
+what you are doing.
+
+
%prep
%setup -q
-%patch1 -p1 -b .glibc22
-%patch2 -p1 -b .redhat
%patch3 -p1 -b .utf8
%patch4 -p1 -b .expr
%patch5 -p1 -b .local
-%patch6 -p1 -b .rpath
%patch7 -p1 -b .udev
%patch8 -p1 -b .kernel26
+mv prog/init/README prog/init/README.initscripts
+chmod -x prog/init/fancontrol.init
+
%build
-mkdir -p kernel/include/linux
-ln -sf /usr/include/linux/* kernel/include/linux
export CFLAGS="%{optflags}"
-make prefix=/usr exec_prefix=/usr bindir=/usr/bin sbindir=/usr/sbin sysconfdir=/etc datadir=/usr/share includedir=/usr/include libdir=%{_libdir} libexecdir=/usr/libexec localstatedir=/var sharedstatedir=/usr/com mandir=/usr/share/man infodir=/usr/share/info user
+make PREFIX=%{_prefix} LIBDIR=%{_libdir} MANDIR=%{_mandir} EXLDFLAGS= \
+ PROG_EXTRA=sensord user
+pushd prog/eepromer
+make
+popd
-%install
-[ "$RPM_BUILD_ROOT" != "/" ] && rm -fr $RPM_BUILD_ROOT
-make prefix=/usr exec_prefix=/usr bindir=/usr/bin sbindir=/usr/sbin sysconfdir=/etc datadir=/usr/share includedir=/usr/include libdir=%{_libdir} 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*
-mv prog/init/README prog/init/README.initscripts
+%install
+rm -fr $RPM_BUILD_ROOT
+make PREFIX=%{_prefix} LIBDIR=%{_libdir} MANDIR=%{_mandir} PROG_EXTRA=sensord \
+ DESTDIR=$RPM_BUILD_ROOT user_install
+install -m 755 prog/eepromer/{eepromer,eeprom,eeprog} \
+ $RPM_BUILD_ROOT%{_sbindir}
+rm $RPM_BUILD_ROOT%{_libdir}/libsensors.a
# Remove userland kernel headers, belong in glibc-kernheaders.
rm -rf $RPM_BUILD_ROOT%{_includedir}/linux
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
-install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/lm_sensors
+install -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/lm_sensors
+install -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/sensord
mkdir -p $RPM_BUILD_ROOT%{_initrddir}
-install -m 0755 %{SOURCE2} $RPM_BUILD_ROOT%{_initrddir}/lm_sensors
+install -p -m 755 prog/init/lm_sensors.init \
+ $RPM_BUILD_ROOT%{_initrddir}/lm_sensors
+install -p -m 755 %{SOURCE3} $RPM_BUILD_ROOT%{_initrddir}/sensord
+
%clean
-[ "$RPM_BUILD_ROOT" != "/" ] && rm -fr $RPM_BUILD_ROOT
+rm -fr $RPM_BUILD_ROOT
+
%pre
if [ -f /var/lock/subsys/sensors ]; then
- mv -f /var/lock/subsys/sensors /var/lock/subsys/lm_sensors
+ mv -f /var/lock/subsys/sensors /var/lock/subsys/lm_sensors
fi
%post
@@ -91,24 +124,58 @@
fi
+%post sensord
+/sbin/chkconfig --add sensord
+
+%preun sensord
+if [ $1 = 0 ]; then
+ /sbin/chkconfig --del sensord
+fi
+
+
%files
%defattr(-,root,root)
-%doc BACKGROUND BUGS CHANGES CONTRIBUTORS COPYING doc INSTALL QUICKSTART README* TODO prog/init/*
+%doc BACKGROUND BUGS CHANGES CONTRIBUTORS COPYING doc README* TODO
+%doc prog/init/fancontrol.init prog/init/README.initscripts
%config(noreplace) %{_sysconfdir}/sensors.conf
%{_bindir}/*
%{_libdir}/*.so.*
%{_mandir}/man*/*
%{_sbindir}/*
-%config %{_initrddir}/lm_sensors
+%{_initrddir}/lm_sensors
%config(noreplace) %{_sysconfdir}/sysconfig/lm_sensors
+%exclude %{_sbindir}/sensord
+%exclude %{_sbindir}/eepro*
%files devel
%defattr(-,root,root)
%{_includedir}/sensors
-%{_libdir}/lib*.a
%{_libdir}/lib*.so
+%files sensord
+%defattr(-,root,root,-)
+%doc prog/sensord/README
+%{_sbindir}/sensord
+%{_initrddir}/sensord
+%config(noreplace) %{_sysconfdir}/sysconfig/sensord
+
+%files eepromer
+%defattr(-,root,root,-)
+%doc prog/eepromer/README*
+%{_sbindir}/eepro*
+
+
%changelog
+* Mon Jul 9 2007 Hans de Goede <j.w.r.degoede at hhs.nl> - 2.10.3-3
+- Remove no longer needed patches 1, 2 & 6
+- Various specfile cleanups to match the Fedora packaging guidelines
+ this fixes bz 238787 amongst other things
+- Use lm_sensors provided initscript instead of our own private one, this
+ stops the sometimes unnecessary loading of i2c-dev
+- No longer ship a static version of the library in -devel
+- Compile sensord and eepromer extra programs and put each in its own
+ subpackage (bz 236904)
+
* Tue Apr 17 2007 Phil Knirsch <pknirsch at redhat.com> - 2.10.3-2
- Fixed one more problem with sensors-detect (#215984)
--- lm_sensors-2.5.5-glibc22.patch DELETED ---
--- lm_sensors-2.8.3-redhat.patch DELETED ---
--- lm_sensors-2.8.3-rpath.patch DELETED ---
--- lm_sensors.init DELETED ---
More information about the scm-commits
mailing list