From 3f00b7a868a2c2aaab3242acb48a29aba373a61c Mon Sep 17 00:00:00 2001
From: Benjamin Berg <bberg@redhat.com>
Date: Mon, 25 Jul 2022 15:59:46 +0200
Subject: [PATCH] Accept 2.5 as package version

Thermald release tarballs do not generally contain the .0, while the
printed releaes may or may not contain a .0. i.e. we can get a mismatch.
Accpet a missing .0 on either the RPM (/tarball) version or the output
version.

Related: #2040081
---
 tests/version.sh | 2 +-
 thermald.spec    | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/tests/version.sh b/tests/version.sh
index 080dcea..c299c17 100755
--- a/tests/version.sh
+++ b/tests/version.sh
@@ -8,7 +8,7 @@ set -ex
 
 rpmversion=$(rpm -q --queryformat '%{VERSION}' thermald)
 version=$(thermald --version)
-if [ "$version" != "$rpmversion" -a "$version.0" != "$rpmversion" ]; then
+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
diff --git a/thermald.spec b/thermald.spec
index 89061e4..50ef931 100644
--- a/thermald.spec
+++ b/thermald.spec
@@ -8,7 +8,7 @@
 
 Name:		thermald
 Version:	2.5
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Thermal Management daemon
 
 # thd_cdev_modem.{cpp,h} is currently GPLv2 only
@@ -251,6 +251,10 @@ exit 0
 
 
 %changelog
+* 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