pool/libreoffice
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- Switch to gcc7 on SLE12

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=759
This commit is contained in:
Tomáš Chvátal 2019-03-04 11:06:59 +00:00 committed by Git OBS Bridge
parent 2f98415930
commit d6a0e2e50d
2 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libreoffice.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Mon Mar 4 10:00:18 UTC 2019 - Tomáš Chvátal <tchvatal@suse.com>
- Switch to gcc7 on SLE12
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Feb 27 10:20:14 UTC 2019 - Tomáš Chvátal <tchvatal@suse.com> Wed Feb 27 10:20:14 UTC 2019 - Tomáš Chvátal <tchvatal@suse.com>

18
libreoffice.spec
View File

@ -124,7 +124,6 @@ BuildRequires: fdupes
BuildRequires: flex BuildRequires: flex
BuildRequires: flute BuildRequires: flute
BuildRequires: fontforge BuildRequires: fontforge
BuildRequires: gcc-c++
BuildRequires: glm-devel BuildRequires: glm-devel
BuildRequires: graphviz BuildRequires: graphviz
# Needed for tests # Needed for tests
@ -260,6 +259,13 @@ Obsoletes: %{name}-icon-theme-crystal < %{version}
Provides: %{name}-icon-theme-oxygen = %{version} Provides: %{name}-icon-theme-oxygen = %{version}
Obsoletes: %{name}-icon-theme-oxygen < %{version} Obsoletes: %{name}-icon-theme-oxygen < %{version}
ExclusiveArch: aarch64 %{ix86} x86_64 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 %if 0%{?suse_version} < 1500
Requires(post): update-desktop-files Requires(post): update-desktop-files
Requires(postun): update-desktop-files Requires(postun): update-desktop-files
@ -956,15 +962,14 @@ Provides %{langname} translations and additional resources (help files, etc.) fo
%prep %prep
%setup -q -b2 -b4 %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 # The rename of the configdir is needed only on older than factory for compat
%patch1 %patch1
# patch to build with old boost
%patch5 -p1
%endif # Leap 42/SLE-12 %endif # Leap 42/SLE-12
%patch2 %patch2
%patch3 %patch3
%patch4 -p1 %patch4 -p1
%patch5 -p1
%patch6 -p1 %patch6 -p1
%patch990 -p1 %patch990 -p1
%patch991 -p1 %patch991 -p1
@ -1008,6 +1013,11 @@ CFLAGS="$ARCH_FLAGS"
CXXFLAGS="$ARCH_FLAGS" CXXFLAGS="$ARCH_FLAGS"
export ARCH_FLAGS CFLAGS CXXFLAGS 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 # 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_CFLAGS='-I/usr/include/COLLADABaseUtils -I/usr/include/COLLADAFramework -I/usr/include/COLLADASaxFrameworkLoader -I/usr/include/GeneratedSaxParser'
export OPENCOLLADA_LIBS='-lOpenCOLLADABaseUtils -lOpenCOLLADAFramework -lOpenCOLLADASaxFrameworkLoader -lGeneratedSaxParser' export OPENCOLLADA_LIBS='-lOpenCOLLADABaseUtils -lOpenCOLLADAFramework -lOpenCOLLADASaxFrameworkLoader -lGeneratedSaxParser'