Accepting request 1191826 from home:mantarimay:branches:graphics
- Fix conditional build for leap OBS-URL: https://build.opensuse.org/request/show/1191826 OBS-URL: https://build.opensuse.org/package/show/graphics/oculante?expand=0&rev=31
This commit is contained in:
parent
a628d8ed03
commit
e4e1e74356
@ -1,3 +1,8 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Tue Aug 6 07:25:44 UTC 2024 - Muhammad Akbar Yanuar Mantari <mantarimay@pm.me>
|
||||||
|
|
||||||
|
- Fix conditional build for leap
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Mon Jul 29 14:50:34 UTC 2024 - Muhammad Akbar Yanuar Mantari <mantarimay@pm.me>
|
Mon Jul 29 14:50:34 UTC 2024 - Muhammad Akbar Yanuar Mantari <mantarimay@pm.me>
|
||||||
|
|
||||||
|
@ -29,8 +29,12 @@ Source1: vendor.tar.zst
|
|||||||
BuildRequires: cargo-packaging
|
BuildRequires: cargo-packaging
|
||||||
BuildRequires: cmake
|
BuildRequires: cmake
|
||||||
BuildRequires: desktop-file-utils
|
BuildRequires: desktop-file-utils
|
||||||
|
%if 0%{?suse_version} < 1600
|
||||||
BuildRequires: gcc%{?force_gcc_version}
|
BuildRequires: gcc%{?force_gcc_version}
|
||||||
BuildRequires: gcc%{?force_gcc_version}-c++
|
BuildRequires: gcc%{?force_gcc_version}-c++
|
||||||
|
%else
|
||||||
|
BuildRequires: gcc-c++
|
||||||
|
%endif
|
||||||
BuildRequires: gtk3-devel
|
BuildRequires: gtk3-devel
|
||||||
BuildRequires: libheif-devel
|
BuildRequires: libheif-devel
|
||||||
BuildRequires: nasm
|
BuildRequires: nasm
|
||||||
@ -45,8 +49,10 @@ tools.
|
|||||||
%autosetup -a1 -p1
|
%autosetup -a1 -p1
|
||||||
|
|
||||||
%build
|
%build
|
||||||
|
%if 0%{?suse_version} < 1600
|
||||||
export CC="gcc-%{?force_gcc_version}"
|
export CC="gcc-%{?force_gcc_version}"
|
||||||
export CXX="g++-%{?force_gcc_version}"
|
export CXX="g++-%{?force_gcc_version}"
|
||||||
|
%endif
|
||||||
%{cargo_build} \
|
%{cargo_build} \
|
||||||
%if 0%{?suse_version} > 1600
|
%if 0%{?suse_version} > 1600
|
||||||
--features 'heif' \
|
--features 'heif' \
|
||||||
@ -60,8 +66,10 @@ install -Dpm644 res/%{name}.desktop -t %{buildroot}%{_datadir}/applications
|
|||||||
|
|
||||||
%check
|
%check
|
||||||
%if %{with test}
|
%if %{with test}
|
||||||
|
%if 0%{?suse_version} < 1600
|
||||||
export CC="gcc-%{?force_gcc_version}"
|
export CC="gcc-%{?force_gcc_version}"
|
||||||
export CXX="g++-%{?force_gcc_version}"
|
export CXX="g++-%{?force_gcc_version}"
|
||||||
|
%endif
|
||||||
%{cargo_test} -- --skip=tests::net --skip=bench
|
%{cargo_test} -- --skip=tests::net --skip=bench
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user