[gimp] don't crash when smudging with sizes <= 1.4 (#810850)

[Nils Philippsen]

commit fec0651c5989d5762943e675ab57e5152bf96f25
Author: Nils Philippsen <nils at redhat.com>
Date:   Wed Apr 11 21:48:31 2012 +0200

    don't crash when smudging with sizes <= 1.4 (#810850)

 .gitignore |    1 +
 gimp.spec  |   34 +++++++++++++++++++++++++++-------
 sources    |    1 +
 3 files changed, 29 insertions(+), 7 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 4e363ba..f555a7c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@ gimp-2.6.10-1-autoreconf.patch.bz2
 /gimp-2.7.4.tar.bz2
 /gimp-2.7.5.tar.bz2
 /gimp-2.8.0-RC1.tar.bz2
+/gimp-2.8.0-RC1-gitff6c280.patch.bz2
diff --git a/gimp.spec b/gimp.spec
index 268d369..800a486 100644
--- a/gimp.spec
+++ b/gimp.spec
@@ -44,15 +44,24 @@
 # Set this in pre-releases (e.g. release candidates)
 %global prerel RC1
 
+# Set this when building from intermediate git revisions
+%global gitrev ff6c280
+
+%if %{defined prerel}
+%global dotprerel .%{prerel}
+%global dashprerel -%{prerel}
+%global prerelprefix 0.
+%endif
+
+%if %{defined gitrev}
+%global dotgitrev .git%{gitrev}
+%endif
+
 Summary:        GNU Image Manipulation Program
 Name:           gimp
 Epoch:          2
 Version:        2.8.0
-%if %{undefined prerel}
-Release:        1%{?dist}
-%else
-Release:        0.1.%{prerel}%{?dist}
-%endif
+Release:        %{?prerelprefix}2%{dotprerel}%{dotgitrev}%{?dist}
 
 # Compute some version related macros
 # Ugly hack, you need to get your quoting backslashes/percent signs straight
@@ -159,7 +168,11 @@ Requires:       pygtk2 >= 2.10.4
 Requires:       xdg-utils
 Requires:       gimp-libs%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
 
-Source0:        ftp://ftp.gimp.org/pub/gimp/v%{binver}/gimp-%{version}%{?prerel:-%{prerel}}.tar.bz2
+Source0:        ftp://ftp.gimp.org/pub/gimp/v%{binver}/gimp-%{version}%{dashprerel}.tar.bz2
+
+%if %{defined gitrev}
+Patch0:         gimp-%{version}%{dashprerel}-git%{gitrev}.patch.bz2
+%endif
 
 %description
 GIMP (GNU Image Manipulation Program) is a powerful image composition and
@@ -236,7 +249,11 @@ use poppler:                  %{with poppler}
 --- >8 ---------------------------------------------------------------------
 EOF
 
-%setup -q -n gimp-%{version}%{?prerel:-%{prerel}}
+%setup -q -n gimp-%{version}%{dashprerel}
+
+%if %{defined gitrev}
+%patch0 -p1 -b .git%{gitrev}
+%endif
 
 %build
 %if %{with hardening}
@@ -509,6 +526,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_libdir}/gimp/%{lib_api_version}/plug-ins/help-browser
 
 %changelog
+* Wed Apr 11 2012 Nils Philippsen <nils at redhat.com> - 2:2.8.0-0.2.RC1.gitff6c280
+- don't crash when smudging with sizes <= 1.4 (#810850)
+
 * Tue Apr 03 2012 Nils Philippsen <nils at redhat.com> - 2:2.8.0-0.1.RC1
 - version 2.8.0-RC1 (release candidate):
  - Add our own GimpOperationBrightnessContrast because GEGL one is different
diff --git a/sources b/sources
index 398d860..7bba246 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
 134396e4399b7e753ffca7ba366c418f  gimp-2.8.0-RC1.tar.bz2
+c42587a90bb03c0b964a5a7dd3e9ed2e  gimp-2.8.0-RC1-gitff6c280.patch.bz2