Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package gnome-mahjongg for openSUSE:Factory checked in at 2022-02-04 21:49:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gnome-mahjongg (Old) and /work/SRC/openSUSE:Factory/.gnome-mahjongg.new.1898 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gnome-mahjongg" Fri Feb 4 21:49:12 2022 rev:26 rq:951431 version:3.38.3 Changes: -------- --- /work/SRC/openSUSE:Factory/gnome-mahjongg/gnome-mahjongg.changes 2020-11-23 10:28:53.837255338 +0100 +++ /work/SRC/openSUSE:Factory/.gnome-mahjongg.new.1898/gnome-mahjongg.changes 2022-02-04 21:52:22.555160108 +0100 @@ -1,0 +2,6 @@ +Wed Feb 2 15:43:11 UTC 2022 - Bj??rn Lie <[email protected]> + +- Add 26.patch: Fix build with meson 0.60 and newer. +- No longer mark enduser help files as doc. + +------------------------------------------------------------------- New: ---- 26.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-mahjongg.spec ++++++ --- /var/tmp/diff_new_pack.B8Ja2G/_old 2022-02-04 21:52:23.019156917 +0100 +++ /var/tmp/diff_new_pack.B8Ja2G/_new 2022-02-04 21:52:23.023156889 +0100 @@ -1,7 +1,7 @@ # # spec file for package gnome-mahjongg # -# 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 @@ -24,6 +24,8 @@ Group: Amusements/Games/Board/Puzzle URL: https://live.gnome.org/GnomeMahongg Source0: https://download.gnome.org/sources/gnome-mahjongg/3.38/%{name}-%{version}.tar.xz +# PATCH-FIX-UPSTREAM 26.patch -- Fix build with meson 0.60 and newer +Patch0: https://gitlab.gnome.org/GNOME/gnome-mahjongg/-/merge_requests/26.patch BuildRequires: fdupes BuildRequires: hicolor-icon-theme @@ -63,12 +65,12 @@ %files %license COPYING %doc NEWS -%doc %{_datadir}/help/C/%{name}/ %{_bindir}/%{name} %{_datadir}/%{name}/ %{_datadir}/metainfo/org.gnome.Mahjongg.appdata.xml %{_datadir}/applications/org.gnome.Mahjongg.desktop %{_datadir}/glib-2.0/schemas/org.gnome.Mahjongg.gschema.xml +%{_datadir}/help/C/%{name}/ %{_datadir}/icons/hicolor/*/apps/org.gnome.Mahjongg* %{_mandir}/man6/%{name}.6%{?ext_man} ++++++ 26.patch ++++++ >From 7604f8c8311f1088293596e639fefafdbeb73235 Mon Sep 17 00:00:00 2001 From: Jan Beich <[email protected]> Date: Mon, 24 Jan 2022 11:22:48 +0000 Subject: [PATCH] meson: drop unused argument for i18n.merge_file() Ignored in Meson < 0.60.0, deprecated since 0.60.1 and fatal since 0.61.0. data/meson.build:24:0: ERROR: Function does not take positional arguments. data/meson.build:45:0: ERROR: Function does not take positional arguments. --- data/meson.build | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/data/meson.build b/data/meson.build index 8325c1b..063e839 100644 --- a/data/meson.build +++ b/data/meson.build @@ -22,7 +22,6 @@ install_data ('smooth.png', install_dir: join_paths (pkgdatadir, 'themes')) install_data ('edu_kang_xi.png', install_dir: join_paths (pkgdatadir, 'themes')) desktop_file = i18n.merge_file ( - 'desktop-file', input: 'org.gnome.Mahjongg.desktop.in', output: 'org.gnome.Mahjongg.desktop', install: true, @@ -42,7 +41,7 @@ if desktop_file_validate.found() ) endif -appdata_file = i18n.merge_file ('appdata-file', +appdata_file = i18n.merge_file ( input: 'org.gnome.Mahjongg.appdata.xml.in', output: 'org.gnome.Mahjongg.appdata.xml', install: true, -- GitLab
