1
0
Fridrich Strba 2021-11-01 17:58:00 +00:00 committed by Git OBS Bridge
parent a75be3b992
commit e2139b8947

View File

@ -119,11 +119,8 @@ Patch201: system-libjpeg.patch
Patch202: system-libpng.patch
Patch203: system-lcms.patch
Patch205: link-with-as-needed.patch
Patch210: openj9-no-werror.patch
Patch300: alternative-path-to-tzdb_dat.patch
BuildRequires: alsa-lib-devel
BuildRequires: autoconf
BuildRequires: automake
@ -134,7 +131,6 @@ BuildRequires: desktop-file-utils
BuildRequires: fdupes
BuildRequires: fontconfig
BuildRequires: freetype2-devel
BuildRequires: gcc-c++
BuildRequires: giflib-devel
BuildRequires: gtk2-devel
BuildRequires: java-ca-certificates
@ -198,6 +194,13 @@ Provides: jre1.6.x
Provides: jre1.7.x
Provides: jre1.8.x
ExclusiveArch: x86_64 ppc64le s390x aarch64
%if 0%{?suse_version} >= 1550
BuildRequires: gcc7
BuildRequires: gcc7-c++
%else
BuildRequires: gcc >= 7
BuildRequires: gcc-c++ >= 7
%endif
%if %{bootcycle}
BuildRequires: java-devel >= 1.7
BuildConflicts: java >= 9
@ -387,6 +390,12 @@ EXTRA_CFLAGS="$EXTRA_CFLAGS -fno-strict-aliasing"
%endif
bash configure \
%if 0%{?suse_version} >= 1550
CPP=cpp-7 \
CXX=g++-7 \
CC=gcc-7 \
NM=gcc-nm-7 \
%endif
--disable-zip-debug-info \
--with-milestone="fcs" \
--with-update-version=%{updatever} \