guix: emacs-geiser 0.12 -> 0.16

4 files changed, 85 insertions, 33 deletions

diff --git a/guix/emacs-geiser/emacs-geiser-default-guile-2.2.patch b/guix/emacs-geiser-guile/emacs-geiser-guile-default-guile-2.2.patch
index 653f477..859ae01 100644
--- a/guix/emacs-geiser/emacs-geiser-default-guile-2.2.patch
+++ b/guix/emacs-geiser-guile/emacs-geiser-guile-default-guile-2.2.patch
@@ -1,7 +1,7 @@
 diff --git a/elisp/geiser-guile.el b/elisp/geiser-guile.el
 index 522c4eb..75e33c7 100644
---- a/elisp/geiser-guile.el
-+++ b/elisp/geiser-guile.el
+--- a/geiser-guile.el
++++ b/geiser-guile.el
 @@ -37,7 +37,7 @@
  (geiser-custom--defcustom geiser-guile-binary
      (cond ((eq system-type 'windows-nt) "guile.exe")
diff --git a/guix/emacs-geiser-guile/emacs-geiser-guile.spec b/guix/emacs-geiser-guile/emacs-geiser-guile.spec
new file mode 100644
index 0000000..bbc6b04
--- /dev/null
+++ b/guix/emacs-geiser-guile/emacs-geiser-guile.spec
@@ -0,0 +1,54 @@
+%global pkg geiser-guile
+%global pkgname Geiser-Guile
+
+Name:           emacs-%{pkg}
+Version:        0.17
+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
+
+BuildArch:      noarch
+BuildRequires:  emacs
+BuildRequires:  emacs-geiser >= 0.13
+Requires:       emacs(bin) >= %{_emacs_version}
+Requires:       emacs-geiser >= 0.13
+Suggests:       guile22
+
+%description
+%{pkgname} is an add-on package for GNU Emacs. It provides support for using
+GNU Guile in Emacs with Geiser.
+
+
+%prep
+%autosetup -n guile-%{version} -p1
+
+
+%build
+
+
+%install
+install -m 755 -d %{buildroot}%{_emacs_sitelispdir}/geiser
+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/
+
+
+%files
+%license license
+%doc readme.org
+%{_emacs_sitelispdir}/geiser/geiser-guile.el
+%{_emacs_sitelispdir}/geiser/geiser-guile.elc
+%dir %{_emacs_sitelispdir}/geiser/src/geiser
+%{_emacs_sitelispdir}/geiser/src/geiser/*.scm
+
+
+%changelog
+* Mon Jun 14 2021 Ting-Wei Lan <lantw44@gmail.com> - 0.17-1
+- Initial packaging
diff --git a/guix/emacs-geiser/emacs-geiser.spec b/guix/emacs-geiser/emacs-geiser.spec
index 2cd4905..d4798fc 100644
--- a/guix/emacs-geiser/emacs-geiser.spec
+++ b/guix/emacs-geiser/emacs-geiser.spec
@@ -2,26 +2,21 @@
 %global pkgname Geiser
 
 Name:           emacs-%{pkg}
-Version:        0.12
-Release:        2%{?dist}
-Summary:        Geiser is an Emacs environment to hack and have fun in Scheme
+Version:        0.16
+Release:        1%{?dist}
+Summary:        Geiser is a generic Emacs/Scheme interaction mode
 
 License:        BSD
 URL:            https://nongnu.org/geiser
-Source0:        https://gitlab.com/jaor/geiser/-/archive/%{version}/%{pkg}-%{version}.tar.gz
-
-# Use guile2.2 instead of guile because Guile 2.0 support has been dropped.
-Patch0:         emacs-geiser-default-guile-2.2.patch
+Source0:        https://gitlab.com/emacs-geiser/geiser/-/archive/%{version}/%{pkg}-%{version}.tar.gz
 
 BuildArch:      noarch
-BuildRequires:  autoconf, automake, make, texinfo
+BuildRequires:  texinfo
 BuildRequires:  emacs
 Requires:       emacs(bin) >= %{_emacs_version}
 Requires(post): info
 Requires(preun): info
 
-Suggests:       guile22
-
 Obsoletes:      emacs-%{pkg}-el <= 0.7-2
 Provides:       emacs-%{pkg}-el <= 0.7-2
 
@@ -36,16 +31,16 @@ keep the Lisp Machine Spirit alive.
 
 
 %build
-./autogen.sh
-%configure --with-lispdir=%{_emacs_sitelispdir}/geiser
-%make_build
-%{__make} README
+makeinfo --no-split doc/geiser.texi
 
 
 %install
-%make_install
-mkdir -p %{buildroot}%{_datadir}/guile/site
-ln -s %{_datadir}/geiser/guile/geiser %{buildroot}%{_datadir}/guile/site/geiser
+install -m 755 -d %{buildroot}%{_emacs_sitelispdir}/geiser
+install -m 644 elisp/*.el %{buildroot}%{_emacs_sitelispdir}/geiser/
+%{_emacs_bytecompile} %{buildroot}%{_emacs_sitelispdir}/geiser/*.el
+install -m 755 -d %{buildroot}%{_emacs_sitelispdir}/geiser/src
+install -m 755 -d %{buildroot}%{_infodir}
+gzip -9 < geiser.info > %{buildroot}%{_infodir}/geiser.info.gz
 
 
 %post
@@ -59,22 +54,21 @@ fi
 
 
 %files
-%license COPYING
-%doc AUTHORS ChangeLog NEWS README README.elpa README.org THANKS
-%{_bindir}/geiser-racket
-%{_infodir}/geiser.info.gz
-%{_datadir}/geiser/
-%{_datadir}/guile/site/geiser
-%dir %{_emacs_sitelispdir}/geiser
+%license license
+%doc news.org readme.org
 %{_emacs_sitelispdir}/geiser/geiser.el
 %{_emacs_sitelispdir}/geiser/geiser.elc
 %{_emacs_sitelispdir}/geiser/geiser-*.el
 %{_emacs_sitelispdir}/geiser/geiser-*.elc
-%exclude %{_infodir}/dir
-
+%dir %{_emacs_sitelispdir}/geiser/src
+%{_infodir}/geiser.info.gz
 
 
 %changelog
+* Mon Jun 14 2021 Ting-Wei Lan <lantw44@gmail.com> - 0.16-1
+- Update to 0.16
+- Move support for Scheme implementations to separate packages
+
 * Sat Mar 13 2021 Ting-Wei Lan <lantw44@gmail.com> - 0.12-2
 - Rebuilt for Fedora 34 and 35
 
diff --git a/guix/emacs-guix/emacs-guix.spec b/guix/emacs-guix/emacs-guix.spec
index f801b28..35f341d 100644
--- a/guix/emacs-guix/emacs-guix.spec
+++ b/guix/emacs-guix/emacs-guix.spec
@@ -3,7 +3,7 @@
 
 Name:           emacs-%{pkg}
 Version:        0.5.2
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Emacs-Guix is an Emacs interface for GNU Guix package manager
 
 License:        GPLv3+
@@ -24,12 +24,12 @@ BuildRequires:  emacs, make, texinfo
 BuildRequires:  guix >= 0.13.0
 BuildRequires:  autoconf, automake
 BuildRequires:  pkgconfig(guile-2.2), guile-gcrypt
-BuildRequires:  emacs-geiser, emacs-dash, emacs-bui, emacs-edit-indirect
-BuildRequires:  emacs-magit, emacs-magit-popup
+BuildRequires:  emacs-dash, emacs-bui, emacs-edit-indirect, emacs-magit-popup
+BuildRequires:  (emacs-geiser-guile >= 0.13 or emacs-geiser < 0.13)
 
 Requires:       emacs(bin) >= %{_emacs_version}
-Requires:       emacs-geiser, emacs-dash, emacs-bui, emacs-edit-indirect
-Requires:       emacs-magit, emacs-magit-popup
+Requires:       emacs-dash, emacs-bui, emacs-edit-indirect, emacs-magit-popup
+Requires:       (emacs-geiser-guile >= 0.13 or emacs-geiser < 0.13)
 Suggests:       guix
 
 Obsoletes:      guix-emacs <= 0.8.3-1
@@ -107,6 +107,10 @@ fi
 
 
 %changelog
+* Mon Jun 14 2021 Ting-Wei Lan <lantw44@gmail.com> - 0.5.2-6
+- Drop dependency on emacs-magit because it only needs emacs-magit-popup
+- Update dependency for Geiser 0.13 package split
+
 * Sat Mar 13 2021 Ting-Wei Lan <lantw44@gmail.com> - 0.5.2-5
 - Rebuilt for Fedora 34 and 35