Accepting request 621358 from home:ecsos

- fix build error for Leap 42.3
- add missing requires

OBS-URL: https://build.opensuse.org/request/show/621358
OBS-URL: https://build.opensuse.org/package/show/graphics/gimp?expand=0&rev=31

gimp.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Jul  6 17:47:11 UTC 2018 - ecsos@opensuse.org
+
+- fix build error for Leap 42.3
+- add missing requires
+
 -------------------------------------------------------------------
 Fri Jul  6 01:20:19 UTC 2018 - mrueckert@suse.de
 

gimp.spec

@@ -35,7 +35,12 @@ BuildRequires:  aalib-devel
 BuildRequires:  alsa-devel >= 1.0.0
 BuildRequires:  fdupes
 BuildRequires:  fontconfig-devel >= 2.12.4
+%if 0%{?suse_version} < 1500
+BuildRequires:  gcc7
+BuildRequires:  gcc7-c++
+%else
 BuildRequires:  gcc-c++
+%endif
 BuildRequires:  gdk-pixbuf-loader-rsvg
 # For some odd reason build needs gegl executable.
 BuildRequires:  gegl
@@ -87,6 +92,10 @@ BuildRequires:  pkgconfig(xfixes)
 BuildRequires:  pkgconfig(xpm)
 BuildRequires:  pkgconfig(zlib)
 BuildRequires:  xdg-utils
+# obs does not automaticaly add this
+Requires:       libglib-2_0-0 >= 2.54.2
+Requires:       libgexiv2-2 >= 0.10.6
+Requires:       libbabl-0_1-0 >= 0.1.46
 # Explicitly declare the libgimp versions for upgrade purposes
 Requires:       libgimp-2_0-0 = %{version}
 Requires:       libgimpui-2_0-0 = %{version}
@@ -185,7 +194,6 @@ applications that want to make use of the GIMP libraries.
 %prep
 %setup -q
 
-
 export LC_ALL=en_US.UTF-8
 export LANG=en_US.UTF-8
 translation-update-upstream
@@ -210,6 +218,10 @@ if test "x${vapi}" != "x%{apiver}"; then
 fi
 
 %build
+%if 0%{?suse_version} < 1500
+test -x "$(type -p %{_bindir}/gcc-7)" && export CC="%{_bindir}/gcc-7"
+test -x "$(type -p %{_bindir}/g++-7)" && export CXX="%{_bindir}/g++-7"
+%endif
 export LC_ALL=en_US.UTF-8
 export LANG=en_US.UTF-8
 export CFLAGS="%{optflags} -fno-strict-aliasing"