tpm2-tools: Fix version not being reported

Resolves: rhbz#2015941

Signed-off-by: Štěpán Horáček <shoracek@redhat.com>
This commit is contained in:
Štěpán Horáček 2021-10-25 13:37:20 +02:00
parent d8b5733ac7
commit 1ec5ef1702
2 changed files with 38 additions and 1 deletions

View File

@ -0,0 +1,32 @@
From 395651f059ceb21d56c44cddda05e055caa0fd19 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=A0t=C4=9Bp=C3=A1n=20Hor=C3=A1=C4=8Dek?=
<shoracek@redhat.com>
Date: Mon, 18 Oct 2021 19:04:54 +0200
Subject: [PATCH] build: Use hardcoded version variable
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Before this commit the version was generated from git tag/commit hash.
This caused problems with having empty version variable while building
outside of git. Fix this by hardcoding the variable.
Signed-off-by: Štěpán Horáček <shoracek@redhat.com>
---
configure.ac | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/configure.ac b/configure.ac
index 9561fa86..2bf3a790 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,4 @@
-AC_INIT([tpm2-tools],
- [m4_esyscmd_s([git describe --tags --always --dirty])])
+AC_INIT([tpm2-tools], [5.0])
AC_CONFIG_MACRO_DIR([m4])
AX_IS_RELEASE([dash-version])
--
2.31.1

View File

@ -2,7 +2,7 @@
Name: tpm2-tools Name: tpm2-tools
Version: 5.0 Version: 5.0
Release: 9%{?candidate:.%{candidate}}%{?dist} Release: 10%{?candidate:.%{candidate}}%{?dist}
Summary: A bunch of TPM testing toolS build upon tpm2-tss Summary: A bunch of TPM testing toolS build upon tpm2-tss
License: BSD License: BSD
@ -26,6 +26,7 @@ Patch14: 0015-openssl-Implement-EVP_PKEY-based-key-export.patch
Patch15: 0016-openssl-Convert-deprecated-ECDH_compute_key-to-EVP_P.patch Patch15: 0016-openssl-Convert-deprecated-ECDH_compute_key-to-EVP_P.patch
Patch16: 0017-openssl-Reimplement-RSA-OAEP-encryption-using-EVP-fu.patch Patch16: 0017-openssl-Reimplement-RSA-OAEP-encryption-using-EVP-fu.patch
Patch17: 0018-Generate-partial-X.509-certificate-using-own-struct.patch Patch17: 0018-Generate-partial-X.509-certificate-using-own-struct.patch
Patch18: 0019-build-Use-hardcoded-version-variable.patch
BuildRequires: make BuildRequires: make
BuildRequires: gcc-c++ BuildRequires: gcc-c++
@ -76,6 +77,10 @@ autoreconf -i
%{_mandir}/man1/tss2_*.1.gz %{_mandir}/man1/tss2_*.1.gz
%changelog %changelog
* Mon Oct 25 2021 Štěpán Horáček <shoracek@redhat.com> - 5.0-10
- Fix the version not being reported
Resolves: rhbz#2015941
* Fri Oct 1 2021 Štěpán Horáček <shoracek@redhat.com> - 5.0-9 * Fri Oct 1 2021 Štěpán Horáček <shoracek@redhat.com> - 5.0-9
- Fix a segfault on ppc64le and add support for OpenSSL 3 - Fix a segfault on ppc64le and add support for OpenSSL 3
Resolves: rhbz#1989617 Resolves: rhbz#1989617