- up to 2.6.7

Changed files:
    gimp-sanity.patch -> 1.2
    gimp.spec -> 1.316

diff --git a/gimp-sanity.patch b/gimp-sanity.patch
deleted file mode 100644 (file)
index 610ee3f..0000000
--- a/gimp-sanity.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- 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 54ab7b2df9c093c0369644dacdad1ff4a1695eb8..a9b570d3943e4148977bfce0866505f5b9950edb 100644 (file)
--- a/gimp.spec
+++ b/gimp.spec
@@ -23,17 +23,16 @@ 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.6.6
-Release:       6
+Version:       2.6.7
+Release:       1
 Epoch:         1
 License:       GPL v2+
 Group:         X11/Applications/Graphics
 Source0:       ftp://ftp.gimp.org/pub/gimp/v2.6/%{name}-%{version}.tar.bz2
-# Source0-md5: 23d880dd09cd62c936ed04666a53f8e4
+# Source0-md5: 77ed86a8de9b48587efb24f2b115ad38
 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
@@ -310,7 +309,6 @@ Wtyczka SVG dla GIMPa.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
 
 %build
 %{__libtoolize}