4a71635ea5
Fix version issue introduced in https://review.openstack.org/#/c/595514/ Story: 2003389 Task: 24508 Change-Id: I728c871aef0afa307f8043942e19ada995e848b0 Signed-off-by: zhipengl <zhipengs.liu@intel.com>
36 lines
1.0 KiB
Diff
36 lines
1.0 KiB
Diff
From 63375de22771a9384eb9c4a90abc8ee2143a7721 Mon Sep 17 00:00:00 2001
|
|
From: Scott Little <scott.little@windriver.com>
|
|
Date: Mon, 2 Oct 2017 17:30:57 -0400
|
|
Subject: [PATCH] WRS: 0001-Update-package-versioning-for-TIS-format.patch
|
|
|
|
Conflicts:
|
|
SPECS/tpm2-tools.spec
|
|
---
|
|
SPECS/tpm2-tools.spec | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/SPECS/tpm2-tools.spec b/SPECS/tpm2-tools.spec
|
|
index 935580d..12aa6a0 100644
|
|
--- a/SPECS/tpm2-tools.spec
|
|
+++ b/SPECS/tpm2-tools.spec
|
|
@@ -1,6 +1,6 @@
|
|
Name: tpm2-tools
|
|
Version: 3.0.1
|
|
-Release: 1%{?dist}
|
|
+Release: 1.el7%{?_tis_dist}.%{tis_patch_ver}
|
|
Summary: A TPM2.0 testing tool build upon TPM2.0-TSS
|
|
|
|
License: BSD
|
|
@@ -33,7 +33,7 @@ BuildRequires: pkgconfig(tcti-tabrmd)
|
|
ExclusiveArch: %{ix86} x86_64
|
|
|
|
# tpm2-tools is heavily depending on TPM2.0-TSS project, matched tss is required
|
|
-Requires: tpm2-tss%{?_isa} >= 1.3.0-1%{?dist}
|
|
+Requires: tpm2-tss%{?_isa} = 1.3.0-2.el7
|
|
|
|
# tpm2-tools project changed the install path for binaries and man page section
|
|
Obsoletes: tpm2-tools <= 2.1.0-2
|
|
--
|
|
2.7.4
|
|
|