From 525e740b90051c04693315cb8e885b6676e91e21d4efe0fd5d9557338b1b1f24 Mon Sep 17 00:00:00 2001
From: Matthias Gerstner <matthias.gerstner@suse.com>
Date: Wed, 8 Dec 2021 09:29:33 +0000
Subject: [PATCH] Accepting request 936251 from home:aplanas:branches:security

- Obsoletes libtss2-fapi0

OBS-URL: https://build.opensuse.org/request/show/936251
OBS-URL: https://build.opensuse.org/package/show/security/tpm2-0-tss?expand=0&rev=113
---
 tpm2-0-tss.changes |  5 +++++
 tpm2-0-tss.spec    | 36 +++++++++++++++++++-----------------
 2 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/tpm2-0-tss.changes b/tpm2-0-tss.changes
index daab9c4..61998a3 100644
--- a/tpm2-0-tss.changes
+++ b/tpm2-0-tss.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Dec  7 09:33:54 UTC 2021 - Alberto Planas Dominguez <aplanas@suse.com>
+
+- Obsoletes libtss2-fapi0
+
 -------------------------------------------------------------------
 Thu Jul 15 15:51:04 UTC 2021 - Callum Farmer <gmbr3@opensuse.org>
 
diff --git a/tpm2-0-tss.spec b/tpm2-0-tss.spec
index 937c794..62c5433 100644
--- a/tpm2-0-tss.spec
+++ b/tpm2-0-tss.spec
@@ -25,16 +25,16 @@ Group:          Productivity/Security
 URL:            https://github.com/tpm2-software/tpm2-tss
 Source0:        https://github.com/tpm2-software/tpm2-tss/releases/download/%{version}/tpm2-tss-%{version}.tar.gz
 Source2:        baselibs.conf
-BuildRequires:  doxygen
-BuildRequires:  gcc-c++
-BuildRequires:  pkgconfig(libcurl)
-BuildRequires:  libgcrypt-devel
-BuildRequires:  pkgconfig(json-c)
-BuildRequires:  pkgconfig(libopenssl)
-BuildRequires:  pkgconfig
-BuildRequires:  pkgconfig(udev)
 BuildRequires:  /usr/sbin/groupadd
 BuildRequires:  acl
+BuildRequires:  doxygen
+BuildRequires:  gcc-c++
+BuildRequires:  libgcrypt-devel
+BuildRequires:  pkgconfig
+BuildRequires:  pkgconfig(json-c)
+BuildRequires:  pkgconfig(libcurl)
+BuildRequires:  pkgconfig(libopenssl)
+BuildRequires:  pkgconfig(udev)
 # The same user is employed by trousers (and was employed by the old
 # resourcemgr shipped with the tpm2-0-tss package):
 #
@@ -70,8 +70,8 @@ Requires:       libtss2-sys1 = %{version}
 Requires:       libtss2-tcti-cmd0 = %{version}
 Requires:       libtss2-tcti-device0 = %{version}
 Requires:       libtss2-tcti-mssim0 = %{version}
-Requires:       libtss2-tcti-swtpm0 = %{version}
 Requires:       libtss2-tcti-pcap0 = %{version}
+Requires:       libtss2-tcti-swtpm0 = %{version}
 Requires:       libtss2-tctildr0 = %{version}
 Requires:       tpm2-0-tss = %{version}
 
@@ -148,6 +148,7 @@ protocol exposed by the Microsoft software TPM2 simulator.
 %package -n     libtss2-fapi1
 Summary:        FAPI interface library
 Group:          System/Libraries
+Obsoletes:      libtss2-fapi0 < %{version}
 
 %description -n libtss2-fapi1
 This is the tpm2 Feature API (FAPI) library. This API is designed to be very
@@ -192,7 +193,7 @@ export PATH="$PATH:%{_sbindir}"
     --with-runstatedir=%{_rundir} \
     --with-tmpfilesdir=%{_tmpfilesdir} \
     --with-sysusersdir=%{_sysusersdir}
-make %{?_smp_mflags} PTHREAD_LDFLAGS=-pthread
+%make_build PTHREAD_LDFLAGS=-pthread
 
 %install
 %make_install
@@ -204,7 +205,7 @@ mv %{buildroot}%{_udevrulesdir}/tpm-udev.rules %{buildroot}%{_udevrulesdir}/%{ud
 rm %{buildroot}%{_sysusersdir}/tpm2-tss.conf
 
 %post
-%_bindir/udevadm trigger -s tpm -s tpmrm || :
+%{_bindir}/udevadm trigger -s tpm -s tpmrm || :
 
 %post -n libtss2-esys0 -p /sbin/ldconfig
 %postun -n libtss2-esys0 -p /sbin/ldconfig
@@ -220,9 +221,11 @@ rm %{buildroot}%{_sysusersdir}/tpm2-tss.conf
 %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
 /sbin/ldconfig
-%tmpfiles_create %_tmpfilesdir/tpm2-tss-fapi.conf
+%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
@@ -231,7 +234,6 @@ rm %{buildroot}%{_sysusersdir}/tpm2-tss.conf
 %post -n libtss2-tcti-pcap0 -p /sbin/ldconfig
 %postun -n libtss2-tcti-pcap0 -p /sbin/ldconfig
 
-
 %files
 %doc *.md
 %license LICENSE
@@ -239,10 +241,10 @@ rm %{buildroot}%{_sysusersdir}/tpm2-tss.conf
 %{_mandir}/man5/*
 %{_mandir}/man7/tss2-*
 %{_udevrulesdir}/%{udev_rule_file}
-%dir /etc/tpm2-tss/
-%config /etc/tpm2-tss/fapi-config.json
-%dir /etc/tpm2-tss/fapi-profiles
-%config /etc/tpm2-tss/fapi-profiles/*.json
+%dir %{_sysconfdir}/tpm2-tss/
+%config %{_sysconfdir}/tpm2-tss/fapi-config.json
+%dir %{_sysconfdir}/tpm2-tss/fapi-profiles
+%config %{_sysconfdir}/tpm2-tss/fapi-profiles/*.json
 
 %files devel
 %{_includedir}/tss2