From a083903c1f5f21dd6c355dacbb257425216296f2e54c2653d26f22897c1b9193 Mon Sep 17 00:00:00 2001
From: Matthias Gerstner <matthias.gerstner@suse.com>
Date: Thu, 22 Oct 2020 11:43:23 +0000
Subject: [PATCH] - move the tcti-fapi tmpfiles.d config file into the
 libtss2-fapi1 sub-package. - improve the descriptions of new libraries
 (fapi1, cmd0, swtpm0)

OBS-URL: https://build.opensuse.org/package/show/security/tpm2-0-tss?expand=0&rev=98
---
 baselibs.conf      |  5 ++++-
 tpm2-0-tss.changes |  7 +++++++
 tpm2-0-tss.spec    | 19 +++++++++++++------
 3 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/baselibs.conf b/baselibs.conf
index f93983c..130922f 100644
--- a/baselibs.conf
+++ b/baselibs.conf
@@ -1,5 +1,8 @@
-libtss2-sys0
 libtss2-esys0
+libtss2-fapi1
 libtss2-mu0
+libtss2-sys1
+libtss2-tcti-cmd0
 libtss2-tcti-device0
 libtss2-tcti-mssim0
+libtss2-tcti-swtpm0
diff --git a/tpm2-0-tss.changes b/tpm2-0-tss.changes
index 04c9dab..3304429 100644
--- a/tpm2-0-tss.changes
+++ b/tpm2-0-tss.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu Oct 22 11:38:52 UTC 2020 - Matthias Gerstner <matthias.gerstner@suse.com>
+
+- move the tcti-fapi tmpfiles.d config file into the libtss2-fapi1 sub-package.
+- improve the descriptions of new libraries (fapi1, cmd0, swtpm0)
+- adjust baselibs.conf to match new library versions and added libraries
+
 -------------------------------------------------------------------
 Mon Oct 19 13:30:39 UTC 2020 - Guillaume GARDET <guillaume.gardet@opensuse.org>
 
diff --git a/tpm2-0-tss.spec b/tpm2-0-tss.spec
index 61fe350..0ba4466 100644
--- a/tpm2-0-tss.spec
+++ b/tpm2-0-tss.spec
@@ -148,21 +148,27 @@ Summary:        FAPI interface library
 Group:          System/Libraries
 
 %description -n libtss2-fapi1
-FAPI interface library
+This is the tpm2 Feature API (FAPI) library. This API is designed to be very
+high-level API, intended to make programming with the TPM as simple as
+possible.
 
 %package -n     libtss2-tcti-cmd0
 Summary:        TCTI cmd interface library
 Group:          System/Libraries
 
 %description -n libtss2-tcti-cmd0
-TCTI cmd interface library
+A TCTI for interaction with a subprocess. It abstracts the details of direct
+communication with the interface and protocol exposed by a subprocess that can
+receive and transmit raw TPM2 command and response buffers.
 
 %package -n     libtss2-tcti-swtpm0
 Summary:        TCTI swtpm interface library
 Group:          System/Libraries
 
 %description -n libtss2-tcti-swtpm0
-TCTI swtpm interface library
+A TCTI for interaction with the TPM2 software simulator. It abstracts the
+details of direct communication with the interface and protocol exposed by the
+daemon hosting the TPM2 reference implementation.
 
 %prep
 %setup -q -n tpm2-tss-%{version}
@@ -184,7 +190,6 @@ mv %{buildroot}%{_udevrulesdir}/tpm-udev.rules %{buildroot}%{_udevrulesdir}/%{ud
 
 %post
 %_bindir/udevadm trigger -s tpm -s tpmrm || :
-%tmpfiles_create %_tmpfilesdir/tpm2-tss-fapi.conf
 
 %post -n libtss2-esys0 -p /sbin/ldconfig
 %postun -n libtss2-esys0 -p /sbin/ldconfig
@@ -200,7 +205,9 @@ mv %{buildroot}%{_udevrulesdir}/tpm-udev.rules %{buildroot}%{_udevrulesdir}/%{ud
 %postun -n libtss2-mu0 -p /sbin/ldconfig
 %post -n libtss2-rc0 -p /sbin/ldconfig
 %postun -n libtss2-rc0 -p /sbin/ldconfig
-%post -n libtss2-fapi1 -p /sbin/ldconfig
+%post -n libtss2-fapi1
+/sbin/ldconfig
+%tmpfiles_create %_tmpfilesdir/tpm2-tss-fapi.conf
 %postun -n libtss2-fapi1 -p /sbin/ldconfig
 %post -n libtss2-tcti-cmd0 -p /sbin/ldconfig
 %postun -n libtss2-tcti-cmd0 -p /sbin/ldconfig
@@ -216,7 +223,6 @@ mv %{buildroot}%{_udevrulesdir}/tpm-udev.rules %{buildroot}%{_udevrulesdir}/%{ud
 %{_mandir}/man7/tss2-*
 %{_udevrulesdir}/%{udev_rule_file}
 %{_sysusersdir}/tpm2-tss.conf
-%{_tmpfilesdir}/tpm2-tss-fapi.conf
 %dir /etc/tpm2-tss/
 %config /etc/tpm2-tss/fapi-config.json
 %dir /etc/tpm2-tss/fapi-profiles
@@ -259,6 +265,7 @@ mv %{buildroot}%{_udevrulesdir}/tpm-udev.rules %{buildroot}%{_udevrulesdir}/%{ud
 %files -n libtss2-fapi1
 %defattr(-,root,root)
 %{_libdir}/libtss2-fapi.so.*
+%{_tmpfilesdir}/tpm2-tss-fapi.conf
 
 %files -n libtss2-tcti-cmd0
 %defattr(-,root,root)