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

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

[Jerry James]

            A new commit has been pushed.

            Repo   : rpms/ocaml-camomile
            Branch : rawhide
            Commit : a8be841becbc14b8417a209e5a2859d129a053fb
            Author : Jerry James <loganjerry@gmail.com>
            Date   : 2026-07-09T13:59:04-06:00
            Stats  : +41/-11 in 2 file(s)
            URL    : https://src.fedoraproject.org/rpms/ocaml-camomile/c/a8be841becbc14b8417a209e5a2859d129a053fb?branch=rawhide

            Log:
            OCaml 5.5.0 rebuild

- Add upstream pull request to fix compilation with dune 3.24
- Use the dune declarative buildsystem

---
diff --git a/13.patch b/13.patch
new file mode 100644
index 0000000..bb995f9
--- /dev/null
+++ b/13.patch
@@ -0,0 +1,28 @@
+From 4c0042ef874477f2ac99a42980b55c8e6f0d6135 Mon Sep 17 00:00:00 2001
+From: Shon Feder <shon.feder@gmail.com>
+Date: Wed, 24 Jun 2026 19:32:56 -0400
+Subject: [PATCH] Fix path handling from dune variable
+
+Dune `deps` variables are expanded to paths, not simple strings. The
+representation of this has changed with
+https://github.com/ocaml/dune/pull/15156, causing camomile to fail on
+the pending dune 3.24. But in general this has always been a path, so if
+we only want the basename of the path in a stable form, we need to
+derive that explicitly.
+---
+ src/tools/camomilecharmap.ml | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/tools/camomilecharmap.ml b/src/tools/camomilecharmap.ml
+index c07d4f2..4839854 100644
+--- a/src/tools/camomilecharmap.ml
++++ b/src/tools/camomilecharmap.ml
+@@ -46,7 +46,7 @@ let parse_arg () =
+   Arg.parse
+     [("-d", Arg.String (( := ) dir), "[directory]\toutputpath")]
+     (fun s ->
+-      if !file <> None then failwith "Too many arguments" else file := Some s)
++      if !file <> None then failwith "Too many arguments" else file := Some (Filename.basename s))
+     helptext;
+   (!file, !dir)
+ 

diff --git a/ocaml-camomile.spec b/ocaml-camomile.spec
index 3372a4e..b213a46 100644
--- a/ocaml-camomile.spec
+++ b/ocaml-camomile.spec
@@ -7,7 +7,7 @@ ExcludeArch: %{ix86}
 
 Name:           ocaml-camomile
 Version:        2.0.0
-Release:        21%{?dist}
+Release:        22%{?dist}
 Summary:        Unicode library for OCaml
 
 # LGPL-2.1-or-later WITH OCaml-LGPL-linking-exception: the project as a whole
@@ -21,8 +21,12 @@ Source0:        %{url}/archive/v%{version}/Camomile-%{version}.tar.gz
 
 # Fix a licensing issue in EO Unicode files.  Submitted but not
 # accepted upstream: https://github.com/yoriyuki/Camomile/pull/84
-Patch1:         0001-Camomile-locales-eo.txt-Fix-license-by-importing-dat.patch
+Patch:          0001-Camomile-locales-eo.txt-Fix-license-by-importing-dat.patch
 
+# Fix path handling from dune variable (for dune 3.24)
+Patch:          %{url}/pull/13.patch
+
+BuildSystem:    dune
 BuildRequires:  ocaml >= 4.13
 BuildRequires:  ocaml-camlp-streams-devel
 BuildRequires:  ocaml-dune >= 3.4
@@ -69,7 +73,7 @@ applications that use %{name}.
 %autosetup -p1 -n Camomile-%{version}
 
 
-%build
+%build -p
 # This avoids a stack overflow in the OCaml compiler on POWER only.
 # Originally found with OCaml 4.05, still affecting 4.13.0.
 # https://github.com/yoriyuki/Camomile/issues/39
@@ -77,20 +81,13 @@ applications that use %{name}.
 ulimit -Hs 65536
 ulimit -Ss 65536
 %endif
-%dune_build
-
 
-%install
-%dune_install
 
+%install -a
 # The data files are in their own package
 sed -i '\@%{_datadir}@d' .ofiles
 
 
-%check
-%dune_check
-
-
 %files -f .ofiles
 %doc README.md CHANGES.md
 %license LICENSE.md
@@ -106,6 +103,11 @@ sed -i '\@%{_datadir}@d' .ofiles
 
 
 %changelog
+* Thu Jul 09 2026 Jerry James <loganjerry@gmail.com> - 2.0.0-22
+- OCaml 5.5.0 rebuild
+- Add upstream pull request to fix compilation with dune 3.24
+- Use the dune declarative buildsystem
+
 * Fri Feb 20 2026 Richard W.M. Jones <rjones@redhat.com> - 2.0.0-21
 - OCaml 5.4.1 rebuild