From afebe9be8d6a1853cc6622dff3ed2992456356ee Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson@gmail.com>
Date: Sep 14 2020 10:35:31 +0000
Subject: Build with guile 2.2 where possible, few minor cleanusp


---

diff --git a/gnucash.spec b/gnucash.spec
index 2f0b664..b41873f 100644
--- a/gnucash.spec
+++ b/gnucash.spec
@@ -2,7 +2,7 @@ Name: gnucash
 Summary: Finance management application
 Version: 4.1
 URL: http://gnucash.org/
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 Source: http://downloads.sourceforge.net/sourceforge/gnucash/gnucash-%{version}.tar.bz2
 
@@ -16,7 +16,14 @@ BuildRequires: perl-generators, perl-podlators
 BuildRequires: libxml2 >= 2.9.4, libxslt-devel, zlib-devel
 BuildRequires: gtk3 >= 3.22.30, glib2 >= 2.56.1
 BuildRequires: libofx-devel >= 0.9.12, aqbanking-devel >= 5.7.0, gwenhywfar-gui-gtk3-devel >= 4.20
-BuildRequires: guile-devel >= 5:2.0.9, swig >= 3.0.12
+%if 0%{?fedora} >= 32 || 0%{?rhel} > 8
+BuildRequires: guile22-devel
+%global guilever 2.2
+%else
+BuildRequires: guile-devel
+%global guilever 2.0
+%endif
+BuildRequires: swig >= 3.0.12
 BuildRequires: desktop-file-utils, gettext >= 0.9.6
 BuildRequires: libdbi-devel >= 0.8.3, libdbi-dbd-mysql, libdbi-dbd-pgsql, libdbi-dbd-sqlite
 BuildRequires: libappstream-glib
@@ -66,9 +73,9 @@ rm -rf $RPM_BUILD_ROOT/%{_infodir} \
 	$RPM_BUILD_ROOT/%{_libdir}/gnucash/lib*.a \
 	$RPM_BUILD_ROOT/%{_bindir}/gnc-test-env \
 	$RPM_BUILD_ROOT/%{_bindir}/gnc-fq-update \
-	$RPM_BUILD_ROOT/%{_datadir}/guile/site/2.0/tests
+	$RPM_BUILD_ROOT/%{_datadir}/guile/site/%{guilever}/tests
 
-find $RPM_BUILD_ROOT/%{_libdir} -name *.la -exec rm -f {} \;
+find $RPM_BUILD_ROOT/%{_libdir} -name *.la -delete
 
 %check
 desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/gnucash.desktop
@@ -84,7 +91,7 @@ appstream-util validate-relax --nonet $RPM_BUILD_ROOT%{_datadir}/metainfo/gnucas
 %exclude /usr/lib/debug
 %{_datadir}/glib-2.0/schemas/*
 %{_datadir}/gnucash
-%{_datadir}/guile/site/2.0/gnucash
+%{_datadir}/guile/site/%{guilever}/gnucash
 %{_datadir}/metainfo/*
 %{_datadir}/applications/*
 %{_datadir}/icons/hicolor/*/apps/*
@@ -92,6 +99,9 @@ appstream-util validate-relax --nonet $RPM_BUILD_ROOT%{_datadir}/metainfo/gnucas
 %config(noreplace) %{_sysconfdir}/gnucash/*
 
 %changelog
+* Mon Sep 14 2020 Peter Robinson <pbrobinson@fedoraproject.org> - 4.1-3
+- Build with guile 2.2
+
 * Thu Aug 06 2020 Stefan Bluhm <stefan.bluhm@clacee.eu> 4.1-2
 - Updated "Source" to https.
 - Updated requirements.
@@ -106,7 +116,7 @@ appstream-util validate-relax --nonet $RPM_BUILD_ROOT%{_datadir}/metainfo/gnucas
 * Mon Jun 29 2020 Bill Nottingham <notting@splat.cc> - 4.0-1
 - update to 4.0
 
-* Mon Jun  1 2020 Peter Oliver <rpm@mavit.org.uk> - 3.10-4
+* Fri Jun  5 2020 Peter Oliver <rpm@mavit.org.uk> - 3.10-5
 - Add weak dependencies on optional storage providers.
 
 * Thu Jun 04 2020 Jonathan Wakely <jwakely@redhat.com> - 3.10-4