Solve merge conflict

.gitignore

@@ -28,3 +28,4 @@ gimp-2.6.10-1-autoreconf.patch.bz2
 /gimp-2.10.4.tar.bz2
 /gimp-2.10.6.tar.bz2
 /gimp-2.10.8.tar.bz2
+/gimp-2.10.10.tar.bz2

gimp.spec

@@ -87,8 +87,8 @@ find $bytecode_compilation_path -type f -a -name "*.py" -print0 | xargs -0 $pyth
 Summary:        GNU Image Manipulation Program
 Name:           gimp
 Epoch:          2
-Version:        2.10.8
-%global rel 7
+Version:        2.10.10
+%global rel 1
 Release:        %{?prerelprefix}%{rel}%{dotprerel}%{dotgitrev}%{?dist}
 
 # Compute some version related macros.
@@ -96,7 +96,7 @@ Release:        %{?prerelprefix}%{rel}%{dotprerel}%{dotgitrev}%{?dist}
 %global major %(ver=%{version}; echo ${ver%%%%.*})
 %global minor %(ver=%{version}; ver=${ver#%major.}; echo ${ver%%%%.*})
 %global micro %(ver=%{version}; ver=${ver#%major.%minor.}; echo ${ver%%%%.*})
-%global binver %{major}.%{minor}
+%global binver 2.10
 %global interface_age 0
 %global gettext_version %{major}0
 %global lib_api_version %{major}.0
@@ -134,7 +134,7 @@ BuildRequires:  freetype-devel >= 2.1.7
 BuildRequires:  gcc
 BuildRequires:  gdk-pixbuf2-devel >= 2.30.8
 BuildRequires:  gegl04-tools
-BuildRequires:  gegl04-devel >= 0.4.12
+BuildRequires:  gegl04-devel >= 0.4.14
 BuildRequires:  libgs-devel
 BuildRequires:  glib2-devel >= 2.54.2
 BuildRequires:  gtk2-devel >= 2.24.10
@@ -190,7 +190,7 @@ BuildRequires:  ImageMagick
 %endif
 
 Requires:       babl%{?_isa} >= 0.1.58
-Requires:       gegl04%{?_isa} >= 0.4.12
+Requires:       gegl04%{?_isa} >= 0.4.14
 Requires:       fontconfig >= 2.12.4
 Requires:       freetype >= 2.1.7
 Requires:       glib2 >= 2.54.0
@@ -692,6 +692,12 @@ make check %{?_smp_mflags}
 %endif
 
 %changelog
+* Mon Apr 08 2019 Josef Ridky <jridky@redhat.com> - 2:2.10.10-1
+- New upstream release 2.10.10 (#1697119)
+
+* Mon Mar 25 2019 Josef Ridky <jridky@redhat.com> - 2:2.10.8-8
+- Rebuild for gegl04 rebase
+
 * Fri Feb 01 2019 Caolán McNamara <caolanm@redhat.com> - 2:2.10.8-7
 - Rebuilt for fixed libwmf soname
 

sources

@@ -1 +1 @@
-SHA512 (gimp-2.10.8.tar.bz2) = b458dd710b786152f95a8e48a0727b71cac549fccb31ac9e1e6ac3c617652079773ce7076401f8ade750ed38bdc78dfdec3317423f4c4e9c931f78002bd7454e
+SHA512 (gimp-2.10.10.tar.bz2) = 87caab9643a018e741e5e51c61220b7b282a66ed5bb723750cdf4139950f98c9ab246f4d6450420531d0e878c4561150efc4063cda896f08b25669bac4d1d172