rpm/gnome-mahjongg
SHA256
1
0
Fork 0
forked from pool/gnome-mahjongg
Code Pull Requests Activity

Accepting request 951431 from GNOME:Factory

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/951431
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gnome-mahjongg?expand=0&rev=26
This commit is contained in:
Dominique Leuenberger 2022-02-04 20:49:12 +00:00 committed by Git OBS Bridge
commit b4bde6c82a
3 changed files with 47 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
26.patch Normal file
View File

@ -0,0 +1,37 @@
From 7604f8c8311f1088293596e639fefafdbeb73235 Mon Sep 17 00:00:00 2001
From: Jan Beich <jbeich@FreeBSD.org>
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

6
gnome-mahjongg.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed Feb 2 15:43:11 UTC 2022 - Bjørn Lie <bjorn.lie@gmail.com>
- Add 26.patch: Fix build with meson 0.60 and newer.
- No longer mark enduser help files as doc.
-------------------------------------------------------------------
Mon Nov 2 11:48:02 UTC 2020 - Bjørn Lie <bjorn.lie@gmail.com>

6
gnome-mahjongg.spec
View File

@ -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 @@ License: GPL-2.0-or-later
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 @@ corresponding tiles and taking them out of play.
%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}