From 3bef03c03ecd47101afc97f43991838edcf54cc6b22972f36b274960a5e64823 Mon Sep 17 00:00:00 2001
From: Marcus Meissner <meissner@suse.com>
Date: Wed, 24 Feb 2016 13:01:43 +0000
Subject: [PATCH] Accepting request 361251 from home:msmeissn:branches:security

OBS-URL: https://build.opensuse.org/request/show/361251
OBS-URL: https://build.opensuse.org/package/show/security/tpm2-0-tss?expand=0&rev=11
---
 tpm2-0-tss.spec | 38 ++++++++++++++++++--------------------
 1 file changed, 18 insertions(+), 20 deletions(-)

diff --git a/tpm2-0-tss.spec b/tpm2-0-tss.spec
index 9b26d47..58bf71e 100644
--- a/tpm2-0-tss.spec
+++ b/tpm2-0-tss.spec
@@ -26,6 +26,7 @@ Url:            https://github.com/01org/TPM2.0-TSS
 Source0:        %name-%version.tar.gz
 Source2:        baselibs.conf
 BuildRequires:  automake
+BuildRequires:  gcc-c++
 BuildRequires:  libtool
 BuildRequires:  openssl-devel
 BuildRequires:  pkg-config
@@ -54,12 +55,12 @@ Trusted Computing website http://www.trustedcomputinggroup.org/.
 The package needs the /dev/tpm device file to be present on your
 system. It is a character device file major 10 minor 224, 0600 tss:tss.
 
-%package -n libtspi1
+%package -n libtss2
 Summary:        TSS (TCG Software Stack) access daemon for a TPM chip
 Group:          Productivity/Security
 Requires:       trousers
 
-%description -n libtspi1
+%description -n libtss2
 The trousers package provides a TSS implementation through the help of
 a user-space daemon, the tcsd, and a library  Trousers aims to be
 compliant to the 1.1b and 1.2 TSS specifications as available from the
@@ -74,10 +75,11 @@ system. It is a character device file major 10 minor 224, 0600 tss:tss.
 %build
 bash bootstrap
 %configure --disable-static --with-pic
-make %{?_smp_mflags}
+make %{?_smp_mflags} PTHREAD_LDFLAGS=-pthread
 
 %install
 %make_install
+rm %{buildroot}//%{_libdir}/lib*.la
 
 %pre
 %{_sbindir}/groupadd -g 98 tss 2> /dev/null || :
@@ -93,32 +95,28 @@ make %{?_smp_mflags}
 %preun
 %service_del_preun tcsd.service
 
-%post -n libtspi1 -p /sbin/ldconfig
+%post -n libtss2 -p /sbin/ldconfig
 
-%postun -n libtspi1 -p /sbin/ldconfig
+%postun -n libtss2 -p /sbin/ldconfig
 
 %files
 %defattr(-,root,root)
-%config(noreplace) %attr(600,tss,tss) %{_sysconfdir}/tcsd.conf
-%doc README README.selinux AUTHORS ChangeLog LICENSE NICETOHAVES TODO doc/*
-%{_mandir}/man5/*
-%{_mandir}/man8/*
-%{_localstatedir}/lib/tpm
-%{_sbindir}/tcsd
-%{_sbindir}/rctcsd
-%{_unitdir}/tcsd.service
+%doc *.md ChangeLog LICENSE
+/usr/sbin/resourcemgr
 
 %files devel
 %defattr(-,root,root)
-%{_includedir}/trousers
-%{_includedir}/tss
-%{_mandir}/man3/*
+%{_includedir}/tcti
+%{_includedir}/tss2
 %{_libdir}/*.so
-#only available in static form
-%{_libdir}/libtddl.a
+##only available in static form
+#%{_libdir}/libtddl.a
 
-%files -n libtspi1
+%files -n libtss2
 %defattr(-,root,root)
-/%{_lib}/*.so.*
+/%{_libdir}/libtss2.so.*
+/%{_libdir}/libtctidevice.so.*
+/%{_libdir}/libtctisocket.so.*
+
 
 %changelog