[rpms/ocaml-merlin] rawhide: OCaml 5.5.0 rebuild

[rpms/ocaml-merlin] rawhide: OCaml 5.5.0 rebuild

[Jerry James]

            A new commit has been pushed.

            Repo   : rpms/ocaml-merlin
            Branch : rawhide
            Commit : d18d6637c82cb9f443035c59b9cd8d4328fe10a4
            Author : Jerry James <loganjerry@gmail.com>
            Date   : 2026-07-09T15:20:59-06:00
            Stats  : +9/-14 in 2 file(s)
            URL    : https://src.fedoraproject.org/rpms/ocaml-merlin/c/d18d6637c82cb9f443035c59b9cd8d4328fe10a4?branch=rawhide

            Log:
            OCaml 5.5.0 rebuild

- Version 5.8
- Use the dune declarative buildsystem

---
diff --git a/ocaml-merlin.spec b/ocaml-merlin.spec
index 699f629..d7ef79c 100644
--- a/ocaml-merlin.spec
+++ b/ocaml-merlin.spec
@@ -1,11 +1,11 @@
 # OCaml packages not built on i686 since OCaml 5 / Fedora 39.
 ExcludeArch: %{ix86}
 
-%global ocamlver 504
+%global ocamlver 505
 %global giturl  https://github.com/ocaml/merlin
 
 Name:           ocaml-merlin
-Version:        5.7.1
+Version:        5.8
 Release:        %autorelease
 Summary:        Context sensitive completion for OCaml
 
@@ -26,19 +26,22 @@ Source:         %{giturl}/releases/download/v%{version}-%{ocamlver}/merlin-%{ver
 # Fix the tests to work with /usr/lib64 as well as /usr/lib
 Patch:          0001-Use-usr-lib64-for-Fedora.patch
 
+BuildSystem:    dune
+BuildOption(build): @install
+BuildOption(install): -s -n
+
 BuildRequires:  emacs
 BuildRequires:  emacs-auto-complete
 BuildRequires:  emacs-company-mode
 BuildRequires:  emacs-iedit
 BuildRequires:  jq
-BuildRequires:  ocaml >= 5.4
+BuildRequires:  ocaml >= 5.5
 BuildRequires:  ocaml-alcotest-devel >= 1.3.0
 BuildRequires:  ocaml-caml-mode
 BuildRequires:  ocaml-csexp-devel >= 1.5.1
 BuildRequires:  ocaml-dune >= 3.0.0
 BuildRequires:  ocaml-findlib-devel >= 1.6.0
 BuildRequires:  ocaml-menhir >= 20230608
-BuildRequires:  ocaml-ppxlib-devel
 BuildRequires:  ocaml-source
 BuildRequires:  ocaml-yojson-devel >= 2.0.0
 BuildRequires:  vim-enhanced
@@ -119,12 +122,7 @@ This package contains the Vim interface to merlin.
 %prep
 %autosetup -n merlin-%{version}-%{ocamlver} -p1
 
-%build
-%dune_build @install
-
-%install
-%dune_install -s -n
-
+%install -a
 # Reinstall vim files to Fedora default location
 mkdir -p %{buildroot}%{vimfiles_root}
 mv %{buildroot}%{_datadir}/merlin/vim/* %{buildroot}%{vimfiles_root}
@@ -139,9 +137,6 @@ mv merlin-loaddefs.el %{buildroot}%{_emacs_sitestartdir}
 %_emacs_bytecompile *.el
 cd -
 
-%check
-%dune_check
-
 %files
 %doc featuremap.* CHANGES.md README.md
 %{_bindir}/ocamlmerlin

diff --git a/sources b/sources
index 036391c..39f6896 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (merlin-5.7.1-504.tbz) = 9391d3a0aaa5065a02c6f5faaf7149f8f800c748d9be5ccff6af800ce73bdf418ead72dbeaf6ee7a6cbeae2c8e56285fbe422740ed407bcc4edab889dd1c8f9c
+SHA512 (merlin-5.8-505.tbz) = 1d7a7751157e393d3ae248ef5ae24a6b4e81430666c61cc51a3d0ec35804523317036f3d7a3c7f18a7554337f4e5f5989fb677865b261ece3fd2b317903570ba