Re-enable ESAPI for gcrypt dependency is not an issue for Fedora

This commit is contained in:
Yunying Sun 2018-07-04 13:32:51 +08:00
parent a4c7fc0d05
commit 7473be8b4c

View File

@ -1,6 +1,6 @@
Name: tpm2-tss
Version: 2.0.0
Release: 1%{?dist}
Release: 2%{?dist}
Summary: TPM2.0 Software Stack
# The entire source code is under BSD except implementation.h and tpmb.h which
@ -17,6 +17,7 @@ BuildRequires: autoconf-archive
BuildRequires: libtool
BuildRequires: pkgconfig
BuildRequires: systemd
BuildRequires: libgcrypt-devel
%description
tpm2-tss is a software stack supporting Trusted Platform Module(TPM) 2.0 system
@ -27,10 +28,8 @@ APIs for applications to access TPM module through kernel TPM drivers.
%autosetup -n %{name}-%{version}
%build
# ESAPI, which was added in TSS 2.0 uses gcry_mac_open() from libgcrypt 1.6.
# However latest libgcrypt available for RHEL7 is 1.5.3, which leads to TSS2.0
# build failure. So here disable esapi support to make TSS2.0 work.
%configure --disable-static --disable-silent-rules --enable-esapi=no --with-udevrulesdir=%{_udevrulesdir} --with-udevrulesprefix=%{udevrules_prefix}
# Use built-in tpm-udev.rules, with specified installation path and prefix.
%configure --disable-static --disable-silent-rules --with-udevrulesdir=%{_udevrulesdir} --with-udevrulesprefix=%{udevrules_prefix}
# This is to fix Rpath errors. Taken from https://fedoraproject.org/wiki/Packaging:Guidelines#Removing_Rpath
sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
@ -47,6 +46,7 @@ find %{buildroot}%{_libdir} -type f -name \*.la -delete
%license LICENSE
%{_libdir}/libtss2-mu.so.*
%{_libdir}/libtss2-sys.so.*
%{_libdir}/libtss2-esys.so.*
%{_libdir}/libtss2-tcti-device.so.*
%{_libdir}/libtss2-tcti-mssim.so.*
%{_udevrulesdir}/%{udevrules_prefix}tpm-udev.rules
@ -64,10 +64,12 @@ use tpm2-tss.
%{_includedir}/tss2/
%{_libdir}/libtss2-mu.so
%{_libdir}/libtss2-sys.so
%{_libdir}/libtss2-esys.so
%{_libdir}/libtss2-tcti-device.so
%{_libdir}/libtss2-tcti-mssim.so
%{_libdir}/pkgconfig/tss2-mu.pc
%{_libdir}/pkgconfig/tss2-sys.pc
%{_libdir}/pkgconfig/tss2-esys.pc
%{_libdir}/pkgconfig/tss2-tcti-device.pc
%{_libdir}/pkgconfig/tss2-tcti-mssim.pc
%{_mandir}/man3/Tss2*.3.gz
@ -78,6 +80,10 @@ use tpm2-tss.
%postun -p /sbin/ldconfig
%changelog
* Wed Jul 4 2018 Yunying Sun <yunying.sun@intel.com> - 2.0.0-2
- Re-enable ESAPI since gcrypt dependency is not an issue for Fedora
- Bump release version to 2.0.0-2
* Mon Jul 2 2018 Yunying Sun <yunying.sun@intel.com> - 2.0.0-1
- Update to 2.0.0 release (RHBZ#1508870)
- Remove patch file 60-tpm-udev.rules, use upstream tpm-udev.rules instead