From 722545cd47c4cd9a5a1f3beb353ef29ddad058da4706a28d20732d053a8e0486 Mon Sep 17 00:00:00 2001 From: Matthias Gerstner Date: Fri, 29 Jan 2021 13:09:40 +0000 Subject: [PATCH 1/3] note about download_files magic OBS-URL: https://build.opensuse.org/package/show/security/tpm2.0-tools?expand=0&rev=66 --- _service | 1 + 1 file changed, 1 insertion(+) diff --git a/_service b/_service index d513e4e..48f308b 100644 --- a/_service +++ b/_service @@ -1,4 +1,5 @@ + https://github.com/intel/tpm2-tools.git git From f914fdbf722ec27f526043c0bfb4e2718d6d0f4f98b778d8b4f1a2621cc38c09 Mon Sep 17 00:00:00 2001 From: Matthias Gerstner Date: Tue, 2 Feb 2021 12:23:20 +0000 Subject: [PATCH 2/3] explicitly mark %license OBS-URL: https://build.opensuse.org/package/show/security/tpm2.0-tools?expand=0&rev=67 --- tpm2.0-tools.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tpm2.0-tools.spec b/tpm2.0-tools.spec index f34d7d6..1fbe157 100644 --- a/tpm2.0-tools.spec +++ b/tpm2.0-tools.spec @@ -84,7 +84,8 @@ find %{buildroot} -type f -name "*.la" -delete -print %files %defattr(-,root,root) -%doc README.md doc/LICENSE doc/CHANGELOG.md +%doc README.md doc/CHANGELOG.md +%license doc/LICENSE /usr/bin/tpm2* /usr/bin/tss2* %{_mandir}/man1/tpm2* From d836ba03609d4bc3c7eebd19354e55f0f6cd0218655cb0dda268488f975dc432 Mon Sep 17 00:00:00 2001 From: Matthias Gerstner Date: Tue, 4 May 2021 08:56:15 +0000 Subject: [PATCH 3/3] - fix `--version` output of tools. Since now autoreconf is called and configure.ac attempts to fetch the version from git (which we don't have during building), the version was empty. Fix this by replacing the git invocation in configure.ac. OBS-URL: https://build.opensuse.org/package/show/security/tpm2.0-tools?expand=0&rev=68 --- tpm2.0-tools.changes | 8 ++++++++ tpm2.0-tools.spec | 3 +++ 2 files changed, 11 insertions(+) diff --git a/tpm2.0-tools.changes b/tpm2.0-tools.changes index 362d529..73e0ab0 100644 --- a/tpm2.0-tools.changes +++ b/tpm2.0-tools.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Tue May 4 08:55:06 UTC 2021 - Matthias Gerstner + +- fix `--version` output of tools. Since now autoreconf is called and + configure.ac attempts to fetch the version from git (which we don't have + during building), the version was empty. Fix this by replacing the git + invocation in configure.ac. + ------------------------------------------------------------------- Thu Jan 28 09:49:06 UTC 2021 - Matthias Gerstner diff --git a/tpm2.0-tools.spec b/tpm2.0-tools.spec index 1fbe157..931c2f8 100644 --- a/tpm2.0-tools.spec +++ b/tpm2.0-tools.spec @@ -71,6 +71,9 @@ associated interfaces. %build # TODO: remove autoreconf once fix_pie_linking patch is no longer needed +# until then we need to repair the version specification which configure.ac +# wants to read from GIT which isn't there. +sed -i 's/m4_esyscmd_s([^)]\+)/%{version}/g' configure.ac autoreconf -fvi %configure --disable-static make %{?_smp_mflags}