rpms/SDL_ttf/EL-4 SDL_ttf-2.0.7-freetype-internals.patch, NONE, 1.1 SDL_ttf.spec, 1.4, 1.5 sources, 1.2, 1.3 SDL_ttf-2.0.6-ft2-build.patch, 1.1, NONE SDL_ttf-2.0.6-openstream.patch, 1.1, NONE

[Nigel Jones (nigelj)]

Author: nigelj

Update of /cvs/extras/rpms/SDL_ttf/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28956

Modified Files:
	SDL_ttf.spec sources 
Added Files:
	SDL_ttf-2.0.7-freetype-internals.patch 
Removed Files:
	SDL_ttf-2.0.6-ft2-build.patch SDL_ttf-2.0.6-openstream.patch 
Log Message:
SDL_ttf 2.0.8 for EL-4

SDL_ttf-2.0.7-freetype-internals.patch:

--- NEW FILE SDL_ttf-2.0.7-freetype-internals.patch ---
--- SDL_ttf-2.0.7/SDL_ttf.c.freetype-internals	2005-10-17 09:05:19.000000000 -0400
+++ SDL_ttf-2.0.7/SDL_ttf.c	2005-10-17 09:05:36.000000000 -0400
@@ -48,7 +48,6 @@
 #include <freetype/ftoutln.h>
 #include <freetype/ttnameid.h>
 */
-#include <freetype/internal/ftobjs.h>
 
 #ifndef FT_OPEN_STREAM
 #define FT_OPEN_STREAM ft_open_stream
@@ -275,7 +274,6 @@
 	}
 	memset(stream, 0, sizeof(*stream));
 
-	stream->memory = library->memory;
 	stream->read = RWread;
 	stream->descriptor.pointer = src;
 	stream->pos = (unsigned long)position;


Index: SDL_ttf.spec
===================================================================
RCS file: /cvs/extras/rpms/SDL_ttf/EL-4/SDL_ttf.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- SDL_ttf.spec	10 Dec 2004 22:03:01 -0000	1.4
+++ SDL_ttf.spec	9 Jun 2007 05:43:07 -0000	1.5
@@ -1,67 +1,105 @@
-Summary: Simple DirectMedia Layer - Sample TrueType Font Library
-Name: SDL_ttf
-Version: 2.0.6
-Release: 4
-Epoch: 0
-URL: http://www.libsdl.org/projects/SDL_ttf/
-Source0: http://www.libsdl.org/projects/SDL_ttf/release/SDL_ttf-2.0.6.tar.gz
-Patch0: %{name}-%{version}-openstream.patch
-Patch1: %{name}-%{version}-ft2-build.patch
-License: LGPL
-Group: System Environment/Libraries
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: SDL-devel >= 0:1.2.4
-BuildRequires: freetype-devel >= 0:2.0
-BuildRequires: zlib-devel
+Name:		SDL_ttf
+Version:	2.0.8
+Release:	3%{?dist}
+Summary:	Simple DirectMedia Layer TrueType Font library
+
+Group:		System Environment/Libraries
+License:	LGPL
+URL:		http://www.libsdl.org/projects/SDL_ttf/
+Source0:	http://www.libsdl.org/projects/%{name}/release/%{name}-%{version}.tar.gz
+Patch1:		%{name}-2.0.7-freetype-internals.patch
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildRequires:	SDL-devel >= 1.2.4
+BuildRequires:	freetype-devel >= 2.0
+BuildRequires:	zlib-devel
+
 
 %description
 This library allows you to use TrueType fonts to render text in SDL
 applications.
 
+
 %package devel
-Summary: Libraries, includes and more to develop SDL applications.
-Group: Development/Libraries
-Requires: %{name} = %{epoch}:%{version}-%{release}
+Summary:	Development files for %{name}
+Group:		Development/Libraries
+Requires:	%{name} = %{version}-%{release}
+Requires:	SDL-devel >= 1.2.4
+
 
 %description devel
-This library allows you to use TrueType fonts to render text in SDL
-applications. This package provides the libraries, include files and other
-resources needed for developing SDL_ttf applications.
+The %{name}-devel package contains libraries and header files for
+developing applications that use %{name}.
+
 
 %prep
 %setup -q
-%patch -p1
-%patch1 -p1 -b .ft2
+%patch1 -p1 -b .freetype
+
 
 %build
-%configure
+%configure --disable-dependency-tracking --disable-static
 make %{?_smp_mflags}
 
+
 %install
 rm -rf $RPM_BUILD_ROOT
-%makeinstall
+make install DESTDIR=$RPM_BUILD_ROOT
+find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 
-rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+
 %post -p /sbin/ldconfig
 
+
 %postun -p /sbin/ldconfig
 
+
 %files
 %defattr(-,root,root)
 %doc README CHANGES COPYING
 %{_libdir}/lib*.so.*
 
+
 %files devel
 %defattr(-,root,root)
-%{_libdir}/*.a
 %{_libdir}/*.so
 %{_includedir}/SDL/
 
+
 %changelog
+* Sat Jun 09 2007 Nigel Jones <dev at nigelj.com> - 2.0.8-3
+- Base EL-4 package from FC-6 branch
+
+* Thu Aug 31 2006 Brian Pepple <bpepple at fedoraproject.org> - 2.0.8-2
+- Update for FC6.
+
+* Sat Aug 26 2006 Brian Pepple <bpepple at fedoraproject.org> - 2.0.8-1
+- Update to 2.0.8.
+- Simplify description & summary for devel package.
+
+* Mon Feb 13 2006 Brian Pepple <bdpepple at ameritech.net> - 2.0.7-4
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
+* Wed Dec 14 2005 Brian Pepple <bdpepple at ameritech.net> - 2.0.7-3
+- Add patch for Bug #171020.
+
+* Thu Sep 29 2005 Brian Pepple <bdpepple at ameritech.net> - 2.0.7-2
+- General spec formatting changes.
+- Rebuild for FC4 upgrade path.
+
+* Sun Sep 18 2005 Ville Skyttä <ville.skytta at iki.fi> - 2.0.7-1
+- 2.0.7, patches applied upstream.
+- Require SDL-devel in -devel.
+- Build with dependency tracking disabled.
+- Don't ship static libs.
+
+* Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 2.0.6-5
+- rebuilt
+
 * Wed Mar 21 2004 Panu Matilainen <pmatilai at welho.com> 0:2.0.6-0.fdr.4
 - fix build on FC2-test (bug #1436
 
@@ -77,7 +115,7 @@
 - Fedoraize
 - patch to compile on RH9
 
-* Wed Jan 19 2000 Sam Lantinga 
+* Wed Jan 19 2000 Sam Lantinga
 - converted to get package information from configure
 * Sun Jan 16 2000 Hakan Tandogan <hakan at iconsult.com>
 - initial spec file


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/SDL_ttf/EL-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 03:59:03 -0000	1.2
+++ sources	9 Jun 2007 05:43:07 -0000	1.3
@@ -1 +1 @@
-880ca22ac3e8beb5cca2326cc8069733  SDL_ttf-2.0.6.tar.gz
+094b6c08769e9842dbe1dfb5efa22df7  SDL_ttf-2.0.8.tar.gz


--- SDL_ttf-2.0.6-ft2-build.patch DELETED ---


--- SDL_ttf-2.0.6-openstream.patch DELETED ---