Use tpm2-tss to provide tss account

This commit is contained in:
Peter Robinson 2024-01-28 23:06:37 +00:00
parent 04f80a2a8e
commit 58a308e7ea

View File

@ -12,7 +12,7 @@
Summary: TPM Emulator Summary: TPM Emulator
Name: swtpm Name: swtpm
Version: 0.8.1 Version: 0.8.1
Release: 4%{?dist} Release: 5%{?dist}
License: BSD-3-Clause License: BSD-3-Clause
Url: http://github.com/stefanberger/swtpm Url: http://github.com/stefanberger/swtpm
Source0: %{url}/archive/%{gitcommit}/%{name}-%{gitshortcommit}.tar.gz Source0: %{url}/archive/%{gitcommit}/%{name}-%{gitshortcommit}.tar.gz
@ -27,9 +27,7 @@ BuildRequires: expect
BuildRequires: net-tools BuildRequires: net-tools
BuildRequires: openssl-devel BuildRequires: openssl-devel
BuildRequires: socat BuildRequires: socat
%if %{undefined rhel} BuildRequires: tpm2-tss
BuildRequires: trousers >= 0.3.9
%endif
BuildRequires: softhsm BuildRequires: softhsm
BuildRequires: json-glib-devel BuildRequires: json-glib-devel
%if %{with gnutls} %if %{with gnutls}
@ -71,8 +69,8 @@ Include files for the TPM emulator's CUSE interface.
Summary: Tools for the TPM emulator Summary: Tools for the TPM emulator
License: BSD-3-Clause License: BSD-3-Clause
Requires: swtpm = %{version}-%{release} Requires: swtpm = %{version}-%{release}
# trousers: for tss account (unsupported in RHEL) # tpm2-tss for tss account
Requires: %{!?rhel:trousers >= 0.3.9} bash gnutls-utils Requires: tpm2-tss bash gnutls-utils
%description tools %description tools
Tools for the TPM emulator from the swtpm package Tools for the TPM emulator from the swtpm package
@ -82,7 +80,7 @@ Summary: Tools for creating a local CA based on a TPM pkcs11 device
License: BSD-3-Clause License: BSD-3-Clause
Requires: swtpm-tools = %{version}-%{release} Requires: swtpm-tools = %{version}-%{release}
Requires: tpm2-pkcs11 tpm2-pkcs11-tools tpm2-tools tpm2-abrmd Requires: tpm2-pkcs11 tpm2-pkcs11-tools tpm2-tools tpm2-abrmd
Requires: expect gnutls-utils %{!?rhel:trousers >= 0.3.9} Requires: expect gnutls-utils
%description tools-pkcs11 %description tools-pkcs11
Tools for creating a local CA based on a pkcs11 device Tools for creating a local CA based on a pkcs11 device
@ -195,6 +193,9 @@ fi
%{_datadir}/swtpm/swtpm-create-tpmca %{_datadir}/swtpm/swtpm-create-tpmca
%changelog %changelog
* Sun Jan 28 2024 Peter Robinson <pbrobinson@fedoraproject.org> - 0.8.1-5
- Use tpm2-tss to provide tss account
* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.1-4 * Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.1-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild