From 1cd3f5b145a9f54c4b82336d84d72d5a17023d7a Mon Sep 17 00:00:00 2001 From: Benjamin Berg Date: Mon, 25 Jul 2022 14:49:26 +0200 Subject: [PATCH] Fix version test script 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 4765ecb..080dcea 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" ]; then +if [ "$version" != "$rpmversion" -a "$version.0" != "$rpmversion" ]; then echo "reported thermald version (${version}) does not match rpm version (${rpmversion})" exit 1 fi diff --git a/thermald.spec b/thermald.spec index c715ed6..89061e4 100644 --- a/thermald.spec +++ b/thermald.spec @@ -8,7 +8,7 @@ Name: thermald Version: 2.5 -Release: 1%{?dist} +Release: 2%{?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 - 2.5-2 +- Fix version test script + Related: #2040081 + * Fri Jul 22 2022 Benjamin Berg - 2.5-1 - Update to 2.5 Resolves: #2040081