From 190967a2549e33ec0b8bb7a294bbf3a2a24746cbe6e642969503f5e4aa40c91f Mon Sep 17 00:00:00 2001 From: Matthias Gerstner Date: Wed, 7 Mar 2018 14:45:11 +0000 Subject: [PATCH 1/2] - disable pandoc/man pages generation on SLE-15, because pandoc is not available there (and adding it would require two dozen additional haskell packages) OBS-URL: https://build.opensuse.org/package/show/security/tpm2.0-tools?expand=0&rev=34 --- tpm2.0-tools.changes | 7 +++++++ tpm2.0-tools.spec | 4 ++++ 2 files changed, 11 insertions(+) diff --git a/tpm2.0-tools.changes b/tpm2.0-tools.changes index da0a44c..0a92861 100644 --- a/tpm2.0-tools.changes +++ b/tpm2.0-tools.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Mar 7 14:29:10 UTC 2018 - matthias.gerstner@suse.com + +- disable pandoc/man pages generation on SLE-15, because pandoc is not + available there (and adding it would require two dozen additional haskell + packages) + ------------------------------------------------------------------- Thu Feb 22 11:08:19 UTC 2018 - matthias.gerstner@suse.com diff --git a/tpm2.0-tools.spec b/tpm2.0-tools.spec index 56ce3ae..afeb89e 100644 --- a/tpm2.0-tools.spec +++ b/tpm2.0-tools.spec @@ -31,7 +31,9 @@ BuildRequires: gcc-c++ BuildRequires: libcurl-devel BuildRequires: libopenssl-devel BuildRequires: libtool +%if 0%{?sle_version} != 150000 BuildRequires: pandoc +%endif BuildRequires: pkgconfig BuildRequires: tpm2-0-tss-devel BuildRequires: tpm2.0-abrmd-devel @@ -65,6 +67,8 @@ find %{buildroot} -type f -name "*.la" -delete -print %defattr(-,root,root) %doc README.md LICENSE CHANGELOG.md /usr/bin/tpm2_* +%if 0%{?sle_version} != 150000 %{_mandir}/man1/tpm2_* +%endif %changelog From b936ba61f5751651bff7f690c241a608bf0e5b8f39a591810f2730960636b965 Mon Sep 17 00:00:00 2001 From: Matthias Gerstner Date: Wed, 7 Mar 2018 15:44:46 +0000 Subject: [PATCH 2/2] - disable pandoc for all but openSUSE, since pandoc never was on SLE OBS-URL: https://build.opensuse.org/package/show/security/tpm2.0-tools?expand=0&rev=35 --- tpm2.0-tools.changes | 5 +++++ tpm2.0-tools.spec | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/tpm2.0-tools.changes b/tpm2.0-tools.changes index 0a92861..24c3035 100644 --- a/tpm2.0-tools.changes +++ b/tpm2.0-tools.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Mar 7 15:44:14 UTC 2018 - matthias.gerstner@suse.com + +- disable pandoc for all but openSUSE, since pandoc never was on SLE + ------------------------------------------------------------------- Wed Mar 7 14:29:10 UTC 2018 - matthias.gerstner@suse.com diff --git a/tpm2.0-tools.spec b/tpm2.0-tools.spec index afeb89e..57efd68 100644 --- a/tpm2.0-tools.spec +++ b/tpm2.0-tools.spec @@ -31,7 +31,7 @@ BuildRequires: gcc-c++ BuildRequires: libcurl-devel BuildRequires: libopenssl-devel BuildRequires: libtool -%if 0%{?sle_version} != 150000 +%if 0%{?is_opensuse} BuildRequires: pandoc %endif BuildRequires: pkgconfig @@ -67,7 +67,7 @@ find %{buildroot} -type f -name "*.la" -delete -print %defattr(-,root,root) %doc README.md LICENSE CHANGELOG.md /usr/bin/tpm2_* -%if 0%{?sle_version} != 150000 +%if 0%{?is_opensuse} %{_mandir}/man1/tpm2_* %endif