Fridrich Strba 2024-03-20 07:29:36 +00:00 committed by Git OBS Bridge
parent db1e9dba6d
commit 0fe4157663

View File

@ -99,6 +99,9 @@
%global package_version %{featurever}.%{interimver}.%{?updatever:%{updatever}}%{!?updatever:0}.%{?patchver:%{patchver}}%{!?patchver:0}~%{buildver} %global package_version %{featurever}.%{interimver}.%{?updatever:%{updatever}}%{!?updatever:0}.%{?patchver:%{patchver}}%{!?patchver:0}~%{buildver}
%endif %endif
%global NSS_LIBDIR %(pkg-config --variable=libdir nss) %global NSS_LIBDIR %(pkg-config --variable=libdir nss)
%if 0%{?gcc_version} < 7
%global with_gcc 7
%endif
%bcond_with zero %bcond_with zero
%if ! %{with zero} %if ! %{with zero}
%global with_systemtap 1 %global with_systemtap 1
@ -179,6 +182,8 @@ BuildRequires: desktop-file-utils
BuildRequires: fdupes BuildRequires: fdupes
BuildRequires: fontconfig-devel BuildRequires: fontconfig-devel
BuildRequires: freetype2-devel BuildRequires: freetype2-devel
BuildRequires: gcc%{?with_gcc}
BuildRequires: gcc%{?with_gcc}-c++
BuildRequires: giflib-devel BuildRequires: giflib-devel
BuildRequires: hicolor-icon-theme BuildRequires: hicolor-icon-theme
BuildRequires: java-ca-certificates BuildRequires: java-ca-certificates
@ -232,13 +237,6 @@ Provides: jre1.7.x
Provides: jre1.8.x Provides: jre1.8.x
Provides: jre1.9.x Provides: jre1.9.x
%endif %endif
%if 0%{?suse_version} < 1500
BuildRequires: gcc7
BuildRequires: gcc7-c++
%else
BuildRequires: gcc >= 7
BuildRequires: gcc-c++ >= 7
%endif
%if %{with_system_lcms} %if %{with_system_lcms}
BuildRequires: liblcms2-devel BuildRequires: liblcms2-devel
%endif %endif
@ -452,11 +450,11 @@ mkdir -p %{buildoutputdir}
pushd %{buildoutputdir} pushd %{buildoutputdir}
bash ../configure \ bash ../configure \
%if 0%{?suse_version} < 1500 %if 0%{?with_gcc}
CPP=cpp-7 \ CPP="cpp-%{with_gcc}" \
CXX=g++-7 \ CXX="g++-%{with_gcc}" \
CC=gcc-7 \ CC="gcc-%{with_gcc}" \
NM=gcc-nm-7 \ NM="gcc-nm-%{with_gcc}" \
%endif %endif
%if %{is_release} %if %{is_release}
--with-version-pre="" \ --with-version-pre="" \