From 8ad2db2e38bb3a0287c27abd28fdf18217f543b2dce86040b535f7dc105fe63b Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Tue, 27 Apr 2010 13:04:31 +0000 Subject: [PATCH] Accepting request 38915 from multimedia:libs Copy from multimedia:libs/ftgl based on submit request 38915 from user plater OBS-URL: https://build.opensuse.org/request/show/38915 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ftgl?expand=0&rev=14 --- ftgl-pkgconfig.patch | 11 ++++++++ ftgl.changes | 5 ++++ ftgl.spec | 62 ++++++-------------------------------------- 3 files changed, 24 insertions(+), 54 deletions(-) create mode 100644 ftgl-pkgconfig.patch diff --git a/ftgl-pkgconfig.patch b/ftgl-pkgconfig.patch new file mode 100644 index 0000000..74e9ece --- /dev/null +++ b/ftgl-pkgconfig.patch @@ -0,0 +1,11 @@ +--- ftgl.pc.in ++++ ftgl.pc.in +@@ -5,7 +5,7 @@ + + Name: @PACKAGE_NAME@ + Description: OpenGL frontend to Freetype 2 +-Version: @PACKAGE_VERSION@ ++Version: @LT_VERSION@ + Libs: -L${libdir} -lftgl + Requires.private: freetype2 + Libs.private: @GL_LIBS@ -lm diff --git a/ftgl.changes b/ftgl.changes index 46b0bd1..7f25ad5 100644 --- a/ftgl.changes +++ b/ftgl.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Apr 26 13:01:34 CEST 2010 - ro@suse.de + +- sanitize version in pkgconfig file + ------------------------------------------------------------------- Mon Jan 26 22:45:56 CET 2009 - crrodriguez@suse.de diff --git a/ftgl.spec b/ftgl.spec index 5d64353..5a4e8e6 100644 --- a/ftgl.spec +++ b/ftgl.spec @@ -1,7 +1,7 @@ # # spec file for package ftgl (Version 2.1.2.99.5) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -21,15 +21,16 @@ Name: ftgl BuildRequires: doxygen freeglut-devel freetype2-devel gcc-c++ libdrm-devel Version: 2.1.2.99.5 -Release: 8 +Release: 9 %define _version 2.1.3-rc5 %define __version 2.1.3~rc5 Url: http://ftgl.wiki.sourceforge.net/ Group: System/Libraries -License: LGPL v2.1 or later; X11/MIT +License: LGPLv2.1+ Summary: Library for Using Arbitrary Fonts in OpenGL Applications Source: %{name}-%{_version}.tar.bz2 Patch: %{name}-autoreconf.patch +Patch1: ftgl-pkgconfig.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %define debug_package_requires libftgl2 = %{version}-%{release} @@ -81,7 +82,7 @@ Authors: Daniel Remenak %package -n libftgl2 -License: LGPL v2.1 or later +License: LGPLv2.1+ Group: System/Libraries Summary: Library for Using Arbitrary Fonts in OpenGL Applications Provides: ftgl:/usr/%_lib/libftgl.so.0 @@ -134,7 +135,7 @@ Authors: Daniel Remenak %package devel -License: LGPL v2.1 or later +License: LGPLv2.1+ Group: Development/Libraries/C and C++ Summary: Library for Using Arbitrary Fonts in OpenGL Applications Requires: libftgl2 = %{version} Mesa-devel freetype2-devel @@ -182,7 +183,7 @@ Authors: Daniel Remenak %package demo -License: LGPL v2.1 or later +License: LGPLv2.1+ Group: System/Libraries Summary: Library for Using Arbitrary Fonts in OpenGL Applications # Up to openSUSE 11.0 and SLED 10, %{_bindir}/FTGLDemo was part of ftgl-devel: @@ -238,6 +239,7 @@ Authors: %prep %setup -q -n %{name}-%{__version} %patch +%patch1 %build autoreconf -f -i -v @@ -293,51 +295,3 @@ rm -rf $RPM_BUILD_ROOT %{_bindir}/FTGL-simple-demo %changelog -* Mon Jan 26 2009 crrodriguez@suse.de -- remove "la" files -* Wed Oct 22 2008 mrueckert@suse.de -- fix debug_packages_requires define -* Tue Oct 14 2008 sbrabec@suse.cz -- Fix for the latest autotools. -* Fri Aug 01 2008 ro@suse.de -- fix requires for debuginfo package -* Sat Jul 26 2008 aj@suse.de -- Remove unneccessary and now broken Requires. -* Wed Jul 23 2008 coolo@suse.de -- adding splitprovides to the library package for update -* Mon Jul 21 2008 sbrabec@suse.cz -- Added conflict for FTGLDemo moved from -devel to -demo package. -* Tue Jul 15 2008 sbrabec@suse.cz -- Updated to version 2.1.3-rc5: - * Stable API. Public headers are now frozen. - * Fixed several memory corruption and crash bugs - * Fixed several memory leaks - * Kerning and glyph performance enhancements - * The library now also exports a pure C interface - * Inset/outset contour support for fonts - * Fix the FTLayout rendering - * Added new FTLayout and FTSimpleLayout support for layout - managers - * Fixed the paths in the XCode project - * Changed the behaviour of some objects so that if there is an - error their state isn't changed - * New, fast FTBufferFont texture fonts - * UTF-8 support -* Thu Sep 13 2007 sbrabec@suse.cz -- Fixed pkg-config file to include correct freetype (#283824). -* Mon Jan 22 2007 ssommer@suse.de -- fixed same variable used twice build error -* Wed Sep 13 2006 sbrabec@suse.cz -- Split devel subpackage. -* Fri Sep 08 2006 sbrabec@suse.cz -- Build shared library (#197446). -* Wed Jan 25 2006 mls@suse.de -- converted neededforbuild to BuildRequires -* Tue Nov 08 2005 dmueller@suse.de -- don't build as root -* Mon Nov 07 2005 ro@suse.de -- remove extra qualification to fix build with gcc-4.1 -* Thu Jan 06 2005 sbrabec@suse.cz -- Updated to version 2.1.2. -* Thu Sep 02 2004 sbrabec@suse.cz -- New SuSE package, version 2.0.11.