From 4e97cf027467f626de8d151985ee5963e2bf0dbc9d6eb6c0a1c90e2e975a57a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Mon, 11 Mar 2019 08:33:30 +0000 Subject: [PATCH] Accepting request 682907 from home:olh:branches:multimedia:libs - Add conditional for html docs, SLE_12 has no epstopdf OBS-URL: https://build.opensuse.org/request/show/682907 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/ftgl?expand=0&rev=25 --- ftgl.changes | 5 +++++ ftgl.spec | 9 +++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/ftgl.changes b/ftgl.changes index a14f069..0a807bb 100644 --- a/ftgl.changes +++ b/ftgl.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Mar 8 16:41:52 UTC 2019 - olaf@aepfle.de + +- Add conditional for html docs, SLE_12 has no epstopdf + ------------------------------------------------------------------- Mon Mar 26 12:52:27 UTC 2018 - crrodriguez@opensuse.org diff --git a/ftgl.spec b/ftgl.spec index 16afb2d..d76c908 100644 --- a/ftgl.spec +++ b/ftgl.spec @@ -17,6 +17,7 @@ %define libname libftgl2 +%bcond_without ftgl_html Name: ftgl Version: 2.1.3~rc5 Release: 0 @@ -31,15 +32,17 @@ Patch1: ftgl-pkgconfig.patch Patch2: ftgl-fix-no-add-needed.patch # PATCH-FIX-OPENSUSE: install FTVectoriser.h, required by tulip-5.0; kkaempf@suse.de Patch3: install-FTVectoriser.h.patch +%if %{with ftgl_html} +BuildRequires: doxygen +BuildRequires: texlive-epstopdf +%endif BuildRequires: autoconf BuildRequires: automake -BuildRequires: doxygen BuildRequires: freeglut-devel BuildRequires: gcc-c++ BuildRequires: ghostscript BuildRequires: libtool BuildRequires: pkgconfig -BuildRequires: texlive-epstopdf BuildRequires: pkgconfig(freetype2) BuildRequires: pkgconfig(gl) BuildRequires: pkgconfig(glu) @@ -123,7 +126,9 @@ find %{buildroot} -type f -name "*.la" -delete -print %files devel %doc %dir %{_defaultdocdir}/%{name} +%if %{with ftgl_html} %doc %{_defaultdocdir}/%{name}/html +%endif %doc %{_defaultdocdir}/%{name}/*.txt %{_includedir}/FTGL %{_libdir}/*.so