Accepting request 296121 from multimedia:libs

1

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

ftgl.changes

@@ -1,3 +1,23 @@
+-------------------------------------------------------------------
+Tue Apr 14 11:47:21 CEST 2015 - tiwai@suse.de
+
+- Fix download URL containing percent letters to make "osc service
+  localrun download_files" working
+
+-------------------------------------------------------------------
+Mon Apr 13 13:34:47 UTC 2015 - mpluskal@suse.com
+
+- Add baselibs to sources
+
+-------------------------------------------------------------------
+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
 

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,30 @@
 
 
 Name:           ftgl
-BuildRequires:  doxygen
+Version:        2.1.3~rc5
-BuildRequires:  freeglut-devel
-BuildRequires:  freetype2-devel
-BuildRequires:  gcc-c++
-BuildRequires:  libdrm-devel
-BuildRequires:  libtool
-BuildRequires:  pkgconfig(glu)
-Version:        2.1.2.99.5
 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
+Url:            http://ftgl.wiki.sourceforge.net/
-Patch:          %{name}-autoreconf.patch
+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
+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 +70,10 @@ The supported rendering modes are:
 
 - Buffer maps
 
-
-
-Authors:
---------
-    Henry Maddocks <ftgl@opengl.geek.nz>
-    Jed Soane
-    G<EFBFBD>rard Lanois
-    Matthias Kretz
-    Andrew Ellerton
-    Max Rheiner
-    S<EFBFBD>bastien Barr<EFBFBD>
-    Marcelo E. Magallon <mmagallo@debian.org>
-    Robert Bell
-    Sam Hocevar <sam@zoy.org>
-    <EFBFBD>ric Beets <ericbeets@free.fr>
-    Christopher Sean Morrison <learner@brlcad.org>
-    Jeff Myers (JeffM2501) <JeffM2501@users.sourceforge.net>
-    Daniel Remenak <dtremenak@users.sourceforge.net>
-
 %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 +103,6 @@ The supported rendering modes are:
 
 - Buffer maps
 
-
-
-Authors:
---------
-    Henry Maddocks <ftgl@opengl.geek.nz>
-    Jed Soane
-    G<EFBFBD>rard Lanois
-    Matthias Kretz
-    Andrew Ellerton
-    Max Rheiner
-    S<EFBFBD>bastien Barr<EFBFBD>
-    Marcelo E. Magallon <mmagallo@debian.org>
-    Robert Bell
-    Sam Hocevar <sam@zoy.org>
-    <EFBFBD>ric Beets <ericbeets@free.fr>
-    Christopher Sean Morrison <learner@brlcad.org>
-    Jeff Myers (JeffM2501) <JeffM2501@users.sourceforge.net>
-    Daniel Remenak <dtremenak@users.sourceforge.net>
-
 %package devel
 Summary:        Library for Using Arbitrary Fonts in OpenGL Applications
 Group:          Development/Libraries/C and C++
@@ -169,25 +134,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 <ftgl@opengl.geek.nz>
-    Jed Soane
-    G<EFBFBD>rard Lanois
-    Matthias Kretz
-    Andrew Ellerton
-    Max Rheiner
-    S<EFBFBD>bastien Barr<EFBFBD>
-    Marcelo E. Magallon <mmagallo@debian.org>
-    Robert Bell
-    Sam Hocevar <sam@zoy.org>
-    <EFBFBD>ric Beets <ericbeets@free.fr>
-    Christopher Sean Morrison <learner@brlcad.org>
-    Jeff Myers (JeffM2501) <JeffM2501@users.sourceforge.net>
-    Daniel Remenak <dtremenak@users.sourceforge.net>
-
 %package demo
 Summary:        Library for Using Arbitrary Fonts in OpenGL Applications
 Group:          System/Libraries
@@ -222,56 +168,35 @@ The supported rendering modes are:
 
 - Buffer maps
 
-
-
-Authors:
---------
-    Henry Maddocks <ftgl@opengl.geek.nz>
-    Jed Soane
-    G<EFBFBD>rard Lanois
-    Matthias Kretz
-    Andrew Ellerton
-    Max Rheiner
-    S<EFBFBD>bastien Barr<EFBFBD>
-    Marcelo E. Magallon <mmagallo@debian.org>
-    Robert Bell
-    Sam Hocevar <sam@zoy.org>
-    <EFBFBD>ric Beets <ericbeets@free.fr>
-    Christopher Sean Morrison <learner@brlcad.org>
-    Jeff Myers (JeffM2501) <JeffM2501@users.sourceforge.net>
-    Daniel Remenak <dtremenak@users.sourceforge.net>
-
 %prep
-%setup -q -n %{name}-%{__version}
+%setup -q
-%patch
+%patch0
 %patch1
 %patch2
 
 %build
-autoreconf -f -i -v
+./autogen.sh
-%configure --with-pic \
+%configure \
+	--with-pic \
 	--disable-static
-make %{?jobs:-j%jobs} documentationdir=%{_docdir}/%{name}
+make %{?_smp_mflags} documentationdir=%{_docdir}/%{name}
 
 %install
-%makeinstall documentationdir=%{_docdir}/%{name}
+make DESTDIR=%{buildroot} install %{?_smp_mflags} documentationdir=%{_docdir}/%{name}
-mkdir -p $RPM_BUILD_ROOT%{_defaultdocdir}/libftgl2
+mkdir -p %{buildroot}%{_defaultdocdir}/libftgl2
-cp -pr AUTHORS BUGS COPYING ChangeLog NEWS README TODO $RPM_BUILD_ROOT%{_defaultdocdir}/libftgl2
+cp -pr AUTHORS BUGS COPYING ChangeLog NEWS README TODO %{buildroot}%{_defaultdocdir}/libftgl2
-mkdir -p $RPM_BUILD_ROOT%{_bindir}
+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 %{_bindir}/install -c FTGLDemo %{buildroot}%{_bindir}/FTGLDemo
-/bin/sh ../libtool --mode=install /usr/bin/install -c FTGLMFontDemo $RPM_BUILD_ROOT%{_bindir}/FTGLMFontDemo
+/bin/sh ../libtool --mode=install %{_bindir}/install -c FTGLMFontDemo %{buildroot}%{_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 %{_bindir}/install -c c-demo %{buildroot}%{_bindir}/FTGL-c-demo
-/bin/sh ../libtool --mode=install /usr/bin/install -c simple $RPM_BUILD_ROOT%{_bindir}/FTGL-simple-demo
+/bin/sh ../libtool --mode=install %{_bindir}/install -c simple %{buildroot}%{_bindir}/FTGL-simple-demo
-mkdir -p $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}-demo
+mkdir -p %{buildroot}%{_defaultdocdir}/%{name}-demo
-cp -pr *.cpp *.c *.h $RPM_BUILD_ROOT%{_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