[freetype] Fix include directory in freetype-config

[mkasik]

commit 29bfa79c4dd23370338a4b1e0508ef027c1d9cc8
Author: Marek Kasik <mkasik at redhat.com>
Date:   Mon Jan 20 14:04:45 2014 +0100

    Fix include directory in freetype-config
    
    Resolves: #1055154

 freetype-multilib.patch |   29 +++++++++++++++++++++++++++--
 freetype.spec           |    6 +++++-
 2 files changed, 32 insertions(+), 3 deletions(-)
---
diff --git a/freetype-multilib.patch b/freetype-multilib.patch
index e8f40d6..7831ab0 100644
--- a/freetype-multilib.patch
+++ b/freetype-multilib.patch
@@ -1,5 +1,5 @@
---- freetype-2.4.12/builds/unix/freetype-config.in
-+++ freetype-2.4.12/builds/unix/freetype-config.in
+--- freetype-2.5.2/builds/unix/freetype-config.in
++++ freetype-2.5.2/builds/unix/freetype-config.in
 @@ -12,11 +12,11 @@
  LC_ALL=C
  export LC_ALL
@@ -16,3 +16,28 @@
  enable_shared="%build_libtool_libs%"
  
  usage()
+@@ -119,20 +119,20 @@ else
+ fi
+ 
+ if test "$echo_ft_version" = "yes" ; then
+-  major=`grep define ${SYSROOT}$includedir/freetype2/freetype.h \
++  major=`grep define ${SYSROOT}$includedir/freetype.h \
+          | grep FREETYPE_MAJOR \
+          | sed 's/.*[ 	]\([0-9][0-9]*\).*/\1/'`
+-  minor=`grep define ${SYSROOT}$includedir/freetype2/freetype.h \
++  minor=`grep define ${SYSROOT}$includedir/freetype.h \
+          | grep FREETYPE_MINOR \
+          | sed 's/.*[ 	]\([0-9][0-9]*\).*/\1/'`
+-  patch=`grep define ${SYSROOT}$includedir/freetype2/freetype.h \
++  patch=`grep define ${SYSROOT}$includedir/freetype.h \
+          | grep FREETYPE_PATCH \
+          | sed 's/.*[ 	]\([0-9][0-9]*\).*/\1/'`
+   echo $major.$minor.$patch
+ fi
+ 
+ if test "$echo_cflags" = "yes" ; then
+-  cflags="-I${SYSROOT}$includedir/freetype2"
++  cflags="-I${SYSROOT}$includedir"
+   echo $cflags
+ fi
+ 
diff --git a/freetype.spec b/freetype.spec
index 7c0d8c8..cbb4d55 100644
--- a/freetype.spec
+++ b/freetype.spec
@@ -7,7 +7,7 @@
 Summary: A free and portable font rendering engine
 Name: freetype
 Version: 2.5.2
-Release: 1%{?dist}
+Release: 2%{?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
@@ -211,6 +211,10 @@ rm -rf $RPM_BUILD_ROOT
 %doc docs/tutorial
 
 %changelog
+* Mon Jan 20 2014 Marek Kasik <mkasik at redhat.com> - 2.5.2-2
+- Fix include directory in freetype-config
+- Resolves: #1055154
+
 * Fri Jan 17 2014 Marek Kasik <mkasik at redhat.com> - 2.5.2-1
 - Update to 2.5.2
 - Modify spec file to respect the new header file layout