From 3407fd624339c477cfad8b1b51ee40212f1ef24426b7c1c1845c57c33a6a46fd Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Tue, 6 Feb 2024 11:54:15 +0000 Subject: [PATCH] Accepting request 1144490 from GNOME:STABLE:45 - Choose higher gcc version to build on SLE and Leap 15. - Update the name of libpanel-1-1 to be compliant with: https://en.opensuse.org/openSUSE:Shared_library_packaging_policy OBS-URL: https://build.opensuse.org/request/show/1144490 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/libpanel?expand=0&rev=13 --- libpanel.changes | 7 +++++++ libpanel.spec | 11 ++++++++++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/libpanel.changes b/libpanel.changes index a18364e..e537702 100644 --- a/libpanel.changes +++ b/libpanel.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Feb 5 08:44:07 UTC 2024 - Yifan Jiang + +- Choose higher gcc version to build on SLE and Leap 15. +- Update the name of libpanel-1-1 to be compliant with: + https://en.opensuse.org/openSUSE:Shared_library_packaging_policy + ------------------------------------------------------------------- Sun Sep 17 01:24:14 UTC 2023 - Luciano Santos diff --git a/libpanel.spec b/libpanel.spec index 673849d..bb9c07d 100644 --- a/libpanel.spec +++ b/libpanel.spec @@ -16,7 +16,7 @@ # -%define libname %{name}1-1 +%define libname %{name}-1-1 Name: libpanel Version: 1.4.0 @@ -26,6 +26,10 @@ License: LGPL-3.0-or-later URL: https://gitlab.gnome.org/GNOME/libpanel Source: https://download.gnome.org/sources/%{name}/1.4/%{name}-%{version}.tar.xz +%if 0%{?sle_version} && 0%{?sle_version} < 160000 +BuildRequires: gcc13 +BuildRequires: gcc13-c++ +%endif BuildRequires: meson BuildRequires: pkgconfig BuildRequires: pkgconfig(gio-2.0) @@ -41,6 +45,8 @@ GNOME using GTK and libadwaita. %package -n %{libname} Summary: Shared library files for %{name} Provides: %{name} = %{version} +Provides: %{name}1-1 +Obsoletes: %{name}1-1 %description -n %{libname} The %{libname} package contains shared libraries %{name}. @@ -66,6 +72,9 @@ developing applications that use %{name}. %autosetup -p1 %build +%if 0%{?sle_version} && 0%{?sle_version} < 160000 +export CC=gcc-13 +%endif %meson \ -D docs=disabled \ %{nil}