Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package entangle for openSUSE:Factory checked in at 2022-03-01 17:04:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/entangle (Old) and /work/SRC/openSUSE:Factory/.entangle.new.1958 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "entangle" Tue Mar 1 17:04:08 2022 rev:16 rq:958301 version:3.0 Changes: -------- --- /work/SRC/openSUSE:Factory/entangle/entangle.changes 2020-08-29 20:41:55.901454675 +0200 +++ /work/SRC/openSUSE:Factory/.entangle.new.1958/entangle.changes 2022-03-01 17:04:57.488355560 +0100 @@ -1,0 +2,5 @@ +Tue Mar 1 14:48:38 UTC 2022 - Marcus Meissner <meiss...@suse.com> + +- fix-new-meson.patch: fix build with new meson + +------------------------------------------------------------------- New: ---- fix-new-meson.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ entangle.spec ++++++ --- /var/tmp/diff_new_pack.oroveo/_old 2022-03-01 17:04:57.948355682 +0100 +++ /var/tmp/diff_new_pack.oroveo/_new 2022-03-01 17:04:57.952355683 +0100 @@ -1,7 +1,7 @@ # # spec file for package entangle # -# Copyright (c) 2020 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 @@ -26,6 +26,8 @@ Source0: https://www.entangle-photo.org/download/sources/%{name}-%{version}.tar.xz Source1: https://www.entangle-photo.org/download/sources/%{name}-%{version}.tar.xz.asc Source2: %{name}.keyring +# from upstream git +Patch0: fix-new-meson.patch BuildRequires: gtk-doc BuildRequires: hicolor-icon-theme BuildRequires: intltool @@ -135,6 +137,7 @@ %prep %setup -q +%autopatch -p1 %build %meson -Denable-gtk-doc=true ++++++ fix-new-meson.patch ++++++ Index: entangle-3.0/src/meson.build =================================================================== --- entangle-3.0.orig/src/meson.build +++ entangle-3.0/src/meson.build @@ -40,7 +40,7 @@ appname = 'org.entangle_photo.Manager' desktop = appname + '.desktop' i18n.merge_file ( - desktop, + data_dirs: desktop, type: 'desktop', input: desktop, output: desktop, @@ -60,7 +60,7 @@ metainfotmp = custom_target('gen-metadat '@INPUT@', '@OUTPUT@']) i18n.merge_file( - metainfo, + data_dirs: metainfo, input: metainfotmp, output: metainfo, install: true,
