From a73d44190f2ef153213cb3f17a4e4f571c587bfc Mon Sep 17 00:00:00 2001
From: Ting-Wei Lan <lantw44@gmail.com>
Date: Sun, 12 Feb 2023 22:20:21 +0800
Subject: guix: emacs-geiser-guile 0.23.2 -> 0.28.1

---
 .../emacs-geiser-guile-default-guile-2.2.patch     | 13 ---------
 .../emacs-geiser-guile-default-guile-3.0.patch     | 13 +++++++++
 guix/emacs-geiser-guile/emacs-geiser-guile.spec    | 31 ++++++++++++++++++----
 3 files changed, 39 insertions(+), 18 deletions(-)
 delete mode 100644 guix/emacs-geiser-guile/emacs-geiser-guile-default-guile-2.2.patch
 create mode 100644 guix/emacs-geiser-guile/emacs-geiser-guile-default-guile-3.0.patch

(limited to 'guix')

diff --git a/guix/emacs-geiser-guile/emacs-geiser-guile-default-guile-2.2.patch b/guix/emacs-geiser-guile/emacs-geiser-guile-default-guile-2.2.patch
deleted file mode 100644
index 6ba0b45..0000000
--- a/guix/emacs-geiser-guile/emacs-geiser-guile-default-guile-2.2.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/geiser-guile.el b/geiser-guile.el
-index db42945..dc691f5 100644
---- a/geiser-guile.el
-+++ b/geiser-guile.el
-@@ -48,7 +48,7 @@
- (geiser-custom--defcustom geiser-guile-binary
-     (cond ((eq system-type 'windows-nt) "guile.exe")
-           ((eq system-type 'darwin) "guile")
--          (t "guile"))
-+          (t "guile2.2"))
-   "Name to use to call the Guile executable when starting a REPL."
-   :type '(choice string (repeat string)))
- 
diff --git a/guix/emacs-geiser-guile/emacs-geiser-guile-default-guile-3.0.patch b/guix/emacs-geiser-guile/emacs-geiser-guile-default-guile-3.0.patch
new file mode 100644
index 0000000..0bd3b9c
--- /dev/null
+++ b/guix/emacs-geiser-guile/emacs-geiser-guile-default-guile-3.0.patch
@@ -0,0 +1,13 @@
+diff --git a/geiser-guile.el b/geiser-guile.el
+index db42945..dc691f5 100644
+--- a/geiser-guile.el
++++ b/geiser-guile.el
+@@ -48,7 +48,7 @@
+ (geiser-custom--defcustom geiser-guile-binary
+     (cond ((eq system-type 'windows-nt) "guile.exe")
+           ((eq system-type 'darwin) "guile")
+-          (t "guile"))
++          (t "guile3.0"))
+   "Name to use to call the Guile executable when starting a REPL."
+   :type '(choice string (repeat string)))
+ 
diff --git a/guix/emacs-geiser-guile/emacs-geiser-guile.spec b/guix/emacs-geiser-guile/emacs-geiser-guile.spec
index 4a00c6f..01b1191 100644
--- a/guix/emacs-geiser-guile/emacs-geiser-guile.spec
+++ b/guix/emacs-geiser-guile/emacs-geiser-guile.spec
@@ -2,23 +2,26 @@
 %global pkgname Geiser-Guile
 
 Name:           emacs-%{pkg}
-Version:        0.23.2
-Release:        2%{?dist}
+Version:        0.28.1
+Release:        1%{?dist}
 Summary:        Support for Guile in Geiser
 
 License:        BSD
 URL:            https://nongnu.org/geiser
 Source0:        https://gitlab.com/emacs-geiser/guile/-/archive/%{version}/guile-%{version}.tar.gz#/%{pkg}-%{version}.tar.gz
 
-# Use guile2.2 instead of guile because Guile 2.0 support has been dropped.
-Patch0:         emacs-geiser-guile-default-guile-2.2.patch
+# Use guile3.0 instead of guile because Guile 2.0 support has been dropped.
+Patch0:         emacs-geiser-guile-default-guile-3.0.patch
 
 BuildArch:      noarch
+BuildRequires:  texinfo
 BuildRequires:  emacs
 BuildRequires:  emacs-geiser >= 0.13
 Requires:       emacs(bin) >= %{_emacs_version}
 Requires:       emacs-geiser >= 0.13
-Suggests:       guile22
+Requires(post): info
+Requires(preun): info
+Suggests:       guile30
 
 %description
 %{pkgname} is an add-on package for GNU Emacs. It provides support for using
@@ -30,6 +33,7 @@ GNU Guile in Emacs with Geiser.
 
 
 %build
+makeinfo --no-split geiser-guile.texi
 
 
 %install
@@ -38,6 +42,18 @@ install -m 644 *.el %{buildroot}%{_emacs_sitelispdir}/geiser/
 %{_emacs_bytecompile} %{buildroot}%{_emacs_sitelispdir}/geiser/*.el
 install -m 755 -d %{buildroot}%{_emacs_sitelispdir}/geiser/src/geiser
 install -m 644 src/geiser/*.scm %{buildroot}%{_emacs_sitelispdir}/geiser/src/geiser/
+install -m 755 -d %{buildroot}%{_infodir}
+gzip -9 < geiser-guile.info > %{buildroot}%{_infodir}/geiser-guile.info.gz
+
+
+%post
+/sbin/install-info %{_infodir}/geiser-guile.info.gz %{_infodir}/dir || :
+
+
+%preun
+if [ "$1" = 0 ]; then
+    /sbin/install-info --del %{_infodir}/geiser-guile.info.gz %{_infodir}/dir || :
+fi
 
 
 %files
@@ -47,9 +63,14 @@ install -m 644 src/geiser/*.scm %{buildroot}%{_emacs_sitelispdir}/geiser/src/gei
 %{_emacs_sitelispdir}/geiser/geiser-guile.elc
 %dir %{_emacs_sitelispdir}/geiser/src/geiser
 %{_emacs_sitelispdir}/geiser/src/geiser/*.scm
+%{_infodir}/geiser-guile.info.gz
 
 
 %changelog
+* Sun Feb 12 2023 Ting-Wei Lan <lantw44@gmail.com> - 0.28.1-1
+- Update to 0.28.1
+- Switch to Guile 3.0
+
 * Sat Oct 29 2022 Ting-Wei Lan <lantw44@gmail.com> - 0.23.2-2
 - Rebuilt for Fedora 37 and 38
 
-- 
cgit v1.2.3