diff --git a/issue_291.diff b/issue_291.diff deleted file mode 100644 index 2cdcb81..0000000 --- a/issue_291.diff +++ /dev/null @@ -1,16 +0,0 @@ -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/sources b/sources index 1d24b3a..0b8ed02 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (thermald-2.4.1.tar.gz) = 2dab7d57e028037208034ab4be95dc138ce028d4a47a0151c69816e1502065d801d52990641544b5d246144e654c15c663fa78af6cea094cf9a107f2fb29c1ef +SHA512 (thermald-2.4.6.tar.gz) = e337b00ec7f4fa565927f047dbb17dc05b8513850f2488dd6cfc838e5123938fbfe7c39464fffb77c100073edfca9ea51708680eaa2cba537470326df9508d3a diff --git a/thermald.spec b/thermald.spec index 0bd2fa6..b1d7f70 100644 --- a/thermald.spec +++ b/thermald.spec @@ -7,11 +7,13 @@ Name: thermald -Version: 2.4.1 -Release: 4%{?dist} +Version: 2.4.6 +Release: 1%{?dist} Summary: Thermal Management daemon -License: GPLv2+ +# thd_cdev_modem.{cpp,h} is currently GPLv2 only +# https://github.com/intel/thermal_daemon/issues/306 +License: GPLv2 URL: https://github.com/intel/%{pkgname} Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz @@ -37,8 +39,6 @@ Requires(pre): shadow-utils %{?systemd_requires} -Patch01: issue_291.diff - %description %{name} monitors and controls platform temperature. @@ -56,6 +56,8 @@ BuildRequires: qt5-qtbase-devel Requires: hicolor-icon-theme Requires: %{name}%{?_isa} == %{version}-%{release} +Provides: bundled(qcustomplot) = 2.0.0-beta + %description monitor This package contains an Application to monitor %{name} for system developers who want to enable application developers and their @@ -245,6 +247,12 @@ exit 0 %changelog +* Thu Jun 10 2021 Benjamin Berg - 2.4.6-1 +- Update to 2.4.6 (#1965783) +- Update main license to GPLv2 only for now +- Add bundled(qcustomplot) for monitor subpackage +- Resolves: #1961047 + * Fri Apr 16 2021 Mohan Boddu - 2.4.1-4 - Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937