From 9d70ec71d9511da7647a4c5adf1c8a32e7d4f0ea38d3fc5e4845c58a982c8aeb Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Wed, 14 Feb 2024 09:12:13 +0000 Subject: [PATCH] Accepting request 1146475 from GNOME:Next - Explicitly use gcc 13 on SLE. OBS-URL: https://build.opensuse.org/request/show/1146475 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/shared-mime-info?expand=0&rev=106 --- shared-mime-info.changes | 5 +++++ shared-mime-info.spec | 12 +++++++++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/shared-mime-info.changes b/shared-mime-info.changes index 360a2dc..4242af8 100644 --- a/shared-mime-info.changes +++ b/shared-mime-info.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Feb 12 23:45:56 UTC 2024 - Michael Gorse + +- Explicitly use gcc 13 on SLE. + ------------------------------------------------------------------- Sun Nov 12 11:19:19 UTC 2023 - Christophe Marin diff --git a/shared-mime-info.spec b/shared-mime-info.spec index b806afc..956d127 100644 --- a/shared-mime-info.spec +++ b/shared-mime-info.spec @@ -1,7 +1,7 @@ # # spec file for package shared-mime-info # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -27,7 +27,13 @@ URL: https://gitlab.freedesktop.org/xdg/shared-mime-info Source0: %{url}/-/archive/%{version}/%{name}-%{version}.tar.bz2 Source1: macros.shared-mime-info +%define usegcc13 0%{?sle_version} && 0%{?sle_version} <= 160000 + +%if %usegcc13 +BuildRequires: gcc13-c++ +%else BuildRequires: c++_compiler +%endif BuildRequires: glib2-devel BuildRequires: libxml2-devel # needed for xmllint @@ -54,6 +60,10 @@ This package contains: %autosetup -p1 %build +%if %usegcc13 +export CC=gcc-13 +export CXX=g++-13 +%endif %meson %meson_build