- updated to 2.8.10

- added freetype patch (fixes build with freetype 2.5.1)

diff --git a/gimp-freetype.patch b/gimp-freetype.patch
new file mode 100644 (file)
index 0000000..a613a6d
--- /dev/null
+++ b/gimp-freetype.patch
@@ -0,0 +1,11 @@
+--- gimp-2.8.10/app/text/gimpfont.c.orig       2012-05-08 08:05:46.000000000 +0200
++++ gimp-2.8.10/app/text/gimpfont.c    2013-12-09 21:43:43.190772873 +0100
+@@ -27,7 +27,7 @@
+ 
+ #define PANGO_ENABLE_ENGINE  1   /* Argh */
+ #include <pango/pango-ot.h>
+-#include <freetype/tttables.h>
++#include FT_TRUETYPE_TABLES_H
+ 
+ #include "text-types.h"
+ 

diff --git a/gimp.spec b/gimp.spec
index e12951b22f22498d4c04219679abf84dc2402e9e..6939e7196b851951531a21a4d4d098697ae8847f 100644 (file)
--- a/gimp.spec
+++ b/gimp.spec
@@ -18,16 +18,17 @@ Summary(uk.UTF-8):  The GNU Image Manipulation Program
 Summary(zh_CN.UTF-8):  [图像]GNU图象处理工具
 Summary(zh_TW.UTF-8):  [圖像]GNU圖象處理工具
 Name:          gimp
-Version:       2.8.8
+Version:       2.8.10
 Release:       1
 Epoch:         1
 License:       GPL v3+
 Group:         X11/Applications/Graphics
 Source0:       ftp://ftp.gimp.org/pub/gimp/v2.8/%{name}-%{version}.tar.bz2
-# Source0-md5: ef2547c3514a1096931637bd6250635a
+# Source0-md5: 84c964aab7044489af69f7319bb59b47
 Patch0:                %{name}-home_etc.patch
 Patch1:                %{name}-desktop.patch
 Patch2:                %{name}-gcc4.patch
+Patch3:                %{name}-freetype.patch
 URL:           http://www.gimp.org/
 %{?with_aalib:BuildRequires:   aalib-devel}
 BuildRequires: alsa-lib-devel >= 1.0.11
@@ -322,10 +323,10 @@ Wtyczka SVG dla GIMPa.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-#%patch3 -p1
+%patch3 -p1
 
 %build
-rm acinclude.m4
+%{__rm} acinclude.m4
 %{__gtkdocize}
 %{__libtoolize}
 %{__aclocal} -I m4macros
@@ -388,6 +389,7 @@ umask 022
 %attr(755,root,root) %{_bindir}/gimp
 %attr(755,root,root) %{_bindir}/gimp-console-2.8
 %attr(755,root,root) %{_bindir}/gimp-console
+%{_datadir}/appdata/gimp.appdata.xml
 %{_desktopdir}/gimp.desktop
 %{_mandir}/man1/gimp-2.8.1*
 %{_mandir}/man1/gimp.1*