From 7b7dc0e689929e9d0915d01eede4d54e8c3ee46e Mon Sep 17 00:00:00 2001 From: DistroBaker Date: Sat, 13 Feb 2021 21:30:32 +0000 Subject: [PATCH] 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#b06314325298a76c09252475118f700d3c0f6248 --- issue_291.diff | 16 ++++++++++++++++ thermald.spec | 11 ++++++++++- 2 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 issue_291.diff diff --git a/issue_291.diff b/issue_291.diff new file mode 100644 index 0000000..2cdcb81 --- /dev/null +++ b/issue_291.diff @@ -0,0 +1,16 @@ +diff --git a/src/thd_engine_adaptive.cpp b/src/thd_engine_adaptive.cpp +index 1464006..c0ab87e 100644 +--- a/src/thd_engine_adaptive.cpp ++++ b/src/thd_engine_adaptive.cpp +@@ -1190,9 +1190,9 @@ int cthd_engine_adaptive::install_passive(struct psv *psv) { + int target_state = 0; + + if (psv->limit.length()) { +- if (psv->limit == "MAX") { ++ if (psv->limit == "MAX" || psv->limit == "max" ) { + target_state = TRIP_PT_INVALID_TARGET_STATE; +- } else if (psv->limit == "MIN") { ++ } else if (psv->limit == "MIN" || psv->limit == "min") { + target_state = 0; + } else { + std::istringstream buffer(psv->limit); diff --git a/thermald.spec b/thermald.spec index 0eee7f5..29b1675 100644 --- a/thermald.spec +++ b/thermald.spec @@ -8,7 +8,7 @@ Name: thermald Version: 2.4.1 -Release: 1%{?dist} +Release: 3%{?dist} Summary: Thermal Management daemon License: GPLv2+ @@ -18,6 +18,7 @@ Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz # No cpuid.h on other arches. ExclusiveArch: %{ix86} x86_64 +BuildRequires: make BuildRequires: autoconf autoconf-archive BuildRequires: automake BuildRequires: dbus-glib-devel @@ -36,6 +37,8 @@ Requires(pre): shadow-utils %{?systemd_requires} +Patch01: issue_291.diff + %description %{name} monitors and controls platform temperature. @@ -242,6 +245,12 @@ exit 0 %changelog +* Tue Feb 02 2021 Benjamin Berg - 2.4.1-3 +- Add upstream patch fixing parsing of passive targets + +* Wed Jan 27 2021 Fedora Release Engineering - 2.4.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Tue Dec 01 2020 Benjamin Berg - 2.4.1-1 - New upstream release (#1903094)