diff --git a/sources b/sources index cb07d04..8b46ffc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (utop-2.15.0.tar.gz) = f05aa85fbec3a4ecda6068b1ed350f61a0b3626969641c37508fde0fdeeffa80abd50b406c36884a81bc965d91d97d797490da1fe4edea0daa3936d47bbb1c70 +SHA512 (utop-2.17.0.tar.gz) = 0d4665f72379ef7d294517a3e3cd4e6facb109a59faa6df71fa7f9837664771a919639f035ddc41f51a60cfd4fc03c911d87c20b943a601e0abc3a1248140eab diff --git a/utop-version.patch b/utop-version.patch index 0cfd626..bb3c2d7 100644 --- a/utop-version.patch +++ b/utop-version.patch @@ -1,31 +1,31 @@ -diff -durpNw utop-2.15.0/dune-project utop-2.15.0-1/dune-project ---- utop-2.15.0/dune-project 2024-11-25 08:12:42.000000000 -0700 -+++ utop-2.15.0-1/dune-project 2025-01-10 08:50:45.000000000 -0700 +diff -durpNw utop-2.16.0/dune-project utop-2.16.0-1/dune-project +--- utop-2.16.0/dune-project 2025-07-22 07:19:24.000000000 -0600 ++++ utop-2.16.0-1/dune-project 2025-07-30 14:55:10.501079812 -0600 @@ -1,6 +1,7 @@ (lang dune 2.7) (formatting (enabled_for dune)) (name utop) -+(version 2.15.0) ++(version 2.16.0) (generate_opam_files) (source (github ocaml-community/utop)) -diff -durpNw utop-2.15.0/src/lib/uTop.ml utop-2.15.0-1/src/lib/uTop.ml ---- utop-2.15.0/src/lib/uTop.ml 2024-11-25 08:12:42.000000000 -0700 -+++ utop-2.15.0-1/src/lib/uTop.ml 2025-01-10 08:50:45.000000000 -0700 +diff -up utop-2.16.0/src/lib/uTop.ml utop-2.16.0-1/src/lib/uTop.ml +--- utop-2.16.0/src/lib/uTop.ml 2025-07-22 07:19:24.000000000 -0600 ++++ utop-2.16.0-1/src/lib/uTop.ml 2025-07-30 14:55:38.012927962 -0600 @@ -18,7 +18,7 @@ let (>>=) = Lwt.(>>=) module String_set = Set.Make(String) -let version = "%%VERSION%%" -+let version = "2.15.0" ++let version = "2.16.0" (* +-----------------------------------------------------------------+ | History | -diff -durpNw utop-2.15.0/utop.opam utop-2.15.0-1/utop.opam ---- utop-2.15.0/utop.opam 2024-11-25 08:12:42.000000000 -0700 -+++ utop-2.15.0-1/utop.opam 2025-01-10 08:50:45.000000000 -0700 +diff -up utop-2.16.0/utop.opam utop-2.16.0-1/utop.opam +--- utop-2.16.0/utop.opam 2025-07-22 07:19:24.000000000 -0600 ++++ utop-2.16.0-1/utop.opam 2025-07-30 14:55:53.988878072 -0600 @@ -1,3 +1,4 @@ -+version: "2.15.0" ++version: "2.16.0" # This file is generated by dune, edit dune-project instead opam-version: "2.0" synopsis: "Universal toplevel for OCaml" diff --git a/utop.spec b/utop.spec index a7f00f0..95ee2e4 100644 --- a/utop.spec +++ b/utop.spec @@ -1,6 +1,3 @@ -# OCaml packages not built on i686 since OCaml 5 / Fedora 39. -ExcludeArch: %{ix86} - # The OCaml code is byte compiled, not native compiled, so there are no ELF # objects in the binary RPM. %global debug_package %{nil} @@ -8,17 +5,21 @@ ExcludeArch: %{ix86} %global giturl https://github.com/ocaml-community/utop Name: utop -Version: 2.15.0 +Version: 2.17.0 Release: %autorelease Summary: Improved toplevel for OCaml License: BSD-3-Clause URL: https://ocaml-community.github.io/utop/ -VCS : git:%{giturl}.git -Source: %{giturl}/releases/download/%{version}/%{name}-%{version}.tar.gz +VCS: git:%{giturl}.git +Source: %{giturl}/archive/%{version}/%{name}-%{version}.tar.gz # Upstream patch to fix the version number Patch: %{name}-version.patch +# OCaml packages not built on i686 since OCaml 5 / Fedora 39. +ExcludeArch: %{ix86} + +BuildSystem: dune BuildRequires: ocaml >= 4.11.0 BuildRequires: ocaml-alcotest-devel BuildRequires: ocaml-cppo >= 1.1.2 @@ -39,10 +40,9 @@ BuildRequires: emacs-tuareg Provides: ocaml-%{name}%{?_isa} = %{version}-%{release} %description -utop is an improved toplevel (i.e., Read-Eval-Print Loop) for -OCaml. It can run in a terminal or in Emacs. It supports line -editing, history, real-time and context sensitive completion, -colors, and more. +utop is an improved toplevel (i.e., Read-Eval-Print Loop) for OCaml. It can +run in a terminal or in Emacs. It supports line editing, history, real-time +and context sensitive completion, colors, and more. %package devel Summary: Development files for %{name} @@ -64,32 +64,25 @@ Requires: emacs-tuareg Recommends: emacs-company %description -n emacs-utop -This package contains an Emacs front end for utop, an improved toplevel -for OCaml. +This package contains an Emacs front end for utop, an improved toplevel for +OCaml. %prep %autosetup -p1 -%build -%dune_build - +%build -a cd src/top emacs -batch --no-init-file --no-site-file \ --eval "(let ((backup-inhibited t)) (loaddefs-generate \".\" \"$PWD/utop-loaddefs.el\"))" %_emacs_bytecompile utop.el cd - -%install -%dune_install - +%install -a # Install the Emacs interface mkdir -p %{buildroot}%{_emacs_sitestartdir} cp -p src/top/utop-loaddefs.* %{buildroot}%{_emacs_sitestartdir} cp -p src/top/utop.elc %{buildroot}%{_emacs_sitelispdir} -%check -%dune_check - %files -f .ofiles %license LICENSE %doc README.md CHANGES.md