From 1628835564b97dd599df7cda4283566cdc320cca424fcfaaef906c19686f9291 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Tue, 27 Apr 2010 13:04:30 +0000 Subject: [PATCH 1/3] Accepting request 38915 from multimedia:libs checked in (request 38915) OBS-URL: https://build.opensuse.org/request/show/38915 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/ftgl?expand=0&rev=4 --- ftgl.changes | 5 ----- ftgl.spec | 62 +++++++++++++++++++++++++++++++++++++++++++++------- 2 files changed, 54 insertions(+), 13 deletions(-) diff --git a/ftgl.changes b/ftgl.changes index 7f25ad5..46b0bd1 100644 --- a/ftgl.changes +++ b/ftgl.changes @@ -1,8 +1,3 @@ -------------------------------------------------------------------- -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 5a4e8e6..5d64353 100644 --- a/ftgl.spec +++ b/ftgl.spec @@ -1,7 +1,7 @@ # # spec file for package ftgl (Version 2.1.2.99.5) # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2009 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,16 +21,15 @@ Name: ftgl BuildRequires: doxygen freeglut-devel freetype2-devel gcc-c++ libdrm-devel Version: 2.1.2.99.5 -Release: 9 +Release: 8 %define _version 2.1.3-rc5 %define __version 2.1.3~rc5 Url: http://ftgl.wiki.sourceforge.net/ Group: System/Libraries -License: LGPLv2.1+ +License: LGPL v2.1 or later; X11/MIT 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} @@ -82,7 +81,7 @@ Authors: Daniel Remenak %package -n libftgl2 -License: LGPLv2.1+ +License: LGPL v2.1 or later Group: System/Libraries Summary: Library for Using Arbitrary Fonts in OpenGL Applications Provides: ftgl:/usr/%_lib/libftgl.so.0 @@ -135,7 +134,7 @@ Authors: Daniel Remenak %package devel -License: LGPLv2.1+ +License: LGPL v2.1 or later Group: Development/Libraries/C and C++ Summary: Library for Using Arbitrary Fonts in OpenGL Applications Requires: libftgl2 = %{version} Mesa-devel freetype2-devel @@ -183,7 +182,7 @@ Authors: Daniel Remenak %package demo -License: LGPLv2.1+ +License: LGPL v2.1 or later 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: @@ -239,7 +238,6 @@ Authors: %prep %setup -q -n %{name}-%{__version} %patch -%patch1 %build autoreconf -f -i -v @@ -295,3 +293,51 @@ 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. From f60e53ab772e5d14d5e603f53d756bbe61dc7ada544d9c087156849bafed04fe Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Tue, 26 Apr 2011 13:17:12 +0000 Subject: [PATCH 2/3] Accepting request 68281 from home:TheBlackCat:multimedia OBS-URL: https://build.opensuse.org/request/show/68281 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/ftgl?expand=0&rev=5 --- baselibs.conf | 1 + ftgl.changes | 11 +++++++ ftgl.spec | 88 ++++++++++++--------------------------------------- 3 files changed, 33 insertions(+), 67 deletions(-) create mode 100644 baselibs.conf diff --git a/baselibs.conf b/baselibs.conf new file mode 100644 index 0000000..82f39a0 --- /dev/null +++ b/baselibs.conf @@ -0,0 +1 @@ +libftgl2 diff --git a/ftgl.changes b/ftgl.changes index 46b0bd1..150b465 100644 --- a/ftgl.changes +++ b/ftgl.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Sun Apr 24 12:59:34 UTC 2011 - toddrme2178@gmail.com + +- Add 32bit compatibility libraries +- Fixed spec file encoding (fix for RPMLINT warning) + +------------------------------------------------------------------- +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..217661b 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} @@ -67,21 +68,21 @@ Authors: -------- Henry Maddocks Jed Soane - Gérard Lanois + G�rard Lanois Matthias Kretz Andrew Ellerton Max Rheiner - Sébastien Barré + S�bastien Barr� Marcelo E. Magallon Robert Bell Sam Hocevar - Éric Beets + �ric Beets Christopher Sean Morrison Jeff Myers (JeffM2501) 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 @@ -120,21 +121,21 @@ Authors: -------- Henry Maddocks Jed Soane - Gérard Lanois + G�rard Lanois Matthias Kretz Andrew Ellerton Max Rheiner - Sébastien Barré + S�bastien Barr� Marcelo E. Magallon Robert Bell Sam Hocevar - Éric Beets + �ric Beets Christopher Sean Morrison Jeff Myers (JeffM2501) 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 @@ -168,24 +169,24 @@ Authors: -------- Henry Maddocks Jed Soane - Gérard Lanois + G�rard Lanois Matthias Kretz Andrew Ellerton Max Rheiner - Sébastien Barré + S�bastien Barr� Marcelo E. Magallon Robert Bell Sam Hocevar - Éric Beets + �ric Beets Christopher Sean Morrison Jeff Myers (JeffM2501) 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: +# Up to openSUSE 11.0 and SLED 10, %%{_bindir}/FTGLDemo was part of ftgl-devel: Conflicts: %{name}-devel <= 2.1.2 %description demo @@ -222,15 +223,15 @@ Authors: -------- Henry Maddocks Jed Soane - Gérard Lanois + G�rard Lanois Matthias Kretz Andrew Ellerton Max Rheiner - Sébastien Barré + S�bastien Barr� Marcelo E. Magallon Robert Bell Sam Hocevar - Éric Beets + �ric Beets Christopher Sean Morrison Jeff Myers (JeffM2501) Daniel Remenak @@ -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. From 798a30634a32c4a4baa8e64ade964e79eb736be419a436335d498ea7693c7114 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Mon, 29 Aug 2011 16:42:54 +0000 Subject: [PATCH 3/3] Accepting request 80101 from home:elvigia:branches:multimedia:libs - Fix build with new gnu Ld defaults. OBS-URL: https://build.opensuse.org/request/show/80101 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/ftgl?expand=0&rev=6 --- ftgl-fix-no-add-needed.patch | 11 +++++++++++ ftgl.changes | 5 +++++ ftgl.spec | 6 ++++-- 3 files changed, 20 insertions(+), 2 deletions(-) create mode 100644 ftgl-fix-no-add-needed.patch diff --git a/ftgl-fix-no-add-needed.patch b/ftgl-fix-no-add-needed.patch new file mode 100644 index 0000000..50ba916 --- /dev/null +++ b/ftgl-fix-no-add-needed.patch @@ -0,0 +1,11 @@ +--- configure.ac.orig ++++ configure.ac +@@ -36,7 +36,7 @@ AC_CHECK_HEADER([stdlib.h]) + # Check for system functions + AC_CHECK_FUNCS(wcsdup) + AC_CHECK_FUNCS(strndup) +- ++AC_SEARCH_LIBS(sin, m) + # Checks for libraries. + + AC_PATH_X diff --git a/ftgl.changes b/ftgl.changes index 150b465..b40a24a 100644 --- a/ftgl.changes +++ b/ftgl.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Aug 29 16:00:51 UTC 2011 - crrodriguez@opensuse.org + +- Fix build with new gnu Ld defaults. + ------------------------------------------------------------------- Sun Apr 24 12:59:34 UTC 2011 - toddrme2178@gmail.com diff --git a/ftgl.spec b/ftgl.spec index 217661b..17d1649 100644 --- a/ftgl.spec +++ b/ftgl.spec @@ -1,7 +1,7 @@ # -# spec file for package ftgl (Version 2.1.2.99.5) +# spec file for package ftgl # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 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 @@ -31,6 +31,7 @@ Summary: Library for Using Arbitrary Fonts in OpenGL Applications Source: %{name}-%{_version}.tar.bz2 Patch: %{name}-autoreconf.patch Patch1: ftgl-pkgconfig.patch +Patch2: ftgl-fix-no-add-needed.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %define debug_package_requires libftgl2 = %{version}-%{release} @@ -240,6 +241,7 @@ Authors: %setup -q -n %{name}-%{__version} %patch %patch1 +%patch2 %build autoreconf -f -i -v