From e8a05b4e1087727fd3dee160085a2e19302f9351 Mon Sep 17 00:00:00 2001 From: Silvan Calarco Date: Sat, 6 Jan 2024 05:11:38 +0100 Subject: [PATCH] remove nm-applet schema file conflicting with network-manager-applet (ref. https://github.com/NetworkManager/network-manager-applet/commit/574fdd9 ) [release 1.10.4-2mamba;Sat Nov 26 2022] --- libnma.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/libnma.spec b/libnma.spec index 47b23ed..7d9cca7 100644 --- a/libnma.spec +++ b/libnma.spec @@ -1,7 +1,7 @@ %define majver %(echo %version | cut -d. -f1-2) Name: libnma Version: 1.10.4 -Release: 1mamba +Release: 2mamba Summary: Network Manager Applet library Group: System/Libraries Vendor: openmamba @@ -78,6 +78,9 @@ This package includes the %{name} API documentation. %find_lang %{name} || touch %{name}.lang +# Conflicting with same file readded in network-manager-applet 1.30.0 +rm -f %{buildroot}%{_datadir}/glib-2.0/schemas/org.gnome.nm-applet.gschema.xml + %clean [ "%{buildroot}" != / ] && rm -rf "%{buildroot}" @@ -136,6 +139,9 @@ fi %{_datadir}/gtk-doc/html/libnma/* %changelog +* Sat Nov 26 2022 Silvan Calarco 1.10.4-2mamba +- remove nm-applet schema file conflicting with network-manager-applet (ref. https://github.com/NetworkManager/network-manager-applet/commit/574fdd9 ) + * Wed Nov 09 2022 Automatic Build System 1.10.4-1mamba - automatic version update by autodist