commit 1e0c40e223f54f3e60332efe9f5a83c8b58552f0 Author: Marcin Krol <h...@tld-linux.org> Date: Sat May 18 14:39:40 2024 +0200
- updated to 4.1.2, added bcond and patch to force libftdi1 prefer-libftdi1.patch | 20 ++++++++++++++++++++ tpm2-tss.spec | 11 +++++++++-- 2 files changed, 29 insertions(+), 2 deletions(-) --- diff --git a/tpm2-tss.spec b/tpm2-tss.spec index 22d1f84..874f556 100644 --- a/tpm2-tss.spec +++ b/tpm2-tss.spec @@ -1,18 +1,20 @@ # # Conditional build: +%bcond_with libftdi1 # build with libftdi1 instead of old libftdi %bcond_with mbedtls # mbedTLS crypto instead of OpenSSL %bcond_without static_libs # static libraries 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: 4.1.1 +Version: 4.1.2 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: d50302e29150823254b9f1594add6dcd +# Source0-md5: aae8af8e88dcd1dfe152e1a3f590ef6f +Patch0: prefer-libftdi1.patch URL: https://github.com/tpm2-software/tpm2-tss BuildRequires: autoconf >= 2.50 BuildRequires: automake @@ -20,7 +22,11 @@ BuildRequires: curl-devel BuildRequires: doxygen BuildRequires: json-c-devel >= 0.13 # or libftdi1-devel, but version 0 is preferred (as of tpm2-tss 4.1.1) +%if %{with libftdi1} +BuildRequires: libftdi1-devel +%else BuildRequires: libftdi-devel +%endif BuildRequires: libltdl-devel >= 2:2 BuildRequires: libtool >= 2:2 BuildRequires: libtpms-devel @@ -107,6 +113,7 @@ Biblioteka statyczna tpm2-tss. %prep %setup -q +%{?with_libftdi1:%patch0 -p1} # set VERSION properly when there is no .git directory %{__sed} -i -e 's/m4_esyscmd_s(\[git describe --tags --always --dirty\])/%{version}/' configure.ac diff --git a/prefer-libftdi1.patch b/prefer-libftdi1.patch new file mode 100644 index 0000000..7728841 --- /dev/null +++ b/prefer-libftdi1.patch @@ -0,0 +1,20 @@ +diff -ur tpm2-tss-4.1.2.orig/configure.ac tpm2-tss-4.1.2/configure.ac +--- tpm2-tss-4.1.2.orig/configure.ac 2024-05-10 10:49:59.000000000 +0200 ++++ tpm2-tss-4.1.2/configure.ac 2024-05-18 14:29:23.322225666 +0200 +@@ -342,12 +342,12 @@ + AC_DEFINE([TCTI_SPIDEV],[1], [TCTI FOR SPIDEV BASED ACCESS TO TPM])) + + PKG_CHECK_MODULES([LIBFTDI], +- [libftdi], +- [AC_DEFINE(LIBFTDI_VERSION, [0], [libftdi version 0.x])] ++ [libftdi1], ++ [AC_DEFINE(LIBFTDI_VERSION, [1], [libftdi version 1.x])] + [have_libftdi=yes], + [PKG_CHECK_MODULES([LIBFTDI], +- [libftdi1], +- [AC_DEFINE(LIBFTDI_VERSION, [1], [libftdi version 1.x])] ++ [libftdi], ++ [AC_DEFINE(LIBFTDI_VERSION, [0], [libftdi version 0.x])] + [have_libftdi=yes], + [have_libftdi=no])]) + ================================================================ ---- gitweb: http://git.pld-linux.org/gitweb.cgi/packages/tpm2-tss.git/commitdiff/1e0c40e223f54f3e60332efe9f5a83c8b58552f0 _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit