[freetype/f14/master] 2.4.2

[Matthias Clasen]

commit f7c64053326308c2b748d1f9e675425646664a32
Author: Matthias Clasen 
Date:   Fri Aug 6 23:58:07 2010 -0400

2.4.2

.gitignore    |    3 +++
 freetype.spec |    9 +++++----
 sources       |    6 +++---
 3 files changed, 11 insertions(+), 7 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index f191ff3..de4b670 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,6 @@
 ft2demos-2.3.12.tar.bz2
 freetype-doc-2.3.12.tar.bz2
 freetype-2.3.12.tar.bz2
+freetype-2.4.2.tar.bz2
+freetype-doc-2.4.2.tar.bz2
+ft2demos-2.4.2.tar.bz2
diff --git a/freetype.spec b/freetype.spec
index 226b063..befdce4 100644
--- a/freetype.spec
+++ b/freetype.spec
@@ -6,7 +6,7 @@

Summary: A free and portable font rendering engine
 Name: freetype
-Version: 2.3.12
+Version: 2.4.2
 Release: 1%{?dist}
 License: FTL or GPLv2+
 Group: System Environment/Libraries
@@ -15,7 +15,6 @@ Source:  http://download.savannah.gnu.org/releases/freetype/freetype-%%7Bversion%7D.
 Source1: http://download.savannah.gnu.org/releases/freetype/freetype-doc-%%7Bversion%...
 Source2: http://download.savannah.gnu.org/releases/freetype/ft2demos-%%7Bversion%7D.t...

-Patch20:  freetype-2.1.10-enable-ft2-bci.patch
 Patch21:  freetype-2.3.0-enable-spr.patch

# Enable otvalid and gxvalid modules
@@ -74,8 +73,6 @@ FreeType.
 %prep
 %setup -q -b 1 -a 2

-%patch20  -p1 -b .enable-ft2-bci
-
 %if %{?_with_subpixel_rendering:1}%{!?_with_subpixel_rendering:0}
 %patch21  -p1 -b .enable-spr
 %endif
@@ -219,6 +216,10 @@ rm -rf $RPM_BUILD_ROOT
 %doc docs/tutorial

%changelog
+* Fri Aug  6 2010 Matthias Clasen  2.4.2-1
+- Update to 2.4.2
+- Drop upstreamed patch, bytecode interpreter now on by default
+
 * Thu Feb 23 2010 Behdad Esfahbod  2.3.12-1
 - Update to 2.3.12
 - Drop mathlib patch
diff --git a/sources b/sources
index e9d5df1..b7c04d0 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-ce2811161e779de4eff39bd9d5d916ba  ft2demos-2.3.12.tar.bz2
-2788beb4e1ee01bad8ed9978c0630e86  freetype-doc-2.3.12.tar.bz2
-e974a82e5939be8e05ee65f07275d7c5  freetype-2.3.12.tar.bz2
+647ee8ed266f9a4117c8d0a4855b3d3e  freetype-2.4.2.tar.bz2
+4adeafb4959b29af661a43bc55dc60d9  freetype-doc-2.4.2.tar.bz2
+f21af6639c5b37065c735c93ca8b9ca7  ft2demos-2.4.2.tar.bz2