From 84c82cb194dbb8cae8d2ce77c442d722f79381a6351e69e3b555399b2ba2df7b Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Sun, 25 Nov 2018 08:57:05 +0000 Subject: [PATCH] Accepting request 651556 from home:wolfi323:branches:home:luca_b:kapps1812beta - Use gcc7 to build on Leap 42.3, the default 4.8 is too old OBS-URL: https://build.opensuse.org/request/show/651556 OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/kmplot?expand=0&rev=79 --- kmplot.changes | 5 +++++ kmplot.spec | 11 ++++++++--- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/kmplot.changes b/kmplot.changes index 6c32075..72e5d55 100644 --- a/kmplot.changes +++ b/kmplot.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Nov 22 17:40:46 UTC 2018 - wbauer@tmo.at + +- Use gcc7 to build on Leap 42.3, the default 4.8 is too old + ------------------------------------------------------------------- Tue Nov 20 06:22:34 UTC 2018 - Luca Beltrame diff --git a/kmplot.spec b/kmplot.spec index fccc7a0..e96a10b 100644 --- a/kmplot.spec +++ b/kmplot.spec @@ -43,21 +43,26 @@ BuildRequires: pkgconfig(Qt5Svg) BuildRequires: pkgconfig(Qt5Widgets) Obsoletes: %{name}5 < %{version} Provides: %{name}5 = %{version} -%if %{with lang} Recommends: %{name}-lang +%if 0%{?suse_version} < 1500 +# the default gcc 4.8 is too old +BuildRequires: gcc7-c++ %endif %description Mathematical function plotter for KDE. -%if %{with lang} %lang_package -%endif %prep %setup -q %build +%if 0%{?suse_version} < 1500 +# the default gcc 4.8 is too old +export CC=gcc-7 +export CXX=g++-7 +%endif %ifarch ppc ppc64 export RPM_OPT_FLAGS="%{optflags} -mminimal-toc" %endif