diff --git a/lm_sensors-3.5.0-libsensors-fix-soname.patch b/lm_sensors-3.5.0-libsensors-fix-soname.patch new file mode 100644 index 0000000..561f95d --- /dev/null +++ b/lm_sensors-3.5.0-libsensors-fix-soname.patch @@ -0,0 +1,49 @@ +From: Jean Delvare +Subject: libsensors: Undo excessive API version bump + +The new library is compatible with previous versions, it only has +added symbols, no changes nor removals. So the major version number +shall stay the same. + +Signed-off-by: Jean Delvare +--- + doc/libsensors-API.txt | 2 +- + lib/Module.mk | 4 ++-- + lib/sensors.h | 2 +- + 3 files changed, 4 insertions(+), 4 deletions(-) + +--- lm-sensors-3-5-0.orig/doc/libsensors-API.txt 2018-11-23 18:05:48.000000000 +0100 ++++ lm-sensors-3-5-0/doc/libsensors-API.txt 2018-12-16 13:17:38.849215990 +0100 +@@ -6,7 +6,7 @@ over time. This document summarizes thes + authors can quickly figure out how to test for the availability of a + given new feature. + +-0x500 lm-sensors 3.5.0 ++0x450 lm-sensors 3.5.0 + * Added support for power min, lcrit, min_alarm and lcrit_alarm + enum sensors_subfeature_type SENSORS_SUBFEATURE_POWER_MIN + enum sensors_subfeature_type SENSORS_SUBFEATURE_POWER_LCRIT +--- lm-sensors-3-5-0.orig/lib/Module.mk 2018-11-23 18:05:48.000000000 +0100 ++++ lm-sensors-3-5-0/lib/Module.mk 2018-12-16 13:17:00.255735414 +0100 +@@ -32,8 +32,8 @@ LIBMAN5FILES := $(MODULE_DIR)/sensors.co + # The library soname (major number) must be changed if and only if the interface is + # changed in a backward incompatible way. The interface is defined by + # the public header files - in this case they are error.h and sensors.h. +-LIBMAINVER := 5 +-LIBMINORVER := 0.0 ++LIBMAINVER := 4 ++LIBMINORVER := 5.0 + LIBVER := $(LIBMAINVER).$(LIBMINORVER) + + # The static lib name, the shared lib name, and the internal ('so') name of +--- lm-sensors-3-5-0.orig/lib/sensors.h 2018-11-23 18:05:48.000000000 +0100 ++++ lm-sensors-3-5-0/lib/sensors.h 2018-12-16 13:16:45.113546854 +0100 +@@ -31,7 +31,7 @@ + when the API or ABI breaks), the third digit is incremented to track small + API additions like new flags / enum values. The second digit is for tracking + larger additions like new methods. */ +-#define SENSORS_API_VERSION 0x500 ++#define SENSORS_API_VERSION 0x450 + + #define SENSORS_CHIP_NAME_PREFIX_ANY NULL + #define SENSORS_CHIP_NAME_ADDR_ANY (-1) diff --git a/sensors.changes b/sensors.changes index 955616c..f92a11a 100644 --- a/sensors.changes +++ b/sensors.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sun Dec 16 12:19:48 UTC 2018 - jdelvare@suse.com + +- lm_sensors-3.5.0-libsensors-fix-soname.patch: Undo excessive + libsensors version bump. + ------------------------------------------------------------------- Sat Nov 24 01:08:57 UTC 2018 - malcolmlewis@opensuse.org diff --git a/sensors.spec b/sensors.spec index 4a554b6..be76ff8 100644 --- a/sensors.spec +++ b/sensors.spec @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via https://bugs.opensuse.org/ +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -44,6 +44,7 @@ Patch6: lm_sensors-3.4.0-sensord-service-extra-args.patch Patch7: lm_sensors-3.4.0-sensors-detect-add-ftsteutates-support.patch #PATCH-BUGFIX-UPSTREAM sensors-detect on ppc Patch8: lm_sensors-3.4.0-sensors-detect-ppc64le.patch +Patch9: lm_sensors-3.5.0-libsensors-fix-soname.patch BuildRequires: bison BuildRequires: flex BuildRequires: rrdtool-devel @@ -113,6 +114,7 @@ sense to the user. %patch6 -p1 %patch7 -p1 %patch8 -p1 +%patch9 -p1 %build RPM_OPT_FLAGS="%{optflags}"