diff --git a/sources b/sources index 0bdcb6d..69d6afb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (utop-2.7.0.tbz) = fc6237ff3e80c509a698872e5571b58e914d24c308a634e45972b7f104d960f17eba507535f56fcec972ea8c71143a8036cd122618e63cdf77fb6034297924df +SHA512 (utop-2.8.0.tbz) = 22cdc75e14950eac28d6e0b7b2c6d686aea4e24d9955f140bfcbdef2de033e59f94ab3da0c5c95e1ce51211759694b55c82eec16776c3e0cfb80aa77e64a380b diff --git a/utop.spec b/utop.spec index 2addb03..32dc954 100644 --- a/utop.spec +++ b/utop.spec @@ -1,6 +1,10 @@ +# The OCaml code is byte compiled, not native compiled, so there are no ELF +# objects in the binary RPM. +%global debug_package %{nil} + Name: utop -Version: 2.7.0 -Release: 6%{?dist} +Version: 2.8.0 +Release: 1%{?dist} Summary: Improved toplevel for OCaml License: BSD @@ -17,8 +21,8 @@ BuildRequires: ocaml-lwt-react-devel BuildRequires: ocaml-react-devel >= 1.0.0 # for utop.el -BuildRequires: emacs-common -Requires: emacs-filesystem +BuildRequires: emacs +BuildRequires: emacs-tuareg Provides: ocaml-%{name}%{?_isa} = %{version}-%{release} @@ -41,7 +45,16 @@ Provides: ocaml-%{name}-devel%{?_isa} = %{version}-%{release} The %{name}-devel package contains libraries and signature files for developing applications that use %{name}. -%global debug_package %{nil} +%package -n emacs-utop +Summary: Emacs front end for utop +BuildArch: noarch +Requires: emacs(bin) >= %{?_emacs_version}%{!?_emacs_version:0} +Requires: emacs-tuareg +Recommends: emacs-company + +%description -n emacs-utop +This package contains an Emacs front end for utop, an improved toplevel +for OCaml. %prep %autosetup @@ -50,6 +63,11 @@ developing applications that use %{name}. dune build --verbose \ --for-release-of-packages=%{name} \ %{?_smp_mflags} +cd src/top +emacs -batch --no-init-file --no-site-file \ + --eval "(progn (setq generated-autoload-file \"$PWD/utop-autoloads.el\" backup-inhibited t) (update-directory-autoloads \".\"))" +%_emacs_bytecompile utop.el +cd - %install dune install --verbose \ @@ -59,22 +77,39 @@ dune install --verbose \ rm -f %{buildroot}/usr/doc/%{name}/{LICENSE,CHANGES.md,README.md} +mkdir -p %{buildroot}%{_emacs_sitestartdir} +cp -p src/top/utop-autoloads.* %{buildroot}%{_emacs_sitestartdir} +cp -p src/top/utop.elc %{buildroot}%{_emacs_sitelispdir} + %files %license LICENSE %doc README.md CHANGES.md %{_bindir}/%{name}* -%{_libdir}/ocaml/%{name} +%dir %{_libdir}/ocaml/%{name} +%{_libdir}/ocaml/%{name}/META +%{_libdir}/ocaml/%{name}/*.cma +%{_libdir}/ocaml/%{name}/*.cmi %{_mandir}/man1/%{name}* %{_mandir}/man5/%{name}* -%{_emacs_sitelispdir}/%{name}.el -%{_datadir}/%{name} -%exclude %{_libdir}/ocaml/%{name}/*.mli +%{_datadir}/%{name}/ %files devel +%{_libdir}/ocaml/%{name}/dune-package +%{_libdir}/ocaml/%{name}/opam +%{_libdir}/ocaml/%{name}/*.cmt +%{_libdir}/ocaml/%{name}/*.cmti +%{_libdir}/ocaml/%{name}/*.ml %{_libdir}/ocaml/%{name}/*.mli +%files -n emacs-utop +%{_emacs_sitelispdir}/%{name}.el* +%{_emacs_sitestartdir}/%{name}-autoloads.el* %changelog +* Fri Jun 18 2021 Jerry James - 2.8.0-1 +- Version 2.8.0 +- New emacs-utop package to hold the Emacs interface + * Thu Jun 3 2021 Richard W.M. Jones - 2.7.0-6 - Rebuild for new ocaml-lwt.