Accepting request 509846 from multimedia:libs

1

OBS-URL: https://build.opensuse.org/request/show/509846
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ftgl?expand=0&rev=29

ftgl.changes

@@ -1,3 +1,24 @@
+-------------------------------------------------------------------
+Wed Jul 12 11:11:59 UTC 2017 - jengelh@inai.de
+
+- Remove --with-pic which is only for static libs.
+- RPM group fix.
+- Trim redundant wording from description.
+
+-------------------------------------------------------------------
+Wed Jul 12 06:42:35 UTC 2017 - tchvatal@suse.com
+
+- Trim a bit description and fix group for demo
+
+-------------------------------------------------------------------
+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
 

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
@@ -16,95 +16,52 @@
 #
 
 
+%define libname libftgl2
 Name:           ftgl
 Version:        2.1.3~rc5
 Release:        0
 Summary:        Library for Using Arbitrary Fonts in OpenGL Applications
 License:        LGPL-2.1+
-Group:          System/Libraries
+Group:          Development/Libraries/C and C++
 Url:            http://ftgl.wiki.sourceforge.net/
 Source0:        http://sourceforge.net/projects/ftgl/files/FTGL%%20Source/2.1.3%%7Erc5/%{name}-2.1.3-rc5.tar.bz2
 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:  pkgconfig
+BuildRequires:  texlive-epstopdf
 BuildRequires:  pkgconfig(freetype2)
 BuildRequires:  pkgconfig(glu)
 BuildRequires:  pkgconfig(ice)
 BuildRequires:  pkgconfig(libdrm)
 BuildRequires:  pkgconfig(x11)
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
-FTGL is a free open source library that enables developers to use
+FTGL is a C++ library using Freetype2 to render fonts in OpenGL
-arbitrary fonts in their OpenGL (www.opengl.org) applications.
+applications. FTGL supports bitmaps, pixmaps, texture maps, outlines,
-
+polygon mesh, and extruded polygon rendering modes.
-Unlike other OpenGL font libraries, FTGL uses standard font file
-formats, so there is no need of a preprocessing step to convert the
-high quality font data into a lesser quality, proprietary format.
-
-FTGL uses the Freetype (www.freetype.org) font library to open and
-'decode' the fonts. It then takes that output and stores it in a format
-that is most efficient for OpenGL rendering.
-
-The supported rendering modes are:
-
-- Bit maps
-
-- Antialiased Pix maps
-
-- Outlines
-
-- Polygon meshes
-
-- Extruded polygon meshes
-
-- Texture maps
-
-- Buffer maps
 
 %package -n libftgl2
 Summary:        Library for Using Arbitrary Fonts in OpenGL Applications
 Group:          System/Libraries
-Provides:       ftgl:%{_libdir}/libftgl.so.0
 
 %description -n libftgl2
-FTGL is a free open source library that enables developers to use
+FTGL is a C++ library using Freetype2 to render fonts in OpenGL
-arbitrary fonts in their OpenGL (www.opengl.org) applications.
+applications. FTGL supports bitmaps, pixmaps, texture maps, outlines,
-
+polygon mesh, and extruded polygon rendering modes.
-Unlike other OpenGL font libraries, FTGL uses standard font file
-formats, so there is no need of a preprocessing step to convert the
-high quality font data into a lesser quality, proprietary format.
-
-FTGL uses the Freetype (www.freetype.org) font library to open and
-'decode' the fonts. It then takes that output and stores it in a format
-that is most efficient for OpenGL rendering.
-
-The supported rendering modes are:
-
-- Bit maps
-
-- Antialiased Pix maps
-
-- Outlines
-
-- Polygon meshes
-
-- Extruded polygon meshes
-
-- Texture maps
-
-- Buffer maps
 
 %package devel
-Summary:        Library for Using Arbitrary Fonts in OpenGL Applications
+Summary:        Development files for the FTGL OpenGL font managing library
 Group:          Development/Libraries/C and C++
 Requires:       Mesa-devel
 Requires:       freetype2-devel
@@ -112,72 +69,34 @@ Requires:       libftgl2 = %{version}
 Requires:       pkgconfig(glu)
 
 %description devel
-FTGL is a free open source library that enables developers to use
+FTGL is a C++ library using Freetype2 to render fonts in OpenGL
-   arbitrary fonts in their OpenGL (www.opengl.org) applications.
+applications. FTGL supports bitmaps, pixmaps, texture maps, outlines,
-   Unlike other OpenGL font libraries, FTGL uses standard font file
+polygon mesh, and extruded polygon rendering modes.
-   formats, so there is no need of a preprocessing step to convert
-   the high quality font data into a lesser quality, proprietary
-   format. FTGL uses the Freetype (www.freetype.org) font library to
-   open and 'decode' the fonts. It then takes that output and stores
-   it in a format that is most efficient for OpenGL rendering. The
-   supported rendering modes are: - Bit maps
 
-- Antialiased Pix maps
+This package provides development files.
-
-- Texture maps
-
-- Outlines
-
-- Polygon meshes
-
-- Extruded polygon meshes FTGL is designed to be used in commercial
-quality software. It has been written with a focus on performance,
-robustness, and simplicity.
 
 %package demo
-Summary:        Library for Using Arbitrary Fonts in OpenGL Applications
+Summary:        Demos for FTGL OpenGL font managing library
-Group:          System/Libraries
+Group:          Development/Tools/Other
-# Up to openSUSE 11.0 and SLED 10, %%{_bindir}/FTGLDemo was part of ftgl-devel:
 Conflicts:      %{name}-devel <= 2.1.2
 
 %description demo
-FTGL is a free open source library that enables developers to use
+FTGL is a C++ library using Freetype2 to render fonts in OpenGL
-arbitrary fonts in their OpenGL (www.opengl.org) applications.
+applications. FTGL supports bitmaps, pixmaps, texture maps, outlines,
+polygon mesh, and extruded polygon rendering modes.
 
-Unlike other OpenGL font libraries, FTGL uses standard font file
+This package provides demo application showing usage of the library.
-formats, so there is no need of a preprocessing step to convert the
-high quality font data into a lesser quality, proprietary format.
-
-FTGL uses the Freetype (www.freetype.org) font library to open and
-'decode' the fonts. It then takes that output and stores it in a format
-that is most efficient for OpenGL rendering.
-
-The supported rendering modes are:
-
-- Bit maps
-
-- Antialiased Pix maps
-
-- Outlines
-
-- Polygon meshes
-
-- Extruded polygon meshes
-
-- Texture maps
-
-- Buffer maps
 
 %prep
 %setup -q
 %patch0
 %patch1
 %patch2
+%patch3 -p1
 
 %build
-./autogen.sh
+autoreconf -fvi
 %configure \
-	--with-pic \
 	--disable-static
 make %{?_smp_mflags} documentationdir=%{_docdir}/%{name}
 
@@ -195,20 +114,16 @@ mkdir -p %{buildroot}%{_defaultdocdir}/%{name}-demo
 cp -pr *.cpp *.c *.h %{buildroot}%{_defaultdocdir}/%{name}-demo
 cd ..
 find %{buildroot} -type f -name "*.la" -delete -print
-grep -r include %{buildroot}%{_includedir} | awk -F: '{print $2}'
 
 %post -n libftgl2 -p /sbin/ldconfig
-
 %postun -n libftgl2 -p /sbin/ldconfig
 
 %files -n libftgl2
-%defattr (-, root, root)
 %doc %dir %{_defaultdocdir}/libftgl2
 %doc %{_defaultdocdir}/libftgl2/[ABCNRT]*
 %{_libdir}/*.so.*
 
 %files devel
-%defattr (-, root, root)
 %doc %dir %{_defaultdocdir}/%{name}
 %doc %{_defaultdocdir}/%{name}/html
 %doc %{_defaultdocdir}/%{name}/*.txt
@@ -217,7 +132,6 @@ grep -r include %{buildroot}%{_includedir} | awk -F: '{print $2}'
 %{_libdir}/pkgconfig/*.pc
 
 %files demo
-%defattr (-, root, root)
 %doc %dir %{_defaultdocdir}/%{name}
 %doc %{_defaultdocdir}/%{name}-demo
 %{_bindir}/FTGLDemo

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 \