From 7534a869653010c708a227bae1f0be487cc0fbfc5f85a31d16065b14d5bb0a2b Mon Sep 17 00:00:00 2001 From: Michal Suchanek Date: Thu, 18 Jan 2018 09:08:23 +0000 Subject: [PATCH] Accepting request 567290 from home:michals Enable use of ibmswtpm2 on BE OBS-URL: https://build.opensuse.org/request/show/567290 OBS-URL: https://build.opensuse.org/package/show/security/ibmtss?expand=0&rev=15 --- ibmtss.changes | 5 +++++ ibmtss.spec | 15 +++++---------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/ibmtss.changes b/ibmtss.changes index 061ca63..0fee163 100644 --- a/ibmtss.changes +++ b/ibmtss.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Jan 18 08:34:51 UTC 2018 - msuchanek@suse.com + +- Enable test on BE + ------------------------------------------------------------------- Wed Nov 8 15:35:53 UTC 2017 - msuchanek@suse.com diff --git a/ibmtss.spec b/ibmtss.spec index f148326..f8b4a25 100644 --- a/ibmtss.spec +++ b/ibmtss.spec @@ -1,7 +1,7 @@ # # spec file for package ibmtss # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -30,13 +30,8 @@ Source: https://sourceforge.net/projects/ibmtpm20tss/files/ibmtss%{versi Patch: makefile.patch Source1: %{name} Source2: %{name}.1 -BuildRequires: libopenssl-devel -%ifnarch s390x s390 ppc64 ppc BuildRequires: ibmswtpm2 -%define test 1 -%else -%define test "" -%endif +BuildRequires: libopenssl-devel Recommends: %{name}-base = %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -70,11 +65,11 @@ Includes IBM's TPM 2.0 TSS C header files %build cd utils -[ -n "%{test}" ] && { %{_libexecdir}/%{suite}/tpm_server & tpm_server="$!" ; } +%{_libexecdir}/%{suite}/tpm_server & tpm_server="$!" CCFLAGS="%{optflags}" make LNAFLAGS="-Wl,-rpath,%{_libexecdir}/%{suite}" %{?_smp_mflags} testfailed=0 -[ -n "%{test}" ] && { TPM_INTERFACE_TYPE=socsim LD_LIBRARY_PATH=. ./reg.sh || testfailed=$? ; } -[ -n "%{test}" ] && kill "$tpm_server" || : +TPM_INTERFACE_TYPE=socsim LD_LIBRARY_PATH=. ./reg.sh || testfailed=$? +kill "$tpm_server" || : [ "$testfailed" -eq 0 ] %install