diff --git a/libreoffice.changes b/libreoffice.changes index e84cfc0..2939ba8 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Mar 4 10:00:18 UTC 2019 - Tomáš Chvátal + +- Switch to gcc7 on SLE12 + ------------------------------------------------------------------- Wed Feb 27 10:20:14 UTC 2019 - Tomáš Chvátal diff --git a/libreoffice.spec b/libreoffice.spec index a67c0c7..0b8937b 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -124,7 +124,6 @@ BuildRequires: fdupes BuildRequires: flex BuildRequires: flute BuildRequires: fontforge -BuildRequires: gcc-c++ BuildRequires: glm-devel BuildRequires: graphviz # Needed for tests @@ -260,6 +259,13 @@ Obsoletes: %{name}-icon-theme-crystal < %{version} Provides: %{name}-icon-theme-oxygen = %{version} Obsoletes: %{name}-icon-theme-oxygen < %{version} ExclusiveArch: aarch64 %{ix86} x86_64 +%if %{?suse_version} >= 1500 +BuildRequires: gcc >= 7 +BuildRequires: gcc-c++ >= 7 +%else +BuildRequires: gcc7 +BuildRequires: gcc7-c++ +%endif %if 0%{?suse_version} < 1500 Requires(post): update-desktop-files Requires(postun): update-desktop-files @@ -956,15 +962,14 @@ Provides %{langname} translations and additional resources (help files, etc.) fo %prep %setup -q -b2 -b4 -%if 0%{?suse_version} < 1330 +%if 0%{?suse_version} < 1500 # The rename of the configdir is needed only on older than factory for compat %patch1 -# patch to build with old boost -%patch5 -p1 %endif # Leap 42/SLE-12 %patch2 %patch3 %patch4 -p1 +%patch5 -p1 %patch6 -p1 %patch990 -p1 %patch991 -p1 @@ -1008,6 +1013,11 @@ CFLAGS="$ARCH_FLAGS" CXXFLAGS="$ARCH_FLAGS" export ARCH_FLAGS CFLAGS CXXFLAGS +%if 0%{?suse_version} < 1500 +export CC=gcc-7 +export CXX=g++-7 +%endif + # Colada does not have .pc file and configure creator was really lazy export OPENCOLLADA_CFLAGS='-I/usr/include/COLLADABaseUtils -I/usr/include/COLLADAFramework -I/usr/include/COLLADASaxFrameworkLoader -I/usr/include/GeneratedSaxParser' export OPENCOLLADA_LIBS='-lOpenCOLLADABaseUtils -lOpenCOLLADAFramework -lOpenCOLLADASaxFrameworkLoader -lGeneratedSaxParser'