[freetype] Update to 2.5.4

[mkasik]

commit a2e19d6253885c3d3fe475c5202fc5c0a1ee1865
Author: Marek Kasik <mkasik at redhat.com>
Date:   Tue Dec 9 15:45:48 2014 +0100

    Update to 2.5.4
    
    Resolves: #1171504

 .gitignore                                |    3 +
 freetype-2.4.12-pkgconfig.patch           |   14 ----
 freetype-2.5.3-freetype-config-libs.patch |   96 -----------------------------
 freetype.spec                             |   18 ++----
 sources                                   |    6 +-
 5 files changed, 12 insertions(+), 125 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 1a84215..aef8e80 100644
--- a/.gitignore
+++ b/.gitignore
@@ -43,3 +43,6 @@ ft2demos-2.4.2.tar.bz2
 /freetype-2.5.3.tar.bz2
 /freetype-doc-2.5.3.tar.bz2
 /ft2demos-2.5.3.tar.bz2
+/freetype-2.5.4.tar.bz2
+/freetype-doc-2.5.4.tar.bz2
+/ft2demos-2.5.4.tar.bz2
diff --git a/freetype.spec b/freetype.spec
index ea1cbaa..2fb753e 100644
--- a/freetype.spec
+++ b/freetype.spec
@@ -6,8 +6,8 @@
 
 Summary: A free and portable font rendering engine
 Name: freetype
-Version: 2.5.3
-Release: 11%{?dist}
+Version: 2.5.4
+Release: 1%{?dist}
 License: (FTL or GPLv2+) and BSD and MIT and Public Domain and zlib with acknowledgement
 Group: System Environment/Libraries
 URL: http://www.freetype.org
@@ -26,12 +26,6 @@ Patch47:  freetype-2.5.2-more-demos.patch
 # Fix multilib conflicts
 Patch88:  freetype-multilib.patch
 
-# https://bugzilla.redhat.com/show_bug.cgi?id=961855
-Patch90:  freetype-2.4.12-pkgconfig.patch
-
-# https://bugzilla.redhat.com/show_bug.cgi?id=1079302
-Patch91:  freetype-2.5.3-freetype-config-libs.patch
-
 # https://bugzilla.redhat.com/show_bug.cgi?id=1161963
 Patch92:  freetype-2.5.3-freetype-config-prefix.patch
 
@@ -96,10 +90,6 @@ popd
 
 %patch88 -p1 -b .multilib
 
-%patch90 -p1 -b .pkgconfig
-
-%patch91 -p1 -b .freetype-config-libs
-
 %patch92 -p1 -b .freetype-config-prefix
 
 %build
@@ -222,6 +212,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/*
 
 %changelog
+* Tue Dec  9 2014 Marek Kasik <mkasik at redhat.com> - 2.5.4-1
+- Update to 2.5.4
+- Resolves: #1171504
+
 * Tue Nov 11 2014 Marek Kasik <mkasik at redhat.com> - 2.5.3-11
 - Fix directories returned by freetype-config with modified prefix
 - Resolves: #1161963
diff --git a/sources b/sources
index feb59fa..f448333 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-d6b60f06bfc046e43ab2a6cbfd171d65  freetype-2.5.3.tar.bz2
-e192ef88e84ddf10665f34cf418652fb  freetype-doc-2.5.3.tar.bz2
-3d2cd9f572a1a80b9744b9d6b75975ba  ft2demos-2.5.3.tar.bz2
+438585445a2f1f71c77590155fd96616  freetype-2.5.4.tar.bz2
+98ce8930882a4017dc2e591ed75a5896  freetype-doc-2.5.4.tar.bz2
+1d457751c9223422ff4f33ce2606a2b3  ft2demos-2.5.4.tar.bz2