rpms/gimp/devel gimp-2.6.6-gegl-babl-versions-check.patch, NONE, 1.1 gimp.spec, 1.191, 1.192

[Nils Philippsen]

Author: nphilipp

Update of /cvs/pkgs/rpms/gimp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3999

Modified Files:
	gimp.spec 
Added Files:
	gimp-2.6.6-gegl-babl-versions-check.patch 
Log Message:
use backported patch to correctly check gegl/babl versions

gimp-2.6.6-gegl-babl-versions-check.patch:

--- NEW FILE gimp-2.6.6-gegl-babl-versions-check.patch ---
diff -up gimp-2.6.6/app/sanity.c.gegl-babl-versions-check gimp-2.6.6/app/sanity.c
--- gimp-2.6.6/app/sanity.c.gegl-babl-versions-check	2008-11-20 23:43:08.000000000 +0100
+++ gimp-2.6.6/app/sanity.c	2009-06-05 10:26:03.043506642 +0200
@@ -75,6 +75,29 @@ sanity_check (void)
 
 /*  private functions  */
 
+static gboolean
+sanity_check_version (guint major_version, guint required_major,
+                      guint minor_version, guint required_minor,
+                      guint micro_version, guint required_micro)
+{
+  if (major_version > required_major)
+    return TRUE;
+
+  if (major_version < required_major)
+    return FALSE;
+
+  if (minor_version > required_minor)
+    return TRUE;
+
+  if (minor_version < required_minor)
+    return FALSE;
+
+  if (micro_version >= required_micro)
+    return TRUE;
+
+  return FALSE;
+}
+
 static gchar *
 sanity_check_gimp (void)
 {
@@ -266,9 +289,9 @@ sanity_check_babl (void)
                     &babl_minor_version,
                     &babl_micro_version);
 
-  if (babl_major_version < BABL_REQUIRED_MAJOR ||
-      babl_minor_version < BABL_REQUIRED_MINOR ||
-      babl_micro_version < BABL_REQUIRED_MICRO)
+  if (! sanity_check_version (babl_major_version, BABL_REQUIRED_MAJOR,
+                              babl_minor_version, BABL_REQUIRED_MINOR,
+                              babl_micro_version, BABL_REQUIRED_MICRO))
     {
       return g_strdup_printf
         ("BABL version too old!\n\n"
@@ -304,9 +327,9 @@ sanity_check_gegl (void)
                     &gegl_minor_version,
                     &gegl_micro_version);
 
-  if (gegl_major_version < GEGL_REQUIRED_MAJOR ||
-      gegl_minor_version < GEGL_REQUIRED_MINOR ||
-      gegl_micro_version < GEGL_REQUIRED_MICRO)
+  if (! sanity_check_version (gegl_major_version, GEGL_REQUIRED_MAJOR,
+                              gegl_minor_version, GEGL_REQUIRED_MINOR,
+                              gegl_micro_version, GEGL_REQUIRED_MICRO))
     {
       return g_strdup_printf
         ("GEGL version too old!\n\n"


Index: gimp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gimp/devel/gimp.spec,v
retrieving revision 1.191
retrieving revision 1.192
diff -u -p -r1.191 -r1.192
--- gimp.spec	4 Jun 2009 15:23:53 -0000	1.191
+++ gimp.spec	5 Jun 2009 08:28:30 -0000	1.192
@@ -119,6 +119,7 @@ Source1:        gimp-plugin-mgr.in
 Patch0:         gimp-2.6.2-xdg-open.patch
 Patch1:         gimp-2.6.2-jpeg-units.patch
 Patch2:         gimp-2.6.6-minimize-dialogs.patch
+Patch3:         gimp-2.6.6-gegl-babl-versions-check.patch
 
 %description
 GIMP (GNU Image Manipulation Program) is a powerful image composition and
@@ -200,6 +201,7 @@ EOF
 %patch0 -p1 -b .xdg-open
 %patch1 -p1 -b .jpeg-units
 %patch2 -p1 -b .minimize-dialogs
+%patch3 -p1 -b .gegl-babl-versions-check
 
 %build
 # if [ ! -f configure ]; then
@@ -490,8 +492,9 @@ fi
 %{_libdir}/gimp/%{interfacever}/plug-ins/help-browser
 
 %changelog
-* Thu Jun 04 2009 Nils Philippsen <nils at redhat.com> - 2:2.6.6-4
+* Fri Jun 05 2009 Nils Philippsen <nils at redhat.com> - 2:2.6.6-4
 - don't build against aalib on RHEL
+- use backported patch to correctly check gegl/babl versions
 
 * Tue Apr 14 2009 Nils Philippsen <nils at redhat.com> - 2:2.6.6-3
 - remove rpaths from binaries (#495670)