From 9d4ed58794fe22139054c34fe0195d2017c3781a Mon Sep 17 00:00:00 2001 From: zhipengl Date: Fri, 24 Aug 2018 00:28:54 +0800 Subject: [PATCH] upgrade tpm2-tools to CentOS 7.5 version Story: 2003389 Task: 24508 Depends-On: https://review.openstack.org/#/c/595525/ Change-Id: I4424414bcde7ac57faa692c72c76b089154839a7 Signed-off-by: zhipengl --- security/tpm2-tools/PKG-INFO | 2 +- ...te-package-versioning-for-TIS-format.patch | 26 +++++++++---------- security/tpm2-tools/centos/srpm_path | 2 +- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/security/tpm2-tools/PKG-INFO b/security/tpm2-tools/PKG-INFO index 1b7d2f8a2..db0aa9d08 100644 --- a/security/tpm2-tools/PKG-INFO +++ b/security/tpm2-tools/PKG-INFO @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: tpm2-tools -Version: 1.1.0 +Version: 3.0.1 Summary: A TPM2.0 testing tool build upon TPM2.0-TSS Home-page: Author: diff --git a/security/tpm2-tools/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch b/security/tpm2-tools/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch index 64aaa13ca..a20093d77 100644 --- a/security/tpm2-tools/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch +++ b/security/tpm2-tools/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch @@ -1,7 +1,7 @@ -From cf30b93accbda4284677507a88ca3727a97fb83c Mon Sep 17 00:00:00 2001 +From 63375de22771a9384eb9c4a90abc8ee2143a7721 Mon Sep 17 00:00:00 2001 From: Scott Little Date: Mon, 2 Oct 2017 17:30:57 -0400 -Subject: [PATCH 2/2] WRS: 0001-Update-package-versioning-for-TIS-format.patch +Subject: [PATCH] WRS: 0001-Update-package-versioning-for-TIS-format.patch Conflicts: SPECS/tpm2-tools.spec @@ -10,26 +10,26 @@ Conflicts: 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/SPECS/tpm2-tools.spec b/SPECS/tpm2-tools.spec -index c858d6f..464c814 100644 +index 935580d..12aa6a0 100644 --- a/SPECS/tpm2-tools.spec +++ b/SPECS/tpm2-tools.spec @@ -1,6 +1,6 @@ Name: tpm2-tools - Version: 1.1.0 --Release: 7%{?dist} -+Release: 7.el7%{?_tis_dist}.%{tis_patch_ver} + 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 - %global pkg_prefix tpm2.0-tools -@@ -44,7 +44,7 @@ BuildRequires: pkgconfig(tcti-socket) + 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.0-2%{?dist} -+Requires: tpm2-tss%{?_isa} = 1.0-2.el7 +-Requires: tpm2-tss%{?_isa} >= 1.3.0-1%{?dist} ++Requires: tpm2-tss%{?_isa} = 1.3.0-2%{?dist} - %description - tpm2-tools is a batch of testing tools for tpm2.0. It is based on tpm2-tss. + # tpm2-tools project changed the install path for binaries and man page section + Obsoletes: tpm2-tools <= 2.1.0-2 -- -1.9.1 +2.7.4 diff --git a/security/tpm2-tools/centos/srpm_path b/security/tpm2-tools/centos/srpm_path index 4e0786eff..506bd9824 100644 --- a/security/tpm2-tools/centos/srpm_path +++ b/security/tpm2-tools/centos/srpm_path @@ -1 +1 @@ -mirror:Source/tpm2-tools-1.1.0-7.el7.src.rpm +mirror:Source/tpm2-tools-3.0.1-1.el7.src.rpm