[gimp/f16] version 2.6.12

Wed Feb 1 10:19:40 UTC 2012

commit 2cb3b5b15f37b63257601ee0020a975eb313739f
Author: Nils Philippsen <nils at redhat.com>
Date:   Wed Feb 1 11:18:04 2012 +0100

    version 2.6.12

 .gitignore                                |    1 +
 gimp-2.6.10-script-fu-ipv6.patch          |  279 -------------
 gimp-2.6.11-CVE-2010-4540,4541,4542.patch |  143 -------
 gimp-2.6.11-colorxhtml.patch              |   43 --
 gimp-2.6.11-gif-load.patch                |  108 -----
 gimp-2.6.11-poppler-0.17.patch            |  477 ----------------------
 gimp-2.6.11-psp-overflow.patch            |   45 ---
 gimp-2.6.11-pyslice.patch                 |   36 --
 gimp-2.6.11-shell-dnd-quit-crash.patch    |   83 ----
 gimp-2.6.11-startup-warning.patch         |   38 --
 gimp-2.6.8-gold.patch                     |  616 -----------------------------
 gimp.spec                                 |   88 ++--
 sources                                   |    3 +-
 13 files changed, 46 insertions(+), 1914 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index 2390869..067761b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ gimp-2.6.10-1-autoreconf.patch.bz2
 /gimp-2.6.11-1-autoreconf.patch.bz2
 /gimp-2.6.11-10-autoreconf.patch.bz2
 /gimp-2.6.11-11-autoreconf.patch.bz2
+/gimp-2.6.12.tar.bz2
diff --git a/gimp.spec b/gimp.spec
index 838eb2f..e6d77e7 100644
--- a/gimp.spec
+++ b/gimp.spec
@@ -35,8 +35,8 @@
 Summary:        GNU Image Manipulation Program
 Name:           gimp
 Epoch:          2
-Version:        2.6.11
-Release:        23%{?dist}
+Version:        2.6.12
+Release:        1%{?dist}
 %define binver 2.6
 %define gimp_lang_ver 20
 %define interfacever 2.0
@@ -127,36 +127,6 @@ Patch1:         gimp-2.6.7-jpeg-units.patch
 # https://bugzilla.gnome.org/show_bug.cgi?id=556896
 # "Dialogs don't get minimized with single image window"
 Patch2:         gimp-2.6.6-minimize-dialogs.patch
-# backport: fix building with "gold" linker
-Patch3:         gimp-2.6.8-gold.patch
-# https://bugzilla.redhat.com/show_bug.cgi?id=198367
-# https://bugzilla.gnome.org/show_bug.cgi?id=623045
-# make script-fu logging IPv6 aware
-Patch4:         gimp-2.6.10-script-fu-ipv6.patch
-# https://bugzilla.redhat.com/show_bug.cgi?id=651002
-# avoid traceback in colorxhtml plugin, upstreamed
-Patch5:         gimp-2.6.11-colorxhtml.patch
-# https://bugzilla.redhat.com/show_bug.cgi?id=667958
-# avoid traceback in pyslice plugin, upstreamed
-Patch6:         gimp-2.6.11-pyslice.patch
-# backport: work with poppler-0.17, upstreamed
-Patch7:         gimp-2.6.11-poppler-0.17.patch
-# backport: CVE-2010-4543, CVE-2011-1782
-# harden PSP plugin against bogus input data
-Patch8:         gimp-2.6.11-psp-overflow.patch
-# backport: CVE-2010-4540, CVE-2010-4541, CVE-2010-4542
-# fix buffer overflows in sphere-designer, gfig, lighting plugins
-Patch9:         gimp-2.6.11-CVE-2010-4540,4541,4542.patch
-# https://bugzilla.redhat.com/show_bug.cgi?id=711952
-# https://bugzilla.gnome.org/show_bug.cgi?id=652280
-# guard against crash due to quitting while DND is processed, upstreamed
-Patch10:        gimp-2.6.11-shell-dnd-quit-crash.patch
-# backport: fix goption warning on startup
-Patch11:        gimp-2.6.11-startup-warning.patch
-# CVE-2011-2896: fix heap corruption and buffer overflow, upstreamed
-Patch12:        gimp-2.6.11-gif-load.patch
-# files changed by autoreconf after applying the above
-Patch100:       gimp-2.6.11-11-autoreconf.patch.bz2
 
 %description
 GIMP (GNU Image Manipulation Program) is a powerful image composition and
@@ -238,18 +208,6 @@ EOF
 %patch0 -p1 -b .xdg-open
 %patch1 -p1 -b .jpeg-units
 %patch2 -p1 -b .minimize-dialogs
-%patch3 -p1 -b .gold
-%patch4 -p1 -b .script-fu-ipv6
-%patch5 -p1 -b .colorxhtml
-%patch6 -p1 -b .pyslice
-%patch7 -p1 -b .poppler-0.17
-%patch8 -p1 -b .psp-overflow
-%patch9 -p1 -b .CVE-2010-4540,4541,4542
-%patch10 -p1 -b .shell-dnd-quit-crash
-%patch11 -p1 -b .startup-warning
-%patch12 -p1 -b .gif-load
-
-%patch100 -p1 -b .autoreconf
 
 %build
 # Use PIC/PIE because gimp is likely to deal with files coming from untrusted
@@ -515,6 +473,48 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_libdir}/gimp/%{interfacever}/plug-ins/help-browser
 
 %changelog
+* Tue Jan 31 2012 Nils Philippsen <nils at redhat.com> - 2:2.6.12-1
+- version 2.6.12
+
+  Overview of Changes from GIMP 2.6.11 to GIMP 2.6.12
+  ===================================================
+
+  * Bugs fixed:
+
+   627328 - GIMP 2.6.10 segfaults when CTRL-left click on a layer mask
+   631885 - GIMP fails to import a path from SVG
+   631728 - Crash or Gtk-CRITICAL on File->Open
+   641259 - [abrt] gimp-2:2.6.11-1.fc14: py-slice.py:172:slice:TypeError: integer argument expected, got float
+   640219 - gimp(1) manpage fixes
+   640612 - Sample Colorize does not function non-interactively
+   646947 - file-pdf-load: Don't use deprecated API
+   639203 - file-psp: fix for bogus input data
+   639203 - Fixes for some buffer overflow problems
+   652280 - Guard against crash due to quitting while DND is processed
+   660305 - fails to build with -Werror=format-security
+
+   ... plus a ton of others.
+
+  * Updated translations:
+
+   Asturian (ast)
+   Catalan (Valencian) (ca at valencia)
+   Danish (da)
+   Greek (el)
+   Esperanto (eo)
+   Spanish (es)
+   Italian (it)
+   Japanese (ja)
+   Kazakh (kk)
+   Latvian (la)
+   Norwegian Nynorsk (nn)
+   Polish (pl)
+   Portuguese (pt)
+   Brazilian Portuguese (pt_BR)
+   Russian (ru)
+   Turkish (tr)
+   Simplified Chinese (zh_CN)
+
 * Mon Oct  3 2011 Marek Kasik <mkasik at redhat.com> - 2:2.6.11-23
 - Rebuild (poppler-0.18.0 stable)
 
diff --git a/sources b/sources
index 0fc8b66..3e518d8 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-bb2939fe13e54fc7255cef5d097bb5dd  gimp-2.6.11.tar.bz2
-6693f03eddebb898720dccd758fbf30c  gimp-2.6.11-11-autoreconf.patch.bz2
+9f876ee63a0c4a4c83f50f32fb3bbe63  gimp-2.6.12.tar.bz2
