From 238f221ff00b83922df1c4bc1e6bb9b05488a8dd7b71428764dca5508a563d29 Mon Sep 17 00:00:00 2001
From: Dominique Leuenberger <dimstar@opensuse.org>
Date: Mon, 21 Mar 2022 08:35:17 +0000
Subject: [PATCH] Accepting request 962815 from GNOME:Next

GNOME 42 - here we come

OBS-URL: https://build.opensuse.org/request/show/962815
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-sudoku?expand=0&rev=90
---
 ...35a02b48f332f67bad3e4ee020b75591084a.patch | 38 -------------------
 gnome-sudoku-40.2.tar.xz                      |  3 --
 gnome-sudoku-42.0.tar.xz                      |  3 ++
 gnome-sudoku.changes                          |  9 +++++
 gnome-sudoku.spec                             |  6 +--
 5 files changed, 14 insertions(+), 45 deletions(-)
 delete mode 100644 7c9935a02b48f332f67bad3e4ee020b75591084a.patch
 delete mode 100644 gnome-sudoku-40.2.tar.xz
 create mode 100644 gnome-sudoku-42.0.tar.xz

diff --git a/7c9935a02b48f332f67bad3e4ee020b75591084a.patch b/7c9935a02b48f332f67bad3e4ee020b75591084a.patch
deleted file mode 100644
index 7c54948..0000000
--- a/7c9935a02b48f332f67bad3e4ee020b75591084a.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 7c9935a02b48f332f67bad3e4ee020b75591084a Mon Sep 17 00:00:00 2001
-From: Jan Beich <jbeich@FreeBSD.org>
-Date: Mon, 24 Jan 2022 11:44:06 +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:5:0: ERROR: Function does not take positional arguments.
-data/meson.build:24:0: ERROR: Function does not take positional arguments.
----
- data/meson.build | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/data/meson.build b/data/meson.build
-index f18f247..9c95e02 100644
---- a/data/meson.build
-+++ b/data/meson.build
-@@ -2,7 +2,7 @@ resource_files = files('gnome-sudoku.gresource.xml')
- 
- resources = gnome.compile_resources('gnome-sudoku', resource_files)
- 
--desktop_file = i18n.merge_file('desktop',
-+desktop_file = i18n.merge_file(
-   input: '@0@.desktop.in'.format(application_id),
-   output: '@0@.desktop'.format(application_id),
-   install: true,
-@@ -21,7 +21,7 @@ if desktop_file_validate.found()
-   )
- endif
- 
--appdata_file = i18n.merge_file('appdata',
-+appdata_file = i18n.merge_file(
-   input: '@0@.appdata.xml.in'.format(application_id),
-   output: '@0@.appdata.xml'.format(application_id),
-   install: true,
--- 
-GitLab
-
diff --git a/gnome-sudoku-40.2.tar.xz b/gnome-sudoku-40.2.tar.xz
deleted file mode 100644
index 50f1ccb..0000000
--- a/gnome-sudoku-40.2.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:36120531e3c7139581ea3800fbfe3c2b31694c440145ecc897ac34e562d754a3
-size 358260
diff --git a/gnome-sudoku-42.0.tar.xz b/gnome-sudoku-42.0.tar.xz
new file mode 100644
index 0000000..25b6a70
--- /dev/null
+++ b/gnome-sudoku-42.0.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1d2eb4ddb8026b443645cf3585b8df1244e3828ee1c07518052b2599e1c5c28f
+size 380836
diff --git a/gnome-sudoku.changes b/gnome-sudoku.changes
index cdab264..4a7f46a 100644
--- a/gnome-sudoku.changes
+++ b/gnome-sudoku.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Fri Mar 18 04:51:19 UTC 2022 - Luciano Santos <luc14n0@opensuse.org>
+
+- Update to version 42.0:
+  + Support Purism form factor.
+  + Updated translations.
+- Drop merged upstream patch:
+  7c9935a02b48f332f67bad3e4ee020b75591084a.patch.
+
 -------------------------------------------------------------------
 Wed Feb  2 12:24:39 UTC 2022 - Bjørn Lie <bjorn.lie@gmail.com>
 
diff --git a/gnome-sudoku.spec b/gnome-sudoku.spec
index dc2080e..a42c264 100644
--- a/gnome-sudoku.spec
+++ b/gnome-sudoku.spec
@@ -17,15 +17,13 @@
 
 
 Name:           gnome-sudoku
-Version:        40.2
+Version:        42.0
 Release:        0
 Summary:        Sudoku Game for GNOME
 License:        GPL-3.0-or-later
 Group:          Amusements/Games/Logic
 URL:            https://wiki.gnome.org/Apps/Sudoku
-Source0:        https://download.gnome.org/sources/gnome-sudoku/40/%{name}-%{version}.tar.xz
-# PATCH-FIX-UPSTREAM 7c9935a02b48f332f67bad3e4ee020b75591084a.patch -- Fix build with meson 0.60.0 and newer
-Patch0:         https://gitlab.gnome.org/GNOME/gnome-sudoku/-/commit/7c9935a02b48f332f67bad3e4ee020b75591084a.patch
+Source0:        https://download.gnome.org/sources/gnome-sudoku/42/%{name}-%{version}.tar.xz
 
 BuildRequires:  fdupes
 BuildRequires:  gcc-c++