Merged update from upstream sources

This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/thermald.git#48446fa90c4a42cf08ebbcb5f06c4e68ada3ff65

0001-Fix-path-for-Lenovo-kill-switch-heuristic.patch

@@ -1,31 +0,0 @@
-From 8c283e472fa3947ec66e3560599cdce378ce62a1 Mon Sep 17 00:00:00 2001
-From: Benjamin Berg <bberg@redhat.com>
-Date: Tue, 1 Sep 2020 14:09:47 +0200
-Subject: [PATCH] Fix path for Lenovo kill-switch heuristic
-
-The path was missing the /sys prefix, rendering the test useless. Add
-the appropriate prefix and also a comment explaining why we do this.
----
- src/thd_engine.cpp | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/src/thd_engine.cpp b/src/thd_engine.cpp
-index ee4ed57..4f86549 100644
---- a/src/thd_engine.cpp
-+++ b/src/thd_engine.cpp
-@@ -698,7 +698,11 @@ static supported_ids_t id_table[] = {
- };
- 
- std::vector<std::string> blocklist_paths {
--	"/devices/platform/thinkpad_acpi/dytc_lapmode",
-+	/* Some Lenovo machines have in-firmware thermal management,
-+	 * avoid having two entities trying to manage things.
-+	 * We may want to change this to dytc_perfmode once that is
-+	 * widely available. */
-+	"/sys/devices/platform/thinkpad_acpi/dytc_lapmode",
- };
- #endif
- 
--- 
-2.26.2
-

0001-adaptive-Fix-64bit-printing-on-non-64bit-machines.patch

@@ -1,25 +0,0 @@
-From 0710804c2c2747839231142c6be95485ed1707b7 Mon Sep 17 00:00:00 2001
-From: Benjamin Berg <bberg@redhat.com>
-Date: Tue, 25 Aug 2020 15:01:56 +0200
-Subject: [PATCH] adaptive: Fix 64bit printing on non-64bit machines
-
----
- src/thd_engine_adaptive.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/thd_engine_adaptive.cpp b/src/thd_engine_adaptive.cpp
-index acae7d4..8d33153 100644
---- a/src/thd_engine_adaptive.cpp
-+++ b/src/thd_engine_adaptive.cpp
-@@ -183,7 +183,7 @@ void cthd_engine_adaptive::dump_apat()
- 	thd_log_info("..apat dump begin.. \n");
- 	for (unsigned int i = 0; i < targets.size(); ++i) {
- 		thd_log_info(
--				"target_id:%lu name:%s participant:%s domain:%d code:%s argument:%s\n",
-+				"target_id:%" PRIu64 " name:%s participant:%s domain:%d code:%s argument:%s\n",
- 				targets[i].target_id, targets[i].name.c_str(),
- 				targets[i].participant.c_str(), (int)targets[i].domain,
- 				targets[i].code.c_str(), targets[i].argument.c_str());
--- 
-2.26.2
-

sources

@@ -1 +1 @@
-SHA512 (thermald-2.3.tar.gz) = 0d722c35e3638bb917994b8a123e1226b737b120f0946cfc604eb3bb4bd501121b1f196833f8cb3aceee73a8bb3566ef1d176d81143b84423f89d20966e91ed8
+SHA512 (thermald-2.4.tar.gz) = 917c3de686a5cf6f679af2de2a0bb4aeb1acaf3316b82559d1f5e7bc8ebb9028714ffc1dfd1daa964cfc91598579565aca721b3fefd206ad6e5a01206573bfd0

thermald.spec

@@ -7,8 +7,8 @@
 
 
 Name:		thermald
-Version:	2.3
-Release:	2%{?dist}
+Version:	2.4
+Release:	1%{?dist}
 Summary:	Thermal Management daemon
 
 License:	GPLv2+
@@ -23,7 +23,6 @@ BuildRequires:	automake
 BuildRequires:	dbus-glib-devel
 BuildRequires:	desktop-file-utils
 BuildRequires:	gcc-c++
-BuildRequires:	glib-devel
 BuildRequires:	libxml2-devel
 BuildRequires:	systemd-devel
 BuildRequires:  upower-devel
@@ -35,9 +34,6 @@ Requires:	dbus%{?_isa}
 Requires(pre):	glibc-common
 Requires(pre):	shadow-utils
 
-Patch0:         0001-adaptive-Fix-64bit-printing-on-non-64bit-machines.patch
-Patch1:         0001-Fix-path-for-Lenovo-kill-switch-heuristic.patch
-
 %{?systemd_requires}
 
 %description
@@ -246,6 +242,11 @@ exit 0
 
 
 %changelog
+* Thu Nov 26 2020 Benjamin Berg <bberg@redhat.com> - 2.4-1
+- New upstream release (#1901810)
+  Resolves: #1894178
+  Resolves: #1892534
+
 * Tue Sep 01 2020 Benjamin Berg <bberg@redhat.com> - 2.3-2
 - Fix Lenovo kill switch (#1874462)