From f58fab30265cb14bd65fe350e795e6c34303153be38d48084698f9b157608762 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Wed, 12 Jul 2017 06:26:39 +0000 Subject: [PATCH] Accepting request 506817 from home:kwk:branches:multimedia:libs - add install-FTVectoriser.h.patch install FTVectoriser.h, required by tulip-5.0 - fix documentation build (add texlive-epstopdf and ghostscript to BuildRequires) OBS-URL: https://build.opensuse.org/request/show/506817 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/ftgl?expand=0&rev=17 --- ftgl.changes | 9 +++++++++ ftgl.spec | 9 +++++++-- install-FTVectoriser.h.patch | 11 +++++++++++ 3 files changed, 27 insertions(+), 2 deletions(-) create mode 100644 install-FTVectoriser.h.patch diff --git a/ftgl.changes b/ftgl.changes index f0bbdaf..7acafa5 100644 --- a/ftgl.changes +++ b/ftgl.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Wed Jun 28 13:15:29 UTC 2017 - kkaempf@suse.com + +- add install-FTVectoriser.h.patch + install FTVectoriser.h, required by tulip-5.0 + +- fix documentation build + (add texlive-epstopdf and ghostscript to BuildRequires) + ------------------------------------------------------------------- Tue Apr 14 11:47:21 CEST 2015 - tiwai@suse.de diff --git a/ftgl.spec b/ftgl.spec index 2f4ba48..2a6a5de 100644 --- a/ftgl.spec +++ b/ftgl.spec @@ -1,7 +1,7 @@ # # spec file for package ftgl # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -28,13 +28,17 @@ Source1: baselibs.conf Patch0: %{name}-autoreconf.patch 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 BuildRequires: autoconf BuildRequires: automake BuildRequires: doxygen BuildRequires: freeglut-devel BuildRequires: gcc-c++ +BuildRequires: ghostscript BuildRequires: libtool BuildRequires: pkg-config +BuildRequires: texlive-epstopdf BuildRequires: pkgconfig(freetype2) BuildRequires: pkgconfig(glu) BuildRequires: pkgconfig(ice) @@ -136,8 +140,8 @@ robustness, and simplicity. %package demo Summary: Library for Using Arbitrary Fonts in OpenGL Applications -Group: System/Libraries # Up to openSUSE 11.0 and SLED 10, %%{_bindir}/FTGLDemo was part of ftgl-devel: +Group: System/Libraries Conflicts: %{name}-devel <= 2.1.2 %description demo @@ -173,6 +177,7 @@ The supported rendering modes are: %patch0 %patch1 %patch2 +%patch3 -p1 %build ./autogen.sh diff --git a/install-FTVectoriser.h.patch b/install-FTVectoriser.h.patch new file mode 100644 index 0000000..4503cd4 --- /dev/null +++ b/install-FTVectoriser.h.patch @@ -0,0 +1,11 @@ +diff -ruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache -x .deps -x .libs ../orig-ftgl-2.1.3~rc5/src/Makefile.am ./src/Makefile.am +--- ../orig-ftgl-2.1.3~rc5/src/Makefile.am 2008-05-23 09:13:42.000000000 +0200 ++++ ./src/Makefile.am 2017-06-28 15:13:01.803157035 +0200 +@@ -39,6 +39,7 @@ + ftgl_HEADERS = $(ftgl_headers) + + ftgl_headers = \ ++ FTVectoriser.h \ + FTGL/ftgl.h \ + FTGL/FTBBox.h \ + FTGL/FTBuffer.h \