From 1f63a58c157f78d0cbde96b254c39dbd1120808a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Lyson=C4=9Bk?= <olysonek@redhat.com>
Date: Wed, 2 Jan 2019 11:01:11 +0100
Subject: [PATCH] New version

Resolves: rhbz#1653259
---
 .gitignore                                |  1 +
 0001-Revert-unnecessary-soname-bump.patch | 33 +++++++++++++++++++++++
 lm_sensors.spec                           | 27 ++++++++++---------
 sources                                   |  2 +-
 4 files changed, 50 insertions(+), 13 deletions(-)
 create mode 100644 0001-Revert-unnecessary-soname-bump.patch

diff --git a/.gitignore b/.gitignore
index a7ba6ba..6b62278 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@ lm_sensors-3.1.2.tar.bz2
 /lm_sensors-3.3.5.tar.bz2
 /lm_sensors-3.4.0.tar.bz2
 /lm-sensors-70f7e0848410b9ca4dde7abff669bbbecbf137e0.tar.gz
+/lm-sensors-3-5-0.tar.gz
diff --git a/0001-Revert-unnecessary-soname-bump.patch b/0001-Revert-unnecessary-soname-bump.patch
new file mode 100644
index 0000000..b5d9cc9
--- /dev/null
+++ b/0001-Revert-unnecessary-soname-bump.patch
@@ -0,0 +1,33 @@
+From bc827e6d45f31f20a4f6d27bfc41747900faf60c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ond=C5=99ej=20Lyson=C4=9Bk?= <olysonek@redhat.com>
+Date: Wed, 2 Jan 2019 12:38:31 +0100
+Subject: [PATCH] Revert unnecessary soname bump
+
+The soname bump in lm-sensors 3.5.0 was unnecessary - there was no
+API/ABI change. I'm reverting it so that we can update lm-sensors
+in released Fedoras as well as Rawhide.
+
+Related:
+https://marc.info/?l=lm-sensors&m=154515276523720&w=2
+---
+ lib/Module.mk | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/lib/Module.mk b/lib/Module.mk
+index 7732242..299b7d3 100644
+--- a/lib/Module.mk
++++ b/lib/Module.mk
+@@ -32,8 +32,8 @@ LIBMAN5FILES := $(MODULE_DIR)/sensors.conf.5
+ # 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
+-- 
+2.17.2
+
diff --git a/lm_sensors.spec b/lm_sensors.spec
index 60989c5..e0456c3 100644
--- a/lm_sensors.spec
+++ b/lm_sensors.spec
@@ -1,16 +1,11 @@
-%global commit 70f7e0848410b9ca4dde7abff669bbbecbf137e0
-%global shortcommit %(c=%{commit}; echo ${c:0:7})
-%global year 2018
-%global month 05
-%global day 22
-%global date %{year}%{month}%{day}
-
 Name: lm_sensors
-Version: 3.4.0
-Release: 18.%{date}git%{shortcommit}%{?dist}
+Version: 3.5.0
+Release: 1%{?dist}
 Summary: Hardware monitoring tools
 Group: Applications/System
 
+%define upstream_version %(echo %{version} | sed -e 's/\\./-/g')
+
 # Some man pages are licensed Verbatim (lib/sensors.conf.5,
 # prog/sensors/sensors.1). Files from dist-git are licensed
 # MIT (according to the Fedora Project Contributor Agreement
@@ -18,9 +13,9 @@ Group: Applications/System
 # The rest is GPLv2+.
 License: GPLv2+ and Verbatim and MIT
 
-URL: http://github.com/groeck/lm-sensors/
+URL: http://github.com/lm-sensors/lm-sensors/
 
-Source0: http://github.com/groeck/lm-sensors/archive/%{commit}/lm-sensors-%{commit}.tar.gz
+Source0: https://github.com/lm-sensors/lm-sensors/archive/V%{upstream_version}/lm-sensors-%{upstream_version}.tar.gz
 Source1: lm_sensors.sysconfig
 # This one was taken from PLD-linux, Thanks!
 Source2: sensord.sysconfig
@@ -30,6 +25,9 @@ Source5: sensord.service
 Source6: sensord-service-wrapper
 Source7: lm_sensors.service
 
+# Downstream-only:
+Patch0: 0001-Revert-unnecessary-soname-bump.patch
+
 Requires: /usr/sbin/modprobe
 %ifarch %{ix86} x86_64
 Requires: /usr/sbin/dmidecode
@@ -81,7 +79,8 @@ database, and warns of sensor alarms.
 
 
 %prep
-%setup -q -n lm-sensors-%{commit}
+%setup -q -n lm-sensors-%{upstream_version}
+%patch0 -p1
 
 # Remove currently unused files to make sure we've got the license right
 rm -f prog/init/sysconfig-lm_sensors-convert prog/hotplug/unhide_ICH_SMBus
@@ -203,6 +202,10 @@ fi
 
 
 %changelog
+* Wed Jan 02 2019 Ondřej Lysoněk <olysonek@redhat.com> - 3.5.0-1
+- New version
+- Resolves: rhbz#1653259
+
 * Fri Sep 28 2018 Ondřej Lysoněk <olysonek@redhat.com> - 3.4.0-18.20180522git70f7e08
 - Drop unneeded build dependency on libsysfs-devel
 
diff --git a/sources b/sources
index 9f385a1..1d431f5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (lm-sensors-70f7e0848410b9ca4dde7abff669bbbecbf137e0.tar.gz) = 90a17af6f70e7588b2214a8beb69e51d96a2fe09be6fc19c0fb1d2e8c4c911cd5dc0487637dc7aa5e45cf92382a11d32344487a682e88bd1918b73986954c69d
+SHA512 (lm-sensors-3-5-0.tar.gz) = bea9b2ac01bc43622cafdce0b00ac3bb8cb2d818449c8b332ab51e7ad0022b66bcbf6ca1e99c8500bdc6092c5c1ef985bfe7cff05dbcf015bd3ccf58c00a72e1