Accepting request 969912 from home:susnux:branches:GNOME:Factory

- Update to version 3.22.22
  + Update Russian translation
  + Update Ukrainian translation
  + Update Japanese translation
  + Add support for loading user-installed themes
  + Fix build with guile 2.2
  + Fix build with meson 0.60, drop upstream merged
    4bf6fcf5c8043adfcadd948e678cc68f150cc998.patch

OBS-URL: https://build.opensuse.org/request/show/969912
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/aisleriot?expand=0&rev=127

4bf6fcf5c8043adfcadd948e678cc68f150cc998.patch

@@ -1,33 +0,0 @@
-From 4bf6fcf5c8043adfcadd948e678cc68f150cc998 Mon Sep 17 00:00:00 2001
-From: Christian Persch <chpe@src.gnome.org>
-Date: Tue, 14 Dec 2021 23:41:22 +0100
-Subject: [PATCH] build: Fix build with meson 0.60
-
-Fixes: https://gitlab.gnome.org/GNOME/aisleriot/-/issues/916
----
- data/meson.build | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/data/meson.build b/data/meson.build
-index 9f88c2f3..c97e0b2e 100644
---- a/data/meson.build
-+++ b/data/meson.build
-@@ -18,7 +18,6 @@
- metainfodir = ar_prefix / ar_datadir / 'metainfo'
- 
- i18n.merge_file(
--  'sol.metainfo.xml',
-   input: 'sol.metainfo.xml.in',
-   output: '@BASENAME@',
-   po_dir: po_dir,
-@@ -35,7 +34,6 @@ desktop_in = files(
- )
- 
- i18n.merge_file(
--  'sol.desktop',
-   input: desktop_in,
-   output: '@BASENAME@',
-   type: 'desktop',
--- 
-GitLab
-

aisleriot-3.22.20.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:225f83581046ccce3e6648fc60e0e9d93e08b10b18940bd694c5b2524e1b8103
-size 6023518

aisleriot-3.22.22.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:03936f779c883eb3d7e4bb8a3fed5eaafae5f6c76b121f3194f4ff6a452aff26
+size 6035274

aisleriot.changes

@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Wed Apr 13 16:09:18 UTC 2022 - Ferdinand Thiessen <rpm@fthiessen.de>
+
+- Update to version 3.22.22
+  + Update Russian translation
+  + Update Ukrainian translation
+  + Update Japanese translation
+  + Add support for loading user-installed themes
+  + Fix build with guile 2.2
+  + Fix build with meson 0.60, drop upstream merged
+    4bf6fcf5c8043adfcadd948e678cc68f150cc998.patch
+
 -------------------------------------------------------------------
 Wed Feb  2 09:23:19 UTC 2022 - Bjørn Lie <bjorn.lie@gmail.com>
 

aisleriot.spec

@@ -17,15 +17,12 @@
 
 
 Name:           aisleriot
-Version:        3.22.20
+Version:        3.22.22
 Release:        0
 Summary:        Solitaire Card Games for GNOME
 License:        GPL-3.0-or-later
 URL:            https://wiki.gnome.org/Apps/Aisleriot
 Source0:        https://gitlab.gnome.org/GNOME/aisleriot/-/archive/%{version}/aisleriot-%{version}.tar.bz2
-# PATCH-FIX-UPSTREAM 4bf6fcf5c8043adfcadd948e678cc68f150cc998.patch -- Fix build with meson 0.61.0 and newer
-Patch0:         https://gitlab.gnome.org/GNOME/aisleriot/-/commit/4bf6fcf5c8043adfcadd948e678cc68f150cc998.patch
-
 BuildRequires:  fdupes
 BuildRequires:  gcc-c++
 # Needed to get lsb data