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

lm_sensors-3.0.0-sensord-fix-rrd-support.patch

@@ -1,17 +0,0 @@
-Index: lm-sensors-3.0.0/prog/sensord/rrd.c
-===================================================================
---- prog/sensord/rrd.c (revision 4849)
-+++ prog/sensord/rrd.c (revision 5069)
-@@ -156,10 +156,10 @@
- 
-         for (index0 = 0; (ret == 0) && (num < MAX_RRD_SENSORS) && features[index0].format; ++ index0) {
-           const FeatureDescriptor *feature = features + index0;
--          const char *rawLabel = features->feature->name;
-+          const char *rawLabel = feature->feature->name;
-           char *label = NULL;
- 
--          if (!(label = sensors_get_label (chip, features->feature))) {
-+          if (!(label = sensors_get_label (chip, feature->feature))) {
-             sensorLog (LOG_ERR, "Error getting sensor label: %s/%s", chip->prefix, rawLabel);
-             ret = -1;
-           } else  {

lm_sensors-3.0.0-sensors.conf-fix-voltage-references.patch

@@ -1,35 +0,0 @@
---- etc/sensors.conf.eg (revision 4980)
-+++ etc/sensors.conf.eg (revision 5076)
-@@ -938,5 +938,5 @@
- 
-   compute in2 (197/47)*@  ,  @/(197/47)
--  compute in4 (5*@)-(4*in0) , (@+4*in0)/5
-+  compute in4 (5*@)-(4*in0_input) , (@+4*in0_input)/5
- 
- #  set in0_min 4.8
-@@ -988,6 +988,6 @@
-     compute in3 (2.8/1.9) * @,            @ * 1.9/2.8
-     compute in4 (160/30.1 + 1) * @,       @ / (160/30.1 + 1)
--    compute in5 (160/35.7)*(@ - in0) + @, (@ + in0 * 160/35.7)/ (1 + 160/35.7)
--    compute in6 (36/16.2)*(@ - in0) + @,  (@ + in0 * 36/16.2) / (1 + 36/16.2)
-+    compute in5 (160/35.7)*(@ - in0_input) + @, (@ + in0_input * 160/35.7)/ (1 + 160/35.7)
-+    compute in6 (36/16.2)*(@ - in0_input) + @,  (@ + in0_input * 36/16.2) / (1 + 36/16.2)
- 
- #    set in0_min 5 * 0.95
-@@ -2065,10 +2065,10 @@
- # default). If not, use 3.3 instead, but you lose accuracy.
- 
--   compute temp4  3435 / (` (1 / (1 - @ / in10) - 1) + 3435 / 298.15) - 273.15, \
--                  in10 * (1 - 1 / (1 + (^ (3435 / (273.15 + @) - 3435 / 298.15))))
--   compute temp5  3435 / (` (1 / (1 - @ / in10) - 1) + 3435 / 298.15) - 273.15, \
--                  in10 * (1 - 1 / (1 + (^ (3435 / (273.15 + @) - 3435 / 298.15))))
--   compute temp6  3435 / (` (1 / (1 - @ / in10) - 1) + 3435 / 298.15) - 273.15, \
--                  in10 * (1 - 1 / (1 + (^ (3435 / (273.15 + @) - 3435 / 298.15))))
-+   compute temp4  3435 / (` (1 / (1 - @ / in10_input) - 1) + 3435 / 298.15) - 273.15, \
-+                  in10_input * (1 - 1 / (1 + (^ (3435 / (273.15 + @) - 3435 / 298.15))))
-+   compute temp5  3435 / (` (1 / (1 - @ / in10_input) - 1) + 3435 / 298.15) - 273.15, \
-+                  in10_input * (1 - 1 / (1 + (^ (3435 / (273.15 + @) - 3435 / 298.15))))
-+   compute temp6  3435 / (` (1 / (1 - @ / in10_input) - 1) + 3435 / 298.15) - 273.15, \
-+                  in10_input * (1 - 1 / (1 + (^ (3435 / (273.15 + @) - 3435 / 298.15))))
- 
- #   set temp4_min    0

lm_sensors-3.0.0-sysconfig_metadata.patch

@@ -2,7 +2,7 @@ Index: prog/detect/sensors-detect
 ===================================================================
 --- prog/detect/sensors-detect.orig
 +++ prog/detect/sensors-detect
-@@ -5898,6 +5898,12 @@ sub main
+@@ -5892,6 +5892,12 @@ sub main
      open(local *SYSCONFIG, ">/etc/sysconfig/lm_sensors")
        or die "Sorry, can't create /etc/sysconfig/lm_sensors ($!)";
      print SYSCONFIG <<'EOT';

lm_sensors-3.0.0.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e6a954e0050ddeadfbb02f10fead326ecc9b7b9719f2da5a337af97548a7c137
-size 185107

lm_sensors-3.0.1.dif

@@ -2,7 +2,7 @@ Index: Makefile
 ===================================================================
 --- Makefile.orig
 +++ Makefile
-@@ -133,7 +133,7 @@ ifeq ($(DEBUG),1)
+@@ -136,7 +136,7 @@ ifeq ($(DEBUG),1)
  ALL_CPPFLAGS += -DDEBUG
  ALL_CFLAGS += -O -g
  else
@@ -11,19 +11,6 @@ Index: Makefile
  endif
  
  ifeq ($(WARN),1)
-Index: prog/detect/sensors-detect
-===================================================================
---- prog/detect/sensors-detect.orig
-+++ prog/detect/sensors-detect
-@@ -5945,6 +5945,8 @@ EOT
-     print "Copy prog/init/lm_sensors.init to /etc/init.d/lm_sensors\n".
-           "for initialization at boot time.\n"
-       unless -f "/etc/init.d/lm_sensors";
-+    system("/sbin/insserv", "/etc/init.d/lm_sensors")
-+      if -f "/etc/init.d/lm_sensors";
-   }
- }
- 
 Index: prog/init/README
 ===================================================================
 --- prog/init/README.orig

lm_sensors-3.0.1.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f47f7e46f604054ec32b899a04d3d450a37de533e962c763c5d7068b31b9bc23
+size 186183

sensors.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Mon Feb  4 10:36:48 CET 2008 - jdelvare@suse.de
+
+- Update to lm_sensors 3.0.1
+  * Library no longer depends on libsysfs
+  * Library initialization is much faster
+  * Better service integration in sensors-detect
+
 -------------------------------------------------------------------
 Sat Jan 19 11:03:05 CET 2008 - jdelvare@suse.de
 

sensors.spec

@@ -1,5 +1,5 @@
 #
-# spec file for package sensors (Version 3.0.0)
+# spec file for package sensors (Version 3.0.1)
 #
 # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
@@ -11,21 +11,19 @@
 # norootforbuild
 
 Name:           sensors
-BuildRequires:  bison flex rrdtool-devel sysfsutils
+BuildRequires:  bison flex rrdtool-devel
 Url:            http://www.lm-sensors.org/
-Version:        3.0.0
+Version:        3.0.1
-Release:        18
+Release:        1
 Summary:        Hardware health monitoring for Linux
 License:        GPL v2 or later
 Group:          System/Monitoring
 Requires:       modules
 AutoReqProv:    on
-Source0:        lm_sensors-3.0.0.tar.bz2
+Source0:        lm_sensors-3.0.1.tar.bz2
-Patch:          lm_sensors-3.0.0.dif
+Patch:          lm_sensors-3.0.1.dif
 Patch1:         lm_sensors-3.0.0-sensord-separate.dif
 Patch2:         lm_sensors-3.0.0-sysconfig_metadata.patch
-Patch3:         lm_sensors-3.0.0-sensord-fix-rrd-support.patch
-Patch4:         lm_sensors-3.0.0-sensors.conf-fix-voltage-references.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 ExcludeArch:    s390 s390x
 
@@ -96,7 +94,6 @@ Authors:
 Summary:        Hardware health monitoring library
 Group:          Development/Libraries/C and C++
 Requires:       libsensors4 = %{version}
-Requires:       sysfsutils
 Provides:       sensors:/usr/include/sensors/sensors.h
 AutoReqProv:    on
 Conflicts:      libsensors3-devel
@@ -124,8 +121,6 @@ Authors:
 %patch
 %patch1
 %patch2
-%patch3
-%patch4
 
 %build
 RPM_OPT_FLAGS="$RPM_OPT_FLAGS"
@@ -201,6 +196,11 @@ rm -f $RPM_BUILD_ROOT/usr/src/linux/include/sensors.h
 %doc /usr/share/man/man3/*.3.gz
 
 %changelog
+* Mon Feb 04 2008 jdelvare@suse.de
+- Update to lm_sensors 3.0.1
+  * Library no longer depends on libsysfs
+  * Library initialization is much faster
+  * Better service integration in sensors-detect
 * 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.