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 - 2.5-3 +- Accept 2.5 as package version + Related: #2040081 + * Mon Jul 25 2022 Benjamin Berg - 2.5-2 - Fix version test script Related: #2040081