From 866caff1eb3263047db3f830eafbb68e60a7121e Mon Sep 17 00:00:00 2001
From: David King <amigadave@amigadave.com>
Date: Mar 03 2021 11:08:16 +0000
Subject: Require guile 2.2 (#1901347)


---

diff --git a/aisleriot.spec b/aisleriot.spec
index 33c9bbd..9c4932c 100644
--- a/aisleriot.spec
+++ b/aisleriot.spec
@@ -1,35 +1,38 @@
 Name:    aisleriot
 Epoch:   1
 Version: 3.22.9
-Release: 6%{?dist}
+Release: 7%{?dist}
 Summary: A collection of card games
 
 License: GPLv3+ and LGPLv3+ and GFDL
 URL:     https://wiki.gnome.org/Apps/Aisleriot
 Source0: http://download.gnome.org/sources/aisleriot/3.22/aisleriot-%{version}.tar.xz
 
-BuildRequires:  gcc
 BuildRequires: pkgconfig(gtk+-3.0)
-BuildRequires: pkgconfig(guile-2.0)
+BuildRequires: pkgconfig(guile-2.2)
 BuildRequires: pkgconfig(librsvg-2.0)
 BuildRequires: pkgconfig(libcanberra-gtk3)
-BuildRequires: intltool
-BuildRequires: itstool
 BuildRequires: appdata-tools
-BuildRequires: yelp-tools
 BuildRequires: desktop-file-utils
+# Required for autoreconf (to copy guile-2.2.m4 macros to aclocal.m4).
+BuildRequires: autoconf automake libtool
+BuildRequires: gcc
+BuildRequires: intltool
+BuildRequires: itstool
 BuildRequires: libappstream-glib
 BuildRequires: make
+BuildRequires: yelp-tools
 
 %description
 Aisleriot is a collection of over 80 card games programmed in scheme.
 
 %prep
-%setup -q
+%autosetup -p1
 
 %build
-%configure --with-platform=gtk-only
-make %{_smp_mflags}
+autoreconf --force --install
+%configure --with-guile=2.2 --with-platform=gtk-only
+%make_build
 
 %install
 %make_install
@@ -70,6 +73,9 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/sol.desktop
 %{_mandir}/man6/sol.6*
 
 %changelog
+* Wed Mar 03 2021 David King <amigadave@amigadave.com> - 3.22.9-7
+- Require guile 2.2 (#1901347)
+
 * Mon Jan 25 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1:3.22.9-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild