#6 Build with guile 2.2 where possible, few minor cleanusp
Merged 3 years ago by notting. Opened 3 years ago by pbrobinson.
rpms/ pbrobinson/gnucash guile-2.2  into  master

file modified
+16 -6
@@ -2,7 +2,7 @@ 

  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: 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 @@ 

  	$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 @@ 

  %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 @@ 

  %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 @@ 

  * 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

no initial comment

We're not building 4.x currently on < F32, so we actually don't need the conditional.

it was more for the RHEL side so there still needs to be some conditional so you end up having something that's if "not fedora or <= el8" so it's kind of a moot point, there still has to be some sort of check

Oh, RHEL >8, not >=8. Gotcha.

Yep, el8 has guile 2, >8 will likely only have 2.2+

Pull-Request has been merged by notting

3 years ago