From 9d3bf7059bb78916bd81c07af3802f7662fbca5c Mon Sep 17 00:00:00 2001
From: David King <amigadave@amigadave.com>
Date: Feb 14 2022 15:28:43 +0000
Subject: Update to 3.22.21


---

diff --git a/.gitignore b/.gitignore
index ecf9b29..5f21eb8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -46,3 +46,4 @@
 /aisleriot-3.22.17.tar.bz2
 /aisleriot-3.22.19.tar.bz2
 /aisleriot-3.22.20.tar.bz2
+/aisleriot-3.22.21.tar.bz2
diff --git a/aisleriot-3.22.20-guile3.patch b/aisleriot-3.22.20-guile3.patch
deleted file mode 100644
index 2adc7c6..0000000
--- a/aisleriot-3.22.20-guile3.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From df91e4fe72f9992dc79375c00a19e6286ee01742 Mon Sep 17 00:00:00 2001
-From: Christian Persch <chpe@src.gnome.org>
-Date: Fri, 31 Dec 2021 18:49:27 +0100
-Subject: [PATCH] games: Compile scheme code with -Ono-letrectify
-
-Fixes the games that include-and-modify the code of other games, e.g.
-spider-three-decks.
-
-Fixes: https://gitlab.gnome.org/GNOME/aisleriot/-/issues/919
----
- games/meson.build | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/games/meson.build b/games/meson.build
-index afbd003e..e552beab 100644
---- a/games/meson.build
-+++ b/games/meson.build
-@@ -119,6 +119,11 @@ guile_warnings = [
-   '-Wunsupported-warning',
-   '-Wunused-toplevel',
-   '-Wunused-variable',
-+  '-W1',
-+]
-+
-+guile_flags = [
-+  '-Ono-letrectify',
- ]
- 
- # FIXME: this should use files('...') (allowed as per docs),
-@@ -131,6 +136,7 @@ guile_compile = [
-   meson.current_build_dir(),
-   guile,
-   'compile',
-+  guile_flags,
-   guile_warnings,
-   '-o',
-   '@OUTPUT@',
--- 
-GitLab
-
diff --git a/aisleriot.spec b/aisleriot.spec
index fc9737e..5c27b0c 100644
--- a/aisleriot.spec
+++ b/aisleriot.spec
@@ -1,15 +1,13 @@
 Name:    aisleriot
 Epoch:   1
-Version: 3.22.20
-Release: 2%{?dist}
+Version: 3.22.21
+Release: 1%{?dist}
 Summary: A collection of card games
 
 License: GPLv3+ and LGPLv3+ and GFDL
 URL:     https://wiki.gnome.org/Apps/Aisleriot
 Source0: https://gitlab.gnome.org/GNOME/${name}/-/archive/%{version}/%{name}-%{version}.tar.bz2
 Patch0:  aisleriot-3.22.19-appdata-namespace.patch
-# https://bugzilla.redhat.com/show_bug.cgi?id=2030392
-Patch1:  aisleriot-3.22.20-guile3.patch
 
 BuildRequires: pkgconfig(gtk+-3.0)
 BuildRequires: pkgconfig(guile-3.0)
@@ -74,6 +72,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/sol.desktop
 %{_mandir}/man6/sol.6*
 
 %changelog
+* Mon Feb 14 2022 David King <amigadave@amigadave.com> - 1:3.22.21-1
+- Update to 3.22.21
+
 * Wed Jan 19 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1:3.22.20-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
 
diff --git a/sources b/sources
index a9377b0..547054f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (aisleriot-3.22.20.tar.bz2) = 99b64549b0acdf3425bec4081bc3c2e409345b60f0358249b71730744e2639a3e0787ee20b57e57311e3269270f79b0b25a7501c0d4e8962b15053fe74336665
+SHA512 (aisleriot-3.22.21.tar.bz2) = 0f454b7770ea24ce6837e43f4bf5068ef89bea062f7c80d621cdeabbc261dae083859d966c6f8809c437f04c221e89ea3bfdaebb4d390e65b4b000feb197d582