OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/sensors?expand=0&rev=19

lm_sensors-2.10.5-sensord-separate.dif

@@ -0,0 +1,13 @@
+Index: lm_sensors-2.10.5/doc/progs
+===================================================================
+--- doc/progs
++++ doc/progs
+@@ -100,6 +100,8 @@ see http://www.lm-sensors.org/wiki/Usefu
+   the sensors hardware to syslog, and to alert (using syslog level ALERT)
+   when a sensor alarm is signalled; for example, if a fan fails, a temperature
+   limit is exceeded, etc.
++  In Suse Linux, this daemon is packaged separately. You have to explicitly
++  install the package named "sensord" if you want it.
+ 
+ * prog/sensors/sensors (written in C, installed by `make install')
+   This pretty-prints the information provided by the modules. It is a normal

sensors.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Oct 31 14:42:04 CET 2007 - jdelvare@suse.de
+
+- Package sensord separately.
+- Don't include redundant or outdated initalization scripts in
+  the documentation tree.
+
 -------------------------------------------------------------------
 Sun Oct 28 16:16:39 CET 2007 - jdelvare@suse.de
 

sensors.spec

@@ -14,7 +14,7 @@ Name:           sensors
 BuildRequires:  bison flex rrdtool-devel sysfsutils
 Url:            http://www.lm-sensors.org/
 Version:        2.10.5
-Release:        1
+Release:        3
 Summary:        Hardware health monitoring for Linux
 License:        GPL v2 or later
 Group:          System/Monitoring
@@ -25,6 +25,7 @@ Source1:        README.SuSE
 Patch:          lm_sensors-2.10.5.dif
 Patch1:         lm_sensors-drop-i2c-tools.dif
 Patch2:         lm_sensors-2.7.0-kernelheaders.dif
+Patch3:         lm_sensors-2.10.5-sensord-separate.dif
 Patch4:         lm_sensors-2.10.4-sysconfig_metadata.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 ExcludeArch:    s390 s390x
@@ -50,11 +51,30 @@ Authors:
     Frodo Looijaard    <frodol@dds.nl>
     Geert Uytterhoeven <geert@linux-m68k.org>
 
+%package -n sensord
+Summary:        Hardware health monitoring daemon
+Group:          System/Monitoring
+AutoReqProv:    on
+
+%description -n sensord
+sensord is a daemon that can be used to periodically log sensor
+readings from hardware health-monitoring chips to the system logs or a
+round-robin database (RRD) and to alert when a sensor alarm is
+signalled; for example, if a fan fails, a temperature limit is
+exceeded, etc.
+
+
+
+Authors:
+--------
+    Merlin Hughes <merlin@merlin.org>
+
 %prep
 %setup -q -n lm_sensors-%{version} 
 %patch
 %patch1
 %patch2
+%patch3
 %patch4
 
 %build
@@ -76,10 +96,6 @@ RPM_OPT_FLAGS="$RPM_OPT_FLAGS"
 	chmod -R u+rwX,g+rX,o+rX	$RPM_BUILD_ROOT/%{_docdir}/sensors/
     cd ../
     cp ${RPM_SOURCE_DIR}/README.SuSE	$RPM_BUILD_ROOT/%{_docdir}/sensors/
-    mkdir -p $RPM_BUILD_ROOT/%{_docdir}/sensors/prog/init
-    install -m 0755 prog/init/lm_sensors.init.suse	$RPM_BUILD_ROOT/%{_docdir}/sensors/prog/init/
-    install -m 0755 prog/init/sensord.init		$RPM_BUILD_ROOT/%{_docdir}/sensors/prog/init/
-    install -m 0644 prog/init/README			$RPM_BUILD_ROOT/%{_docdir}/sensors/prog/init/
     chmod 0755 $RPM_BUILD_ROOT/%{_libdir}/libsensors.so.*
     mkdir -p $RPM_BUILD_ROOT/etc/init.d
     install -m 0755 prog/init/lm_sensors.init.suse	$RPM_BUILD_ROOT/etc/init.d/lm_sensors
@@ -98,7 +114,12 @@ rm -f $RPM_BUILD_ROOT/usr/src/linux/include/sensors.h
 %config(noreplace) /etc/sensors.conf
 /etc/init.d/lm_sensors
 /usr/bin/*
-/usr/sbin/*
+/usr/sbin/fancontrol
+/usr/sbin/fancontrol.pl
+/usr/sbin/isadump
+/usr/sbin/isaset
+/usr/sbin/pwmconfig
+/usr/sbin/sensors-detect
 %doc %{_docdir}/sensors/
 /usr/include/sensors/
 %{_libdir}/libsensors.a
@@ -106,8 +127,21 @@ rm -f $RPM_BUILD_ROOT/usr/src/linux/include/sensors.h
 %doc /usr/share/man/man1/*.1.gz
 %doc /usr/share/man/man3/*.3.gz
 %doc /usr/share/man/man5/*.5.gz
-%doc /usr/share/man/man8/*.8.gz
+%doc /usr/share/man/man8/fancontrol.8.gz
+%doc /usr/share/man/man8/isadump.8.gz
+%doc /usr/share/man/man8/isaset.8.gz
+%doc /usr/share/man/man8/pwmconfig.8.gz
+%doc /usr/share/man/man8/sensors-detect.8.gz
+
+%files -n sensord
+%defattr(-,root,root)
+/usr/sbin/sensord
+%doc /usr/share/man/man8/sensord.8.gz
 %changelog
+* 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
 - Update to lm_sensors version 2.10.5
   * Support for the SMSC SCH3112, SCH3114, SCH3116