diff --git a/ttmkfdir-3.0.9-freetype-header-fix.patch b/ttmkfdir-3.0.9-freetype-header-fix.patch new file mode 100644 index 0000000..db6acc2 --- /dev/null +++ b/ttmkfdir-3.0.9-freetype-header-fix.patch @@ -0,0 +1,12 @@ +diff -Nau ttmkfdir-3.0.9.orig/ttf.cpp ttmkfdir-3.0.9/ttf.cpp +--- ttmkfdir-3.0.9.orig/ttf.cpp 2014-03-25 10:12:53.350009854 -0500 ++++ ttmkfdir-3.0.9/ttf.cpp 2014-03-25 10:14:43.790009861 -0500 +@@ -3,7 +3,7 @@ + #include + #include + +-#include "freetype/tttables.h" ++#include "freetype2/freetype/tttables.h" + #include "ttmkfdir.h" + #include "ttf.h" + #include "ttos2val.h" diff --git a/ttmkfdir.spec b/ttmkfdir.spec index 262c213..2433405 100644 --- a/ttmkfdir.spec +++ b/ttmkfdir.spec @@ -1,7 +1,7 @@ Summary: Utility to create fonts.scale files for truetype fonts Name: ttmkfdir Version: 3.0.9 -Release: 40%{?dist} +Release: 41%{?dist} # This is a Red Hat maintained package which is specific to # our distribution. Thus the source is only available from # within this srpm. @@ -16,7 +16,9 @@ Patch6: ttmkfdir-3.0.9-segfaults.patch Patch7: ttmkfdir-3.0.9-encoding-dir.patch Patch8: ttmkfdir-3.0.9-font-scale.patch Patch9: ttmkfdir-3.0.9-bug434301.patch +Patch10:ttmkfdir-3.0.9-freetype-header-fix.patch Source10: ttmkfdir.1 + # Only licensing attribution is in README, no version. License: LGPLv2+ Group: Applications/System @@ -45,6 +47,7 @@ by the font server. %patch7 -p1 %patch8 -p1 %patch9 -p1 +%patch10 -p1 %build make %{?_smp_mflags} OPTFLAGS="$RPM_OPT_FLAGS" @@ -60,6 +63,10 @@ cp -p %{SOURCE10} %{buildroot}%{_mandir}/man1/ %{_mandir}/man1/ttmkfdir.1.gz %changelog +* Wed Mar 26 2014 Parag Nemade - 3.0.9-41 +- Resolves:rh# ttmkfdir ftbfs in rawhide due to freetype header move +- Thanks baude for your patch + * Sun Aug 04 2013 Fedora Release Engineering - 3.0.9-40 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild @@ -184,7 +191,7 @@ cp -p %{SOURCE10} %{buildroot}%{_mandir}/man1/ * Fri Feb 13 2004 Elliot Lee - rebuilt -* Wed Feb 12 2004 Yu Shao 3.0.9-8 +* Thu Feb 12 2004 Yu Shao 3.0.9-8 - patch for building package against freetype-2.1.7 - from kanagawa jigorou (jigorou3@mail.goo.ne.jp) #114682