- work around broken sanity checks so it works with current babl and gegl

- rel 5

Changed files:
    gimp-sanity.patch -> 1.1
    gimp.spec -> 1.314

diff --git a/gimp-sanity.patch b/gimp-sanity.patch
new file mode 100644 (file)
index 0000000..610ee3f
--- /dev/null
+++ b/gimp-sanity.patch
@@ -0,0 +1,24 @@
+--- gimp/app/sanity.c~ 2008-11-20 23:43:08.000000000 +0100
++++ gimp/app/sanity.c  2009-07-16 14:31:04.372896443 +0200
+@@ -268,7 +268,8 @@
+ 
+   if (babl_major_version < BABL_REQUIRED_MAJOR ||
+       babl_minor_version < BABL_REQUIRED_MINOR ||
+-      babl_micro_version < BABL_REQUIRED_MICRO)
++      (babl_minor_version == BABL_REQUIRED_MINOR &&
++       babl_micro_version < BABL_REQUIRED_MICRO))
+     {
+       return g_strdup_printf
+         ("BABL version too old!\n\n"
+--- gimp/app/sanity.c~ 2009-07-16 14:32:02.917908312 +0200
++++ gimp/app/sanity.c  2009-07-16 14:34:55.401254723 +0200
+@@ -307,7 +307,8 @@
+ 
+   if (gegl_major_version < GEGL_REQUIRED_MAJOR ||
+       gegl_minor_version < GEGL_REQUIRED_MINOR ||
+-      gegl_micro_version < GEGL_REQUIRED_MICRO)
++      (gegl_minor_version == GEGL_REQUIRED_MINOR &&
++       gegl_micro_version < GEGL_REQUIRED_MICRO))
+     {
+       return g_strdup_printf
+         ("GEGL version too old!\n\n"

diff --git a/gimp.spec b/gimp.spec
index 86066af586147598f1029f95bb5c267e9f12953a..849c575a17865bfcf8f2b962dd4c0984ad0c206d 100644 (file)
--- a/gimp.spec
+++ b/gimp.spec
@@ -24,7 +24,7 @@ Summary(zh_CN.UTF-8): [图像]GNU图象处理工具
 Summary(zh_TW.UTF-8):  [圖像]GNU圖象處理工具
 Name:          gimp
 Version:       2.6.6
-Release:       4
+Release:       5
 Epoch:         1
 License:       GPL v2+
 Group:         X11/Applications/Graphics
@@ -33,6 +33,7 @@ Source0:      ftp://ftp.gimp.org/pub/gimp/v2.6/%{name}-%{version}.tar.bz2
 Patch0:                %{name}-home_etc.patch
 Patch1:                %{name}-desktop.patch
 Patch2:                %{name}-gcc4.patch
+Patch3:                %{name}-sanity.patch
 URL:           http://www.gimp.org/
 %{?with_aalib:BuildRequires:   aalib-devel}
 BuildRequires: alsa-lib-devel >= 1.0.11