Accepting request 619221 from home:StefanBruens:branches:science

Currently, octave is broken on Leap 42.3, as gcc-c++ >= 4.9 is not available (but gcc7-c++ is).
- Fix conditional to select the right gcc-c++ package, also for the
  devel subpackge

OBS-URL: https://build.opensuse.org/request/show/619221
OBS-URL: https://build.opensuse.org/package/show/science/suitesparse?expand=0&rev=13

suitesparse.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Jun 27 00:38:48 UTC 2018 - stefan.bruens@rwth-aachen.de
+
+- Fix conditional to select the right gcc-c++ package, also for the
+  devel subpackge
+
 -------------------------------------------------------------------
 Mon Feb 26 19:58:00 UTC 2018 - toddrme2178@gmail.com
 

suitesparse.spec

@@ -34,7 +34,7 @@ Source2:        %{name}-rpmlintrc
 # PATCH-FIX-OPENSUSE build_csparse_shared.patch -- Build CSparse as a shared library
 Patch1:         build_csparse_shared.patch
 Patch775418:    bnc775418-enable-SuiteSparse_time-symbol.patch
-%if 0%{?sle_version} == 120300 && 0%{?is_opensuse}
+%if 0%{?suse_version} < 1500
 BuildRequires:  gcc7
 BuildRequires:  gcc7-c++
 %else
@@ -93,7 +93,11 @@ matrices.
 Summary:        Development headers for SuiteSparse
 License:        GPL-2.0+ and LGPL-2.1+
 Group:          Development/Libraries/C and C++
+%if 0%{?suse_version} < 1500
+Requires:       gcc7-c++
+%else
 Requires:       gcc-c++ >= 4.9
+%endif
 Requires:       %{amdlib}       = %{amdver}
 Requires:       %{btflib}       = %{btfver}
 Requires:       %{camdlib}      = %{camdver}
@@ -515,7 +519,7 @@ rm SPQR/Doc/spqr.pdf
 %patch775418 -p1
 
 %build
-%if 0%{?sle_version} == 120300 && 0%{?is_opensuse}
+%if 0%{?suse_version} < 1500
 export CC=gcc-7
 export CXX=g++-7
 %endif