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
This commit is contained in:
parent
60eb378eba
commit
f58fab3026
@ -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
|
Tue Apr 14 11:47:21 CEST 2015 - tiwai@suse.de
|
||||||
|
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
#
|
#
|
||||||
# spec file for package ftgl
|
# 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
|
# All modifications and additions to the file contributed by third parties
|
||||||
# remain the property of their copyright owners, unless otherwise agreed
|
# remain the property of their copyright owners, unless otherwise agreed
|
||||||
@ -28,13 +28,17 @@ Source1: baselibs.conf
|
|||||||
Patch0: %{name}-autoreconf.patch
|
Patch0: %{name}-autoreconf.patch
|
||||||
Patch1: ftgl-pkgconfig.patch
|
Patch1: ftgl-pkgconfig.patch
|
||||||
Patch2: ftgl-fix-no-add-needed.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: autoconf
|
||||||
BuildRequires: automake
|
BuildRequires: automake
|
||||||
BuildRequires: doxygen
|
BuildRequires: doxygen
|
||||||
BuildRequires: freeglut-devel
|
BuildRequires: freeglut-devel
|
||||||
BuildRequires: gcc-c++
|
BuildRequires: gcc-c++
|
||||||
|
BuildRequires: ghostscript
|
||||||
BuildRequires: libtool
|
BuildRequires: libtool
|
||||||
BuildRequires: pkg-config
|
BuildRequires: pkg-config
|
||||||
|
BuildRequires: texlive-epstopdf
|
||||||
BuildRequires: pkgconfig(freetype2)
|
BuildRequires: pkgconfig(freetype2)
|
||||||
BuildRequires: pkgconfig(glu)
|
BuildRequires: pkgconfig(glu)
|
||||||
BuildRequires: pkgconfig(ice)
|
BuildRequires: pkgconfig(ice)
|
||||||
@ -136,8 +140,8 @@ robustness, and simplicity.
|
|||||||
|
|
||||||
%package demo
|
%package demo
|
||||||
Summary: Library for Using Arbitrary Fonts in OpenGL Applications
|
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:
|
# Up to openSUSE 11.0 and SLED 10, %%{_bindir}/FTGLDemo was part of ftgl-devel:
|
||||||
|
Group: System/Libraries
|
||||||
Conflicts: %{name}-devel <= 2.1.2
|
Conflicts: %{name}-devel <= 2.1.2
|
||||||
|
|
||||||
%description demo
|
%description demo
|
||||||
@ -173,6 +177,7 @@ The supported rendering modes are:
|
|||||||
%patch0
|
%patch0
|
||||||
%patch1
|
%patch1
|
||||||
%patch2
|
%patch2
|
||||||
|
%patch3 -p1
|
||||||
|
|
||||||
%build
|
%build
|
||||||
./autogen.sh
|
./autogen.sh
|
||||||
|
11
install-FTVectoriser.h.patch
Normal file
11
install-FTVectoriser.h.patch
Normal file
@ -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 \
|
Loading…
Reference in New Issue
Block a user