Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package dconf-editor for openSUSE:Factory checked in at 2022-02-04 21:49:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/dconf-editor (Old) and /work/SRC/openSUSE:Factory/.dconf-editor.new.1898 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "dconf-editor" Fri Feb 4 21:49:06 2022 rev:36 rq:951418 version:3.38.3 Changes: -------- --- /work/SRC/openSUSE:Factory/dconf-editor/dconf-editor.changes 2021-04-10 15:27:34.602392529 +0200 +++ /work/SRC/openSUSE:Factory/.dconf-editor.new.1898/dconf-editor.changes 2022-02-04 21:52:16.923198846 +0100 @@ -1,0 +2,12 @@ +Tue Feb 1 18:50:22 UTC 2022 - Bj??rn Lie <bjorn....@gmail.com> + +- Add 21.patch: Fix build with meson 0.61.0 and newer. +- Drop update-desktop-files BuildRequires and macro call, no longer + needed and the way we did use it in the past even produces a lint + warning now. +- Replace appstream-glib-devel with appstream-glib BuildRequires, + also add desktop-file-utils. Then add a check section, run + meson_test macro and explicitly validate appdata and desktop file + with appstream-util and desktop-file-validate. + +------------------------------------------------------------------- New: ---- 21.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dconf-editor.spec ++++++ --- /var/tmp/diff_new_pack.w3tC6V/_old 2022-02-04 21:52:17.319196122 +0100 +++ /var/tmp/diff_new_pack.w3tC6V/_new 2022-02-04 21:52:17.323196094 +0100 @@ -1,7 +1,7 @@ # # spec file for package dconf-editor # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -24,10 +24,13 @@ Group: System/GUI/GNOME URL: https://wiki.gnome.org/Apps/DconfEditor Source0: https://download.gnome.org/sources/dconf-editor/3.38/%{name}-%{version}.tar.xz -BuildRequires: appstream-glib-devel +# PATCH-FIX-UPSTREAM 21.patch -- Fix build with meson 0.61.0 and newer +Patch0: https://gitlab.gnome.org/GNOME/dconf-editor/-/merge_requests/21.patch + +BuildRequires: appstream-glib +BuildRequires: desktop-file-utils BuildRequires: meson BuildRequires: pkgconfig -BuildRequires: update-desktop-files BuildRequires: vala >= 0.40.0 BuildRequires: pkgconfig(dconf) >= 0.25.1 BuildRequires: pkgconfig(glib-2.0) >= 2.55.1 @@ -53,10 +56,15 @@ %install %meson_install - -%suse_update_desktop_file %{buildroot}%{_datadir}/applications/ca.desrt.dconf-editor.desktop SystemSetup X-GNOME-PersonalSettings %find_lang %{name} +%check +%meson_test +appstream-util validate-relax --nonet \ + %{buildroot}%{_datadir}/metainfo/ca.desrt.dconf-editor.appdata.xml +desktop-file-validate \ + %{buildroot}%{_datadir}/applications/ca.desrt.dconf-editor.desktop + %files %license COPYING %{_bindir}/dconf-editor ++++++ 21.patch ++++++ >From 56474378568e6ff4af8aa912810323e808c1d977 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <a...@linutronix.de> Date: Fri, 21 Jan 2022 22:22:58 +0100 Subject: [PATCH] editor/meson.build: fix meson 0.61 errors Signed-off-by: Alexander Kanavin <a...@linutronix.de> --- editor/meson.build | 2 -- 1 file changed, 2 deletions(-) diff --git a/editor/meson.build b/editor/meson.build index 4c89ab99..0eb3bb1a 100644 --- a/editor/meson.build +++ b/editor/meson.build @@ -1,7 +1,6 @@ desktop = dconf_editor_namespace + '.desktop' i18n.merge_file ( - desktop, type: 'desktop', input: desktop + '.in', output: desktop, @@ -26,7 +25,6 @@ configure_file( appdata = dconf_editor_namespace + '.appdata.xml' i18n.merge_file( - appdata, input: appdata + '.in', output: appdata, po_dir: po_dir, -- GitLab
