From 521506c88ad73209e7a367013dfffde8950ddc67 Mon Sep 17 00:00:00 2001
From: Michael Schwendt <mschwendt@fedoraproject.org>
Date: Jul 18 2006 09:36:36 +0000
Subject: - remove BR SDL_ttf-devel, an included/patched copy is used since 0.8.7

- patch included SDL_ttf to build with freetype 2.x and not access an old
    freetype 1.x internal

---

diff --git a/wesnoth-1.0.2-sdl_ttf.patch b/wesnoth-1.0.2-sdl_ttf.patch
new file mode 100644
index 0000000..077f530
--- /dev/null
+++ b/wesnoth-1.0.2-sdl_ttf.patch
@@ -0,0 +1,19 @@
+diff -Nur wesnoth-1.0.2-orig/src/sdl_ttf/SDL_ttf.c wesnoth-1.0.2/src/sdl_ttf/SDL_ttf.c
+--- wesnoth-1.0.2-orig/src/sdl_ttf/SDL_ttf.c	2005-09-21 02:35:47.000000000 +0200
++++ wesnoth-1.0.2/src/sdl_ttf/SDL_ttf.c	2006-07-18 10:31:53.000000000 +0200
+@@ -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
+@@ -282,7 +281,6 @@
+ 	}
+ 	memset(stream, 0, sizeof(*stream));
+ 
+-	stream->memory = library->memory;
+ 	stream->read = RWread;
+ 	stream->descriptor.pointer = src;
+ 	stream->pos = (unsigned long)position;
diff --git a/wesnoth.spec b/wesnoth.spec
index 09dc60f..ea02b1a 100644
--- a/wesnoth.spec
+++ b/wesnoth.spec
@@ -1,6 +1,6 @@
 Name:           wesnoth
 Version:        1.0.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Turn-based strategy game with a fantasy theme
 
 Group:          Amusements/Games
@@ -10,10 +10,11 @@ Source0:        http://www.wesnoth.org/files/wesnoth-%{version}.tar.gz
 Source1:        wesnothd.init
 Source2:        wesnoth.sysconfig
 #Source3:        README.fedora
+Patch0:         wesnoth-1.0.2-sdl_ttf.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  SDL-devel, SDL_image-devel, SDL_mixer-devel
-BuildRequires:  SDL_ttf-devel, SDL_net-devel, freetype-devel
+BuildRequires:  SDL_net-devel, freetype-devel
 BuildRequires:  libpng-devel
 BuildRequires:  desktop-file-utils, gettext
 
@@ -60,6 +61,7 @@ This package contains the game editor and development tools.
 
 %prep
 %setup -q
+%patch0 -p1 -b .sdl_ttf
 #cp %{SOURCE3} .
 chmod -x MANUAL*
 
@@ -158,6 +160,11 @@ fi
 %ghost /var/run/wesnothd/socket
 
 %changelog
+* Tue Jul 18 2006 Michael Schwendt <mschwendt[AT]users.sf.net> - 1.0.2-3
+- remove BR SDL_ttf-devel, an included/patched copy is used since 0.8.7
+- patch included SDL_ttf to build with freetype 2.x and not access
+  an old freetype 1.x internal
+
 * Wed Feb 15 2006 Michael Schwendt <mschwendt[AT]users.sf.net> - 1.0.2-2
 - rebuilt for FC5