Dominique Leuenberger 2018-01-19 10:53:58 +00:00 committed by Git OBS Bridge
commit ee36c6862d
2 changed files with 10 additions and 10 deletions

View File

@ -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 Wed Nov 8 15:35:53 UTC 2017 - msuchanek@suse.com

View File

@ -1,7 +1,7 @@
# #
# spec file for package ibmtss # 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 # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # 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 Patch: makefile.patch
Source1: %{name} Source1: %{name}
Source2: %{name}.1 Source2: %{name}.1
BuildRequires: libopenssl-devel
%ifnarch s390x s390 ppc64 ppc
BuildRequires: ibmswtpm2 BuildRequires: ibmswtpm2
%define test 1 BuildRequires: libopenssl-devel
%else
%define test ""
%endif
Recommends: %{name}-base = %{version} Recommends: %{name}-base = %{version}
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
@ -70,11 +65,11 @@ Includes IBM's TPM 2.0 TSS C header files
%build %build
cd utils 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} CCFLAGS="%{optflags}" make LNAFLAGS="-Wl,-rpath,%{_libexecdir}/%{suite}" %{?_smp_mflags}
testfailed=0 testfailed=0
[ -n "%{test}" ] && { TPM_INTERFACE_TYPE=socsim LD_LIBRARY_PATH=. ./reg.sh || testfailed=$? ; } TPM_INTERFACE_TYPE=socsim LD_LIBRARY_PATH=. ./reg.sh || testfailed=$?
[ -n "%{test}" ] && kill "$tpm_server" || : kill "$tpm_server" || :
[ "$testfailed" -eq 0 ] [ "$testfailed" -eq 0 ]
%install %install