diff --git a/ttmkfdir-3.0.9-freetype-header-fix.patch b/ttmkfdir-3.0.9-freetype-header-fix.patch deleted file mode 100644 index 44486ab..0000000 --- a/ttmkfdir-3.0.9-freetype-header-fix.patch +++ /dev/null @@ -1,12 +0,0 @@ -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/tttables.h" - #include "ttmkfdir.h" - #include "ttf.h" - #include "ttos2val.h" diff --git a/ttmkfdir-3.0.9-freetype-header-fix2.patch b/ttmkfdir-3.0.9-freetype-header-fix2.patch new file mode 100644 index 0000000..73bb7b2 --- /dev/null +++ b/ttmkfdir-3.0.9-freetype-header-fix2.patch @@ -0,0 +1,13 @@ +diff -rup ttmkfdir-3.0.9/ttf.cpp ttmkfdir-3.0.9_mod/ttf.cpp +--- ttmkfdir-3.0.9/ttf.cpp 2016-02-23 19:41:10.602175570 +0530 ++++ ttmkfdir-3.0.9_mod/ttf.cpp 2016-02-23 19:40:19.104015463 +0530 +@@ -3,7 +3,8 @@ + #include + #include + +-#include "freetype/tttables.h" ++#include ++#include FT_TRUETYPE_TABLES_H + #include "ttmkfdir.h" + #include "ttf.h" + #include "ttos2val.h" diff --git a/ttmkfdir.spec b/ttmkfdir.spec index 95698d7..e01038d 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: 47%{?dist} +Release: 48%{?dist} # Only licensing attribution is in README, no version. License: LGPLv2+ Group: Applications/System @@ -19,7 +19,7 @@ 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 +Patch10:ttmkfdir-3.0.9-freetype-header-fix2.patch Source10: ttmkfdir.1 BuildRequires: freetype-devel >= 2.0 @@ -60,6 +60,10 @@ cp -p %{SOURCE10} %{buildroot}%{_mandir}/man1/ %{_mandir}/man1/ttmkfdir.1.gz %changelog +* Tue Feb 23 2016 Pravin Satpute - 3.0.9-48 +- Removed ttmkfdir-3.0.9-freetype-header-fix.patch +- Resolves #1308197: ttmkfdir: FTBFS in rawhide + * Fri Feb 05 2016 Fedora Release Engineering - 3.0.9-47 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild