- updated to 2.4.0

- rebuild auto* for as-needed to work

diff --git a/tpm2-tss.spec b/tpm2-tss.spec
index bc68c6ab72c1c1116fb5c78d23f02944a52e8668..1fdc0a1b8b398dbedbfdd83e8d98fe8709e7b9c6 100644 (file)
--- a/tpm2-tss.spec
+++ b/tpm2-tss.spec
@@ -1,51 +1,65 @@
+#
+# Conditional build:
+%bcond_with    libgcrypt       # libgcrypt crypto instead of openssl
+
 Summary:       OSS implementation of the TCG TPM2 Software Stack (TSS2)
+Summary(pl.UTF-8):     Mająca otwarte źródła implementacja TCG TPM2 Software Stack (TSS2)
 Name:          tpm2-tss
-Version:       2.3.2
+Version:       2.4.0
 Release:       1
 License:       BSD
 Group:         Libraries
+#Source0Download: https://github.com/tpm2-software/tpm2-tss/releases
 Source0:       https://github.com/tpm2-software/tpm2-tss/releases/download/%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: fb7e6d371959a65dc6d129af81739742
+# Source0-md5: 269e8122e0588d56092abe3f2e38c8b9
 URL:           https://github.com/tpm2-software/tpm2-tss
+BuildRequires: autoconf >= 2.50
+BuildRequires: automake
+BuildRequires: curl-devel
 BuildRequires: doxygen
-BuildRequires: libgcrypt-devel
-BuildRequires: openssl-devel
-BuildRequires: pkg-config
+BuildRequires: json-c-devel
+%{?with_libgcrypt:BuildRequires:       libgcrypt-devel >= 1.6.0}
+BuildRequires: libtool >= 2:2
+%{!?with_libgcrypt:BuildRequires:      openssl-devel}
+BuildRequires: pkgconfig
+%{?with_libgcrypt:Requires:    libgcrypt >= 1.6.0}
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
 Implementation of the Trusted Computing Group's (TCG) TPM2 Software
 Stack (TSS).
 
+%description -l pl.UTF-8
+Implementacja specyfikacji TPM2 Software Stack (TSS), stworzonej przez
+Trusted Computing Group (TCG).
+
 %package devel
-Summary:       Header files and develpment documentation for tpm2-tss
-Summary(es.UTF-8):     Arquivos de cabeçalho e bibliotecas de desenvolvimento para tpm2-tss
-Summary(pl.UTF-8):     Pliki nagłówkowe i dokumetacja do tpm2-tss
-Summary(pt_BR.UTF-8):  Bibliotecas e arquivos de inclusão para a tpm2-tss
-Summary(ru.UTF-8):     ХедеÑ\80Ñ\8b и библиоÑ\82еки пÑ\80огÑ\80амиÑ\81Ñ\82а длÑ\8f tpm2-tss
-Summary(uk.UTF-8):     Хедери та бібліотеки програміста для tpm2-tss
+Summary:       Header files for tpm2-tss
+Summary(es.UTF-8):     Arquivos de cabeçalho para tpm2-tss
+Summary(pl.UTF-8):     Pliki nagłówkowe do tpm2-tss
+Summary(pt_BR.UTF-8):  Arquivos de inclusão para a tpm2-tss
+Summary(ru.UTF-8):     Хедеры для tpm2-tss
+Summary(uk.UTF-8):     Хедери для tpm2-tss
 Group:         Development/Libraries
-Requires:      %{name} = %{epoch}:%{version}-%{release}
+Requires:      %{name} = %{version}-%{release}
+Requires:      curl-devel
+Requires:      json-c-devel
+%{?with_libgcrypt:Requires:    libgcrypt-devel >= 1.6.0}
+%{!?with_libgcrypt:Requires:   openssl-devel}
 
 %description devel
-Implementation of the Trusted Computing Group's (TCG) TPM2 Software
-Stack (TSS). Header files and documentation.
+Header files for implementation of the Trusted Computing Group's (TCG)
+TPM2 Software Stack (TSS).
 
 %description devel -l pl.UTF-8
-Pliki nagłówkowe i dokumentacja do tpm2-tss.
-
-%description devel -l pt_BR.UTF-8
-Tcpdump imprime os cabeçalhos dos pacotes em uma interface de rede.
-Ele é muito prático para resolver problemas na rede e para operações
-de segurança.
+Pliki nagłówkowe implementacji Trusted Computing Group (TCG) TPM2
+Software Stack (TSS).
 
 %description devel -l ru.UTF-8
-Хедеры и библиотеки програмиста, необходимые для программирования с
-tpm2-tss.
+Хедеры необходимые для программирования с tpm2-tss.
 
 %description devel -l uk.UTF-8
-Хедери та бібліотеки програміста, необхідні для програмування з
-tpm2-tss.
+Хедери необхідні для програмування з tpm2-tss.
 
 %package static
 Summary:       Static tpm2-tss library
@@ -55,7 +69,7 @@ Summary(pt_BR.UTF-8): Biblioteca estática de desenvolvimento
 Summary(ru.UTF-8):     Статическая библиотека tpm2-tss
 Summary(uk.UTF-8):     Статична бібліотека tpm2-tss
 Group:         Development/Libraries
-Requires:      %{name}-devel = %{epoch}:%{version}-%{release}
+Requires:      %{name}-devel = %{version}-%{release}
 
 %description static
 Implementation of the Trusted Computing Group's (TCG) TPM2 Software
@@ -63,11 +77,6 @@ Stack (TSS).
 
 This package contains the static library used for development.
 
-%description static -l pt_BR.UTF-8
-Tcpdump imprime os cabeçalhos dos pacotes em uma interface de rede.
-Ele é muito prático para resolver problemas na rede e para operações
-de segurança.
-
 %description static -l pl.UTF-8
 Biblioteka statyczna tpm2-tss.
 
@@ -81,8 +90,14 @@ Biblioteka statyczna tpm2-tss.
 %setup -q
 
 %build
+%{__libtoolize}
+%{__aclocal} -I m4
+%{__autoconf}
+%{__autoheader}
+%{__automake}
 %configure \
        --disable-silent-rules \
+       --with-tmpfilesdir=%{systemdtmpfilesdir} \
        --with-udevrulesdir=/lib/udev/rules.d \
        --with-udevrulesprefix=60-
 
@@ -94,6 +109,9 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
+# obsoleted by pkg-config
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/libtss2*.la
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -102,22 +120,68 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc AUTHORS CHANGELOG.md CONTRIBUTING.md LICENSE MAINTAINERS README.md RELEASE.md
-%attr(755,root,root) %{_libdir}/libtss2*.so.*.*
-%attr(755,root,root) %ghost %{_libdir}/libtss2*.so.0
-%{_mandir}/man7/tss2-*.7*
+%doc AUTHORS CHANGELOG.md CONTRIBUTING.md LICENSE MAINTAINERS README.md
+%attr(755,root,root) %{_libdir}/libtss2-esys.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libtss2-esys.so.0
+%attr(755,root,root) %{_libdir}/libtss2-fapi.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libtss2-fapi.so.0
+%attr(755,root,root) %{_libdir}/libtss2-mu.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libtss2-mu.so.0
+%attr(755,root,root) %{_libdir}/libtss2-rc.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libtss2-rc.so.0
+%attr(755,root,root) %{_libdir}/libtss2-sys.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libtss2-sys.so.0
+%attr(755,root,root) %{_libdir}/libtss2-tcti-device.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libtss2-tcti-device.so.0
+%attr(755,root,root) %{_libdir}/libtss2-tcti-mssim.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libtss2-tcti-mssim.so.0
+%attr(755,root,root) %{_libdir}/libtss2-tctildr.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libtss2-tctildr.so.0
+%dir %{_sysconfdir}/tpm2-tss
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/tpm2-tss/fapi-config.json
+%dir %{_sysconfdir}/tpm2-tss/fapi-profiles
+%{_sysconfdir}/tpm2-tss/fapi-profiles/P_ECCP256SHA256.json
+%{_sysconfdir}/tpm2-tss/fapi-profiles/P_RSA2048SHA256.json
+%{systemdtmpfilesdir}/tpm2-tss-fapi.conf
 /lib/udev/rules.d/60-tpm-udev.rules
+# what subsystem handles this?
+#/etc/sysusers.d/tpm2-tss.conf
 
 %files devel
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libtss2*.so
+%attr(755,root,root) %{_libdir}/libtss2-esys.so
+%attr(755,root,root) %{_libdir}/libtss2-fapi.so
+%attr(755,root,root) %{_libdir}/libtss2-mu.so
+%attr(755,root,root) %{_libdir}/libtss2-rc.so
+%attr(755,root,root) %{_libdir}/libtss2-sys.so
+%attr(755,root,root) %{_libdir}/libtss2-tcti-device.so
+%attr(755,root,root) %{_libdir}/libtss2-tcti-mssim.so
+%attr(755,root,root) %{_libdir}/libtss2-tctildr.so
 %{_includedir}/tss2
-%{_libdir}/libtss2*.la
-%{_pkgconfigdir}/tss2*.pc
-%{_mandir}/man3/ESYS*.3*
-%{_mandir}/man3/Esys*.3*
-%{_mandir}/man3/Tss2*.3*
+%{_pkgconfigdir}/tss2-esys.pc
+%{_pkgconfigdir}/tss2-fapi.pc
+%{_pkgconfigdir}/tss2-mu.pc
+%{_pkgconfigdir}/tss2-rc.pc
+%{_pkgconfigdir}/tss2-sys.pc
+%{_pkgconfigdir}/tss2-tcti-device.pc
+%{_pkgconfigdir}/tss2-tcti-mssim.pc
+%{_pkgconfigdir}/tss2-tctildr.pc
+%{_mandir}/man3/ESYS_*.3*
+%{_mandir}/man3/Esys_*.3*
+%{_mandir}/man3/FapiTestgroup.3*
+%{_mandir}/man3/Fapi_*.3*
+%{_mandir}/man3/Tss2_*.3*
+%{_mandir}/man7/tss2-tcti-device.7*
+%{_mandir}/man7/tss2-tcti-mssim.7*
+%{_mandir}/man7/tss2-tctildr.7*
 
 %files static
 %defattr(644,root,root,755)
-%{_libdir}/libtss2*.a
+%{_libdir}/libtss2-esys.a
+%{_libdir}/libtss2-fapi.a
+%{_libdir}/libtss2-mu.a
+%{_libdir}/libtss2-rc.a
+%{_libdir}/libtss2-sys.a
+%{_libdir}/libtss2-tcti-device.a
+%{_libdir}/libtss2-tcti-mssim.a
+%{_libdir}/libtss2-tctildr.a