guix: emacs-geiser 0.17 -> 0.23.2

4 files changed, 81 insertions, 29 deletions

diff --git a/guix/emacs-geiser/emacs-geiser-0.17-doc-install.patch b/guix/emacs-geiser/emacs-geiser-0.17-doc-install.patch
deleted file mode 100644
index 29de71b..0000000
--- a/guix/emacs-geiser/emacs-geiser-0.17-doc-install.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 327ff01e5b9c6e019fdd0cb710a4c19082249345 Mon Sep 17 00:00:00 2001
-From: jao <jao@gnu.org>
-Date: Thu, 26 Aug 2021 20:23:44 +0100
-Subject: [PATCH] info documentation fix
-
----
- doc/install.texi | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/doc/install.texi b/doc/install.texi
-index e932e1a..2f95875 100644
---- a/doc/install.texi
-+++ b/doc/install.texi
-@@ -53,7 +53,7 @@ where to find the goodies.
- 
- ELPA packages live in repositories accessible via HTTP.  You can find
- Geiser's package in either
--@uref{https://elpa.nongnu.org/nongnu/geiser.html}{NonGNU ELPA} or, if
-+@uref{https://elpa.nongnu.org/nongnu/geiser.html, NonGNU ELPA} or, if
- you like living on the bleeding edge, @uref{http://melpa.org/#/geiser,
- MELPA} (directly from the git repo).  To tell Emacs that an ELPA repo
- exists, you add it to @code{package-archives}@footnote{If you're using
--- 
-GitLab
-
diff --git a/guix/emacs-geiser/emacs-geiser.spec b/guix/emacs-geiser/emacs-geiser.spec
index 0059d95..8b24546 100644
--- a/guix/emacs-geiser/emacs-geiser.spec
+++ b/guix/emacs-geiser/emacs-geiser.spec
@@ -2,19 +2,20 @@
 %global pkgname Geiser
 
 Name:           emacs-%{pkg}
-Version:        0.17
+Version:        0.23.2
 Release:        1%{?dist}
 Summary:        Geiser is a generic Emacs/Scheme interaction mode
 
 License:        BSD
 URL:            https://nongnu.org/geiser
 Source0:        https://gitlab.com/emacs-geiser/geiser/-/archive/%{version}/%{pkg}-%{version}.tar.gz
-Patch0:         emacs-geiser-0.17-doc-install.patch
 
 BuildArch:      noarch
 BuildRequires:  texinfo
 BuildRequires:  emacs
+BuildRequires:  emacs-transient
 Requires:       emacs(bin) >= %{_emacs_version}
+Requires:       emacs-transient
 Requires(post): info
 Requires(preun): info
 
@@ -66,6 +67,9 @@ fi
 
 
 %changelog
+* Thu Apr 28 2022 Ting-Wei Lan <lantw44@gmail.com> - 0.23.2-1
+- Update to 0.23.2
+
 * Sat Sep 25 2021 Ting-Wei Lan <lantw44@gmail.com> - 0.17-1
 - Update to 0.17
 
diff --git a/guix/emacs-guix/emacs-guix.spec b/guix/emacs-guix/emacs-guix.spec
index c710463..19349cb 100644
--- a/guix/emacs-guix/emacs-guix.spec
+++ b/guix/emacs-guix/emacs-guix.spec
@@ -11,7 +11,7 @@
 
 Name:           emacs-%{pkg}
 Version:        0.5.2
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Emacs-Guix is an Emacs interface for GNU Guix package manager
 
 License:        GPLv3+
@@ -68,7 +68,7 @@ autoreconf -fiv
     --with-popup-lispdir=%{_emacs_sitelispdir}/magit-popup \
     GUILE=%{_bindir}/guile2.2 \
     GUILD=%{_bindir}/guild2.2
-%make_build
+%make_build ELCFLAGS='-L %{_emacs_sitelispdir}/transient'
 
 
 %install
@@ -114,6 +114,9 @@ fi
 
 
 %changelog
+* Thu Apr 28 2022 Ting-Wei Lan <lantw44@gmail.com> - 0.5.2-8
+- Include the path to emacs-transient because emacs-geiser needs it
+
 * Sat Sep 25 2021 Ting-Wei Lan <lantw44@gmail.com> - 0.5.2-7
 - Disable brp-strip on Fedora 35 and later because it fails on Guile objects
 
diff --git a/guix/emacs-transient/emacs-transient.spec b/guix/emacs-transient/emacs-transient.spec
new file mode 100644
index 0000000..929579c
--- /dev/null
+++ b/guix/emacs-transient/emacs-transient.spec
@@ -0,0 +1,70 @@
+%global pkg transient
+%global pkgname Transient
+
+Name:           emacs-%{pkg}
+Version:        0.3.7
+Release:        1%{?dist}
+Summary:        Transient commands
+
+License:        GPLv3+
+URL:            https://magit.vc
+Source0:        https://github.com/magit/transient/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
+
+BuildArch:      noarch
+BuildRequires:  emacs, make, texinfo, texinfo-tex
+Requires:       emacs(bin) >= %{_emacs_version}
+
+%description
+%{pkgname} is an add-on package for GNU Emacs. It implements a similar
+abstraction involving a prefix command, infix arguments and suffix commands. We
+could call this abstraction a “transient command”, but because it always
+involves at least two commands (a prefix and a suffix) we prefer to call it
+just a “transient”.
+
+
+%prep
+%autosetup -n transient-%{version} -p1
+
+
+%build
+%make_build
+
+
+%install
+mkdir -p %{buildroot}%{_emacs_sitelispdir} %{buildroot}%{_emacs_sitestartdir}
+install -m 755 -d %{buildroot}%{_emacs_sitelispdir}/transient
+install -m 644 lisp/transient.{el,elc} \
+    %{buildroot}%{_emacs_sitelispdir}/transient/
+install -m 644 lisp/transient-autoloads.el \
+    %{buildroot}%{_emacs_sitelispdir}/transient/
+ln -rs %{buildroot}%{_emacs_sitelispdir}/transient/transient-autoloads.el \
+    %{buildroot}%{_emacs_sitestartdir}
+mkdir -p %{buildroot}%{_infodir}
+gzip -9 < docs/transient.info > %{buildroot}%{_infodir}/transient.info.gz
+
+
+%post
+/sbin/install-info %{_infodir}/transient.info.gz %{_infodir}/dir || :
+
+
+%preun
+if [ "$1" = 0 ]; then
+    /sbin/install-info --del %{_infodir}/transient.info.gz %{_infodir}/dir || :
+fi
+
+
+%files
+%license LICENSE
+%doc docs/CHANGELOG README.md
+%doc docs/transient.html docs/transient.org docs/transient.pdf
+%dir %{_emacs_sitelispdir}/transient
+%{_emacs_sitelispdir}/transient/transient.el
+%{_emacs_sitelispdir}/transient/transient.elc
+%{_emacs_sitelispdir}/transient/transient-autoloads.el
+%{_emacs_sitestartdir}/transient-autoloads.el
+%{_infodir}/transient.info.gz
+
+
+%changelog
+* Thu Apr 28 2022 Ting-Wei Lan <lantw44@gmail.com> - 0.3.7-1
+- Initial packaging