From fcb0537d2573fff348da0f17f87e3e42ab67c185cd761b66e846483a17cecda4 Mon Sep 17 00:00:00 2001
From: OBS User autobuild <null@suse.de>
Date: Fri, 18 Dec 2009 12:46:05 +0000
Subject: [PATCH] Accepting request 26995 from GNOME:Factory

Copy from GNOME:Factory/gimp based on submit request 26995 from user vuntz

OBS-URL: https://build.opensuse.org/request/show/26995
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gimp?expand=0&rev=38
---
 gimp-2.6.7.tar.bz2 |  3 ---
 gimp-2.6.8.tar.bz2 |  3 +++
 gimp.changes       | 34 ++++++++++++++++++++++++++++++++++
 gimp.spec          | 16 ++++++++--------
 4 files changed, 45 insertions(+), 11 deletions(-)
 delete mode 100644 gimp-2.6.7.tar.bz2
 create mode 100644 gimp-2.6.8.tar.bz2

diff --git a/gimp-2.6.7.tar.bz2 b/gimp-2.6.7.tar.bz2
deleted file mode 100644
index 6251605..0000000
--- a/gimp-2.6.7.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a401c5fbe59e812413cb4d0b37607680089bf254056d8b5853aa79e03a6fe115
-size 16341756
diff --git a/gimp-2.6.8.tar.bz2 b/gimp-2.6.8.tar.bz2
new file mode 100644
index 0000000..35bb629
--- /dev/null
+++ b/gimp-2.6.8.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d5d4218b742390157fca23a9d2cce436904546a2ea419ffeb44a5f43c99a3332
+size 16342377
diff --git a/gimp.changes b/gimp.changes
index ee7dba2..091cf9e 100644
--- a/gimp.changes
+++ b/gimp.changes
@@ -1,3 +1,37 @@
+-------------------------------------------------------------------
+Fri Dec 11 15:43:28 CET 2009 - vuntz@opensuse.org
+
+- Update to version 2.6.8:
+  + bgo#470698 - MapObject cannot modify highlight
+  + bgo#593848 - FG color changed to black when FG-BG Editor tab
+                 created
+  + bgo#594651 - layer.scale() raises RuntimeError
+  + bgo#594998 - Keyboard shortcuts does not work for first image
+                 when dock is focused
+  + bgo#599765 - F1 key on gimp-tool-align in menu have wrong link
+                 and it open gimp-tool-move
+  + bgo#600484 - Gimp BMP Integer Overflow Vulnerability
+  + bgo#600741 - "read_channel_data()" Integer Overflow
+                 Vulnerability
+  + bgo#601891 - gimp_image_get_selection returns None
+  + bgo#602761 - plug-in-grid: Parameters Horizontal/Vertical
+                 Spacing and Horizontal/Vertical Offset are
+                 reversed.
+  + bgo#603995 - PCX plugin doesn't sanitize input to avoid
+                 allocation overflows.
+  + bgo#603998 - PCX: Calculating amount of memory to allocate may
+                 overflow.
+  + bgo#604000 - SGI: sanitize input
+  + bgo#604001 - SGI: Calculating amount of memory to allocate may
+                 overflow.
+  + bgo#604002 - SGI: RLE encoded input data may write beyond
+                 allocated buffers
+  + bgo#604004 - SGI: allocate memory consistently
+  + bgo#604008 - GBR, PAT: sanitize input data
+  + bgo#604078 - Crash when pressing Backspace with Free Select
+                 Tool
+  + Updated translations.
+
 -------------------------------------------------------------------
 Mon Oct 26 16:51:28 CET 2009 - sbrabec@suse.cz
 
diff --git a/gimp.spec b/gimp.spec
index 7bce51a..6be08cf 100644
--- a/gimp.spec
+++ b/gimp.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package gimp (Version 2.6.7)
+# spec file for package gimp (Version 2.6.8)
 #
 # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -47,9 +47,9 @@ BuildRequires:  translation-update-upstream
 BuildRequires:  update-desktop-files
 BuildRequires:  xorg-x11-libXfixes-devel
 Url:            http://www.gimp.org/
-Version:        2.6.7
-Release:        4
-License:        GPL v2 or later
+Version:        2.6.8
+Release:        1
+License:        GPLv2+
 Group:          Productivity/Graphics/Bitmap Editors
 Suggests:       AdobeICCProfiles
 Provides:       gimp-2.0 = %{version}
@@ -78,7 +78,7 @@ distribute.
 
 
 %package branding-upstream
-License:        GPL v2 or later
+License:        GPLv2+
 Summary:        The GNU Image Manipulation Program
 Group:          Productivity/Graphics/Bitmap Editors
 Provides:       %{name}-branding = %{version}
@@ -105,7 +105,7 @@ distribute.
 
 
 %package plugins-python
-License:        GPL v2 or later
+License:        GPLv2+
 Summary:        The GNU Image Manipulation Program - python-gtk based plugins
 Requires:       %{name} = %{version} python-gtk
 Supplements:    %{name}
@@ -130,7 +130,7 @@ distribute.
 
 
 %package devel
-License:        GPL v2 or later
+License:        GPLv2+
 Summary:        The GNU Image Manipulation Program
 Requires:       %{name} = %{version}
 Requires:       glib2-devel
@@ -155,7 +155,7 @@ distribute.
 
 
 %package help-browser
-License:        GPL v2 or later
+License:        GPLv2+
 Summary:        The GNU Image Manipulation Program - Help Browser
 Group:          Productivity/Graphics/Bitmap Editors
 Requires:       %{name} = %{version}