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

lm_sensors-drop-i2c-tools.dif

@@ -0,0 +1,147 @@
+Index: Makefile
+===================================================================
+--- Makefile.orig
++++ Makefile
+@@ -185,8 +185,11 @@ endif
+ endif
+ endif
+ SRCDIRS += kernel/include
+-SRCDIRS += lib prog/detect prog/dump prog/eeprom prog/pwm \
+-           prog/sensors prog/xeon ${PROG_EXTRA:%=prog/%} etc
++SRCDIRS += lib prog/detect prog/pwm \
++           prog/sensors ${PROG_EXTRA:%=prog/%} etc
++ifneq (,$(findstring $(MACHINE), i386 i486 i586 i686 x86_64))
++SRCDIRS += prog/dump
++endif
+ SRCDIRS += lib/test
+ 
+ # Some often-used commands with default options
+Index: prog/detect/Module.mk
+===================================================================
+--- prog/detect/Module.mk.orig
++++ prog/detect/Module.mk
+@@ -22,14 +22,13 @@ MODULE_DIR := prog/detect
+ PROGDETECTDIR := $(MODULE_DIR)
+ 
+ PROGDETECTMAN8DIR := $(MANDIR)/man8
+-PROGDETECTMAN8FILES := $(MODULE_DIR)/i2cdetect.8 $(MODULE_DIR)/sensors-detect.8
++PROGDETECTMAN8FILES := $(MODULE_DIR)/sensors-detect.8
+ 
+ # Regrettably, even 'simply expanded variables' will not put their currently
+ # defined value verbatim into the command-list of rules...
+-PROGDETECTTARGETS := $(MODULE_DIR)/i2cdetect
+-PROGDETECTSOURCES := $(MODULE_DIR)/i2cdetect.c
+-PROGDETECTSBININSTALL := $(MODULE_DIR)/sensors-detect \
+-                         $(MODULE_DIR)/i2cdetect
++PROGDETECTTARGETS := 
++PROGDETECTSOURCES := 
++PROGDETECTSBININSTALL := $(MODULE_DIR)/sensors-detect
+ 
+ # Include all dependency files. We use '.rd' to indicate this will create
+ # executables.
+Index: prog/dump/Module.mk
+===================================================================
+--- prog/dump/Module.mk.orig
++++ prog/dump/Module.mk
+@@ -22,18 +22,13 @@ MODULE_DIR := prog/dump
+ PROGDUMPDIR := $(MODULE_DIR)
+ 
+ PROGDUMPMAN8DIR := $(MANDIR)/man8
+-PROGDUMPMAN8FILES := $(MODULE_DIR)/i2cdump.8 $(MODULE_DIR)/i2cset.8 \
+-		     $(MODULE_DIR)/i2cget.8
++PROGDUMPMAN8FILES := 
+ 
+ # Regrettably, even 'simply expanded variables' will not put their currently
+ # defined value verbatim into the command-list of rules...
+-PROGDUMPTARGETS := $(MODULE_DIR)/i2cdump $(MODULE_DIR)/i2cset \
+-		   $(MODULE_DIR)/i2cget
+-PROGDUMPSOURCES := $(MODULE_DIR)/i2cdump.c $(MODULE_DIR)/i2cset.c \
+-		   $(MODULE_DIR)/i2cget.c $(MODULE_DIR)/i2cbusses.c \
+-		   $(MODULE_DIR)/util.c
+-PROGDUMPBININSTALL := $(MODULE_DIR)/i2cdump $(MODULE_DIR)/i2cset \
+-		      $(MODULE_DIR)/i2cget
++PROGDUMPTARGETS := 
++PROGDUMPSOURCES := 
++PROGDUMPBININSTALL :=
+ 
+ # Only build isadump and isaset on x86 machines.
+ ifneq (,$(findstring $(MACHINE), i386 i486 i586 i686 x86_64))
+Index: doc/progs
+===================================================================
+--- doc/progs.orig
++++ doc/progs
+@@ -18,13 +18,6 @@ see useful_addresses.html.
+ * prog/daemon/healthd.sh (written in bash, not installed)
+   An example of a very simple hardware health monitoring daemon.
+ 
+-* prog/detect/i2cdetect (written in C, installed by 'make install')
+-  This program scans your complete I2C or SMBus adapter for connected devices.
+-  Syntax:
+-    i2cdetect 0
+-  Here the '0' stands for the bus number (run "i2cdetect -l"
+-  to list all installed busses).
+-
+ * prog/detect/sensors-detect (written in Perl, installed by 'make install')
+   This program tries to detect the available SMBus adapters and the chips
+   connected to them, as well as Super-I/O and misc chips. It also generates
+@@ -43,40 +36,12 @@ see useful_addresses.html.
+   all module information and outputs insmod parameter information. Syntax:
+     ./doc-insmod.pl DRIVER
+ 
+-* prog/dump/i2cdump (written in C, installed by 'make install')
+-  This program dumps the registers of an I2C device.
+-  Usual syntax:
+-    i2cdump 0 0x4c b
+-  Here the '0' stands for the bus number (run i2cdump with no arguments 
+-  to list all installed busses).
+-  '0x49' is the device address, and 'b' or 'w' stands for byte
+-  or word data.
+-
+-* prog/dump/i2cset (written in C, installed by 'make install')
+-  prog/dump/i2cget (written in C, installed by 'make install')
+-  These programs are used to write to or read from a register of an
+-  I2C device. Usual syntax:
+-    i2cset bus device address data
+-    i2cget bus device address
+-
+ * prog/dump/isadump (written in C, installed by 'make install')
+   This program dumps the registers of ISA or Super-I/O chips.
+   Usual syntax:
+      isadump 0x295 0x296
+      isadump -k 0x55 0x2e 0x2f
+ 
+-* prog/eeprom/decode-dimms.pl (perl script, installed by 'make install')
+-  This program decodes the information found in a memory module SPD EEPROM.
+-
+-* prog/eeprom/decode-vaio.pl (perl script, installed by 'make install')
+-  This program decodes the information in a Sony Vaio laptop
+-  identification eeprom at 0x57.
+-
+-* prog/eeprom/ddcmon (perl script, installed by 'make install')
+-  prog/eeprom/decode-edid.pl (perl script, installed by 'make install')
+-  These programs decode the information found in a display EEPROM. They
+-  require a bus driver for your video adapter, for DDC access to the display.
+-
+ * prog/eepromer/eepromer (written in C, not installed)
+   This program reads and writes eeproms.
+   Danger: Do not use this to write your DRAM DIMM eeproms.
+@@ -145,6 +110,3 @@ see useful_addresses.html.
+ * prog/tellerstats/gather.sh, tellerstats.sh (written in bash, not installed)
+   These scripts gather sensors data and graph the data for web pages.
+   See prog/tellerstats/README for more information.
+-
+-* prog/xeon/decode-xeon.pl (written in Perl, installed by 'make install')
+-  ID ROM data decoding for Xeon processors.
+Index: kernel/include/Module.mk
+===================================================================
+--- kernel/include/Module.mk.orig
++++ kernel/include/Module.mk
+@@ -22,7 +22,7 @@ MODULE_DIR := kernel/include
+ KERNELINCLUDEDIR := $(MODULE_DIR)
+ KERNELCHIPSDIR := kernel/chips
+ 
+-KERNELINCLUDEFILES := $(MODULE_DIR)/i2c-dev.h $(MODULE_DIR)/sensors.h
++KERNELINCLUDEFILES := $(MODULE_DIR)/sensors.h
+ 
+ $(KERNELINCLUDEDIR)/sensors.h: $(KERNELINCLUDEDIR)/sensors.h.template
+ 	cat $@.template > $@

lm_sensors-no-xeon-script.dif

@@ -1,24 +0,0 @@
-Index: Makefile
-===================================================================
---- Makefile.orig
-+++ Makefile
-@@ -186,7 +186,7 @@ endif
- endif
- SRCDIRS += kernel/include
- SRCDIRS += lib prog/detect prog/dump prog/eeprom prog/pwm \
--           prog/sensors prog/xeon ${PROG_EXTRA:%=prog/%} etc
-+           prog/sensors ${PROG_EXTRA:%=prog/%} etc
- SRCDIRS += lib/test
- 
- # Some often-used commands with default options
-Index: doc/progs
-===================================================================
---- doc/progs.orig
-+++ doc/progs
-@@ -146,5 +146,5 @@ see useful_addresses.html.
-   These scripts gather sensors data and graph the data for web pages.
-   See prog/tellerstats/README for more information.
- 
--* prog/xeon/decode-xeon.pl (written in Perl, installed by 'make install')
-+* prog/xeon/decode-xeon.pl (written in Perl, not installed)
-   ID ROM data decoding for Xeon processors.

sensors.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Oct 15 13:39:55 CEST 2007 - jdelvare@suse.de
+
+- Do not include i2c tools, they have their own package now.
+
 -------------------------------------------------------------------
 Mon Sep  3 17:41:30 CEST 2007 - jdelvare@suse.de
 

sensors.spec

@@ -11,19 +11,19 @@
 # norootforbuild
 
 Name:           sensors
-BuildRequires:  bison flex rrdtool-devel sysfsutils udev
+BuildRequires:  bison flex rrdtool-devel sysfsutils
-URL:            http://www.lm-sensors.org/
+Url:            http://www.lm-sensors.org/
 Version:        2.10.4
-Release:        14
+Release:        28
 Summary:        Hardware health monitoring for Linux
 License:        GPL v2 or later
 Group:          System/Monitoring
-Requires:       modules udev
+Requires:       modules
-Autoreqprov:    on
+AutoReqProv:    on
 Source0:        lm_sensors-2.10.4.tar.bz2
 Source1:        README.SuSE
 Patch:          lm_sensors-2.10.4.dif
-Patch1:         lm_sensors-no-xeon-script.dif
+Patch1:         lm_sensors-drop-i2c-tools.dif
 Patch2:         lm_sensors-2.7.0-kernelheaders.dif
 Patch3:         lm_sensors-dont-probe-i2c-isa.dif
 Patch4:         lm_sensors-2.10.4-sysconfig_metadata.patch
@@ -87,9 +87,7 @@ RPM_OPT_FLAGS="$RPM_OPT_FLAGS"
     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
 # cleanup
-rm -f $RPM_BUILD_ROOT/usr/src/linux/include/i2c-dev.h
 rm -f $RPM_BUILD_ROOT/usr/src/linux/include/sensors.h
-rm -f $RPM_BUILD_ROOT/usr/bin/decode-edid.pl
 
 %post
 %run_ldconfig
@@ -102,7 +100,6 @@ rm -f $RPM_BUILD_ROOT/usr/bin/decode-edid.pl
 %defattr(-,root,root)
 %config(noreplace) /etc/sensors.conf
 /etc/init.d/lm_sensors
-%attr(660, root, root) %dev(c, 89, 0) /lib/udev/devices/i2c-0
 /usr/bin/*
 /usr/sbin/*
 %doc %{_docdir}/sensors/
@@ -113,8 +110,9 @@ rm -f $RPM_BUILD_ROOT/usr/bin/decode-edid.pl
 %doc /usr/share/man/man3/*.3.gz
 %doc /usr/share/man/man5/*.5.gz
 %doc /usr/share/man/man8/*.8.gz
-
 %changelog
+* 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
 - Run ldconfig in %%post and %%postun. rpmlint was complaining
   that this was missing.