.gitignore

@@ -2,4 +2,3 @@
 *.rpm
 *.tar*
 results_*/
-/thermald-2.5.1.tar.gz

.thermald.metadata

@@ -1 +0,0 @@
-ba4eb08d776f0641b8b545a1c79551f3f8a0188e thermald-2.5.2.tar.gz

gating.yaml

@@ -1,6 +0,0 @@
---- !Policy
-product_versions:
-  - rhel-9
-decision_context: osci_compose_gate
-rules:
-  - !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional}

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);

sources

@@ -1 +1 @@
-SHA512 (thermald-2.5.2.tar.gz) = 50ec8c0afb62805d4a86eff91725c468c9035d4524d5d12c187c8b5bbff5a6e723ead7a32bda1a2964fa8a8a8ae437bc7c05d657ea1ac64e4a3d32e6dc0591e2
+SHA512 (thermald-2.4.1.tar.gz) = 2dab7d57e028037208034ab4be95dc138ce028d4a47a0151c69816e1502065d801d52990641544b5d246144e654c15c663fa78af6cea094cf9a107f2fb29c1ef

tests/run_tests.sh

@@ -1,12 +0,0 @@
-#!/bin/bash
-
-# fail the whole test set if any of the command pipelines fail
-set -ex
-
-# when running this in 1minutetip the PATH must be specified to execute
-# in the local directory.
-echo "Setting path to local directory"
-PATH=$PATH:$(pwd)
-
-# simple version test
-version.sh

tests/tests.yml

@@ -1,9 +0,0 @@
-- hosts: localhost
-  roles:
-    - role: standard-test-basic
-      tags:
-        - classic
-      tests:
-        - simple:
-            dir: .                                 # switch to subfolder. This parameter is REQUIRED, use `dir: .` for current folder
-            run: ./run_tests.sh                             # this is your test command, its exit code is the outcome of the test

tests/version.sh

@@ -1,17 +0,0 @@
-#!/bin/bash
-#
-# Thermald is a systemd unit file that requires specific hardware and
-# firmware.  As such it is difficult to test in an automated fashion.
-
-# fail the whole test if any of the command pipelines below fails
-set -ex
-
-rpmversion=$(rpm -q --queryformat '%{VERSION}' thermald)
-version=$(thermald --version)
-if [ "$version" != "$rpmversion" -a "$version.0" != "$rpmversion" -a "$version" != "$rpmversion.0" ]; then
-	echo "reported thermald version (${version}) does not match rpm version (${rpmversion})"
-	exit 1
-fi
-
-# if we get here, it's OK
-

thermald.spec

@@ -7,13 +7,11 @@
 
 
 Name:		thermald
-Version:	2.5.2
-Release:	1%{?dist}
+Version:	2.4.1
+Release:	3%{?dist}
 Summary:	Thermal Management daemon
 
-# thd_cdev_modem.{cpp,h} is currently GPLv2 only
-# https://github.com/intel/thermal_daemon/issues/306
-License:	GPLv2
+License:	GPLv2+
 URL:		https://github.com/intel/%{pkgname}
 Source0:	%{url}/archive/v%{version}/%{name}-%{version}.tar.gz
 
@@ -39,9 +37,7 @@ Requires(pre):	shadow-utils
 
 %{?systemd_requires}
 
-# Upstream removed the internal copy of qcustomplot, add it back as we don't have it in RHEL.
-# The alternative would be removing the GUI package
-Patch9000:      qcustomplot.patch
+Patch01:	issue_291.diff
 
 %description
 %{name} monitors and controls platform temperature.
@@ -60,8 +56,6 @@ 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
@@ -251,39 +245,6 @@ exit 0
 
 
 %changelog
-* Thu Feb 23 2023 Bastien Nocera <bnocera@redhat.com> - 2.5.2-1
-- Update to 2.5.2
-Resolves: rhbz#2172590
-
-* Mon Dec 19 2022 Bastien Nocera <bnocera@redhat.com> - 2.5.1-1
-- Update to 2.5.1
-Resolves: rhbz#2114049
-
-* Mon Jul 25 2022 Benjamin Berg <bberg@redhat.com> - 2.5-3
-- Accept 2.5 as package version
-  Related: #2040081
-
-* Mon Jul 25 2022 Benjamin Berg <bberg@redhat.com> - 2.5-2
-- Fix version test script
-  Related: #2040081
-
-* Fri Jul 22 2022 Benjamin Berg <bberg@redhat.com> - 2.5-1
-- Update to 2.5
-  Resolves: #2040081
-
-* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 2.4.6-2
-- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
-  Related: rhbz#1991688
-
-* Thu Jun 10 2021 Benjamin Berg <bberg@redhat.com> - 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 <mboddu@redhat.com> - 2.4.1-4
-- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
-
 * Tue Feb 02 2021 Benjamin Berg <bberg@redhat.com> - 2.4.1-3
 - Add upstream patch fixing parsing of passive targets