From e4e1e7435606df05f5c1f4cb5c3bf3e43ecd3bc2df5f0f72531f489239db2084 Mon Sep 17 00:00:00 2001 From: Muhammad Akbar Yanuar Mantari Date: Tue, 6 Aug 2024 08:08:33 +0000 Subject: [PATCH] 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 --- oculante.changes | 5 +++++ oculante.spec | 8 ++++++++ 2 files changed, 13 insertions(+) diff --git a/oculante.changes b/oculante.changes index c36a245..f30b20d 100644 --- a/oculante.changes +++ b/oculante.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Aug 6 07:25:44 UTC 2024 - Muhammad Akbar Yanuar Mantari + +- Fix conditional build for leap + ------------------------------------------------------------------- Mon Jul 29 14:50:34 UTC 2024 - Muhammad Akbar Yanuar Mantari diff --git a/oculante.spec b/oculante.spec index 3e46717..88b90a2 100644 --- a/oculante.spec +++ b/oculante.spec @@ -29,8 +29,12 @@ Source1: vendor.tar.zst BuildRequires: cargo-packaging BuildRequires: cmake BuildRequires: desktop-file-utils +%if 0%{?suse_version} < 1600 BuildRequires: gcc%{?force_gcc_version} BuildRequires: gcc%{?force_gcc_version}-c++ +%else +BuildRequires: gcc-c++ +%endif BuildRequires: gtk3-devel BuildRequires: libheif-devel BuildRequires: nasm @@ -45,8 +49,10 @@ tools. %autosetup -a1 -p1 %build +%if 0%{?suse_version} < 1600 export CC="gcc-%{?force_gcc_version}" export CXX="g++-%{?force_gcc_version}" +%endif %{cargo_build} \ %if 0%{?suse_version} > 1600 --features 'heif' \ @@ -60,8 +66,10 @@ install -Dpm644 res/%{name}.desktop -t %{buildroot}%{_datadir}/applications %check %if %{with test} +%if 0%{?suse_version} < 1600 export CC="gcc-%{?force_gcc_version}" export CXX="g++-%{?force_gcc_version}" +%endif %{cargo_test} -- --skip=tests::net --skip=bench %endif