diff --git a/suitesparse.changes b/suitesparse.changes index be0a895..e013094 100644 --- a/suitesparse.changes +++ b/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 diff --git a/suitesparse.spec b/suitesparse.spec index a5bbd54..8af4d2a 100644 --- a/suitesparse.spec +++ b/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