From 25b74889938beef198aa93ed799e5a67100c4f3b5814a45c806a2460d01d4690 Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Mon, 13 Apr 2015 13:14:59 +0000 Subject: [PATCH] Accepting request 295597 from home:pluskalm:branches:multimedia:libs - Use url for source - Use tilde in version - Clenaup spec file with spec-cleaner - Update dependencies - Remove obsolete defines OBS-URL: https://build.opensuse.org/request/show/295597 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/ftgl?expand=0&rev=13 --- ftgl.changes | 9 ++++ ftgl.spec | 146 ++++++++++++--------------------------------------- 2 files changed, 44 insertions(+), 111 deletions(-) diff --git a/ftgl.changes b/ftgl.changes index 3a294bc..47e666c 100644 --- a/ftgl.changes +++ b/ftgl.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Sun Apr 12 19:19:32 UTC 2015 - mpluskal@suse.com + +- Use url for source +- Use tilde in version +- Clenaup spec file with spec-cleaner +- Update dependencies +- Remove obsolete defines + ------------------------------------------------------------------- Tue Sep 18 13:32:21 UTC 2012 - idonmez@suse.com diff --git a/ftgl.spec b/ftgl.spec index 8f8c420..e548d48 100644 --- a/ftgl.spec +++ b/ftgl.spec @@ -1,7 +1,7 @@ # # spec file for package ftgl # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 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 @@ -17,27 +17,29 @@ Name: ftgl -BuildRequires: doxygen -BuildRequires: freeglut-devel -BuildRequires: freetype2-devel -BuildRequires: gcc-c++ -BuildRequires: libdrm-devel -BuildRequires: libtool -BuildRequires: pkgconfig(glu) -Version: 2.1.2.99.5 +Version: 2.1.3~rc5 Release: 0 -%define _version 2.1.3-rc5 -%define __version 2.1.3~rc5 -Url: http://ftgl.wiki.sourceforge.net/ Summary: Library for Using Arbitrary Fonts in OpenGL Applications License: LGPL-2.1+ Group: System/Libraries -Source: %{name}-%{_version}.tar.bz2 -Patch: %{name}-autoreconf.patch +Url: http://ftgl.wiki.sourceforge.net/ +Source: http://sourceforge.net/projects/ftgl/files/FTGL%{20Source}/%{version}/%{name}-2.1.3-rc5.tar.bz2 +Patch0: %{name}-autoreconf.patch Patch1: ftgl-pkgconfig.patch Patch2: ftgl-fix-no-add-needed.patch +BuildRequires: autoconf +BuildRequires: automake +BuildRequires: doxygen +BuildRequires: freeglut-devel +BuildRequires: gcc-c++ +BuildRequires: libtool +BuildRequires: pkg-config +BuildRequires: pkgconfig(freetype2) +BuildRequires: pkgconfig(glu) +BuildRequires: pkgconfig(ice) +BuildRequires: pkgconfig(libdrm) +BuildRequires: pkgconfig(x11) BuildRoot: %{_tmppath}/%{name}-%{version}-build -%define debug_package_requires libftgl2 = %{version}-%{release} %description FTGL is a free open source library that enables developers to use @@ -67,29 +69,10 @@ The supported rendering modes are: - Buffer maps - - -Authors: --------- - Henry Maddocks - Jed Soane - G�rard Lanois - Matthias Kretz - Andrew Ellerton - Max Rheiner - S�bastien Barr� - Marcelo E. Magallon - Robert Bell - Sam Hocevar - �ric Beets - Christopher Sean Morrison - Jeff Myers (JeffM2501) - Daniel Remenak - %package -n libftgl2 Summary: Library for Using Arbitrary Fonts in OpenGL Applications Group: System/Libraries -Provides: ftgl:/usr/%_lib/libftgl.so.0 +Provides: ftgl:%{_libdir}/libftgl.so.0 %description -n libftgl2 FTGL is a free open source library that enables developers to use @@ -119,25 +102,6 @@ The supported rendering modes are: - Buffer maps - - -Authors: --------- - Henry Maddocks - Jed Soane - G�rard Lanois - Matthias Kretz - Andrew Ellerton - Max Rheiner - S�bastien Barr� - Marcelo E. Magallon - Robert Bell - Sam Hocevar - �ric Beets - Christopher Sean Morrison - Jeff Myers (JeffM2501) - Daniel Remenak - %package devel Summary: Library for Using Arbitrary Fonts in OpenGL Applications Group: Development/Libraries/C and C++ @@ -169,25 +133,6 @@ FTGL is a free open source library that enables developers to use quality software. It has been written with a focus on performance, robustness, and simplicity. - - -Authors: --------- - Henry Maddocks - Jed Soane - G�rard Lanois - Matthias Kretz - Andrew Ellerton - Max Rheiner - S�bastien Barr� - Marcelo E. Magallon - Robert Bell - Sam Hocevar - �ric Beets - Christopher Sean Morrison - Jeff Myers (JeffM2501) - Daniel Remenak - %package demo Summary: Library for Using Arbitrary Fonts in OpenGL Applications Group: System/Libraries @@ -222,56 +167,35 @@ The supported rendering modes are: - Buffer maps - - -Authors: --------- - Henry Maddocks - Jed Soane - G�rard Lanois - Matthias Kretz - Andrew Ellerton - Max Rheiner - S�bastien Barr� - Marcelo E. Magallon - Robert Bell - Sam Hocevar - �ric Beets - Christopher Sean Morrison - Jeff Myers (JeffM2501) - Daniel Remenak - %prep -%setup -q -n %{name}-%{__version} -%patch +%setup -q +%patch0 %patch1 %patch2 %build -autoreconf -f -i -v -%configure --with-pic \ +./autogen.sh +%configure \ + --with-pic \ --disable-static -make %{?jobs:-j%jobs} documentationdir=%{_docdir}/%{name} +make %{?_smp_mflags} documentationdir=%{_docdir}/%{name} %install -%makeinstall documentationdir=%{_docdir}/%{name} -mkdir -p $RPM_BUILD_ROOT%{_defaultdocdir}/libftgl2 -cp -pr AUTHORS BUGS COPYING ChangeLog NEWS README TODO $RPM_BUILD_ROOT%{_defaultdocdir}/libftgl2 -mkdir -p $RPM_BUILD_ROOT%{_bindir} +make DESTDIR=%{buildroot} install %{?_smp_mflags} documentationdir=%{_docdir}/%{name} +mkdir -p %{buildroot}%{_defaultdocdir}/libftgl2 +cp -pr AUTHORS BUGS COPYING ChangeLog NEWS README TODO %{buildroot}%{_defaultdocdir}/libftgl2 +mkdir -p %{buildroot}%{_bindir} cd demo -/bin/sh ../libtool --mode=install /usr/bin/install -c FTGLDemo $RPM_BUILD_ROOT%{_bindir}/FTGLDemo -/bin/sh ../libtool --mode=install /usr/bin/install -c FTGLMFontDemo $RPM_BUILD_ROOT%{_bindir}/FTGLMFontDemo -/bin/sh ../libtool --mode=install /usr/bin/install -c c-demo $RPM_BUILD_ROOT%{_bindir}/FTGL-c-demo -/bin/sh ../libtool --mode=install /usr/bin/install -c simple $RPM_BUILD_ROOT%{_bindir}/FTGL-simple-demo -mkdir -p $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}-demo -cp -pr *.cpp *.c *.h $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}-demo +/bin/sh ../libtool --mode=install %{_bindir}/install -c FTGLDemo %{buildroot}%{_bindir}/FTGLDemo +/bin/sh ../libtool --mode=install %{_bindir}/install -c FTGLMFontDemo %{buildroot}%{_bindir}/FTGLMFontDemo +/bin/sh ../libtool --mode=install %{_bindir}/install -c c-demo %{buildroot}%{_bindir}/FTGL-c-demo +/bin/sh ../libtool --mode=install %{_bindir}/install -c simple %{buildroot}%{_bindir}/FTGL-simple-demo +mkdir -p %{buildroot}%{_defaultdocdir}/%{name}-demo +cp -pr *.cpp *.c *.h %{buildroot}%{_defaultdocdir}/%{name}-demo cd .. -%{__rm} -f %{buildroot}%{_libdir}/*.la +find %{buildroot} -type f -name "*.la" -delete -print grep -r include %{buildroot}%{_includedir} | awk -F: '{print $2}' -%clean -rm -rf $RPM_BUILD_ROOT - %post -n libftgl2 -p /sbin/ldconfig %postun -n libftgl2 -p /sbin/ldconfig