[rpms/ocaml-uuseg] rawhide: Version 18.0.0

[rpms/ocaml-uuseg] rawhide: Version 18.0.0

[Jerry James]

            A new commit has been pushed.

            Repo   : rpms/ocaml-uuseg
            Branch : rawhide
            Commit : 78a56d04551973ef27c166937543b8cdf3ef4f96
            Author : Jerry James <loganjerry@gmail.com>
            Date   : 2026-09-18T11:49:30-06:00
            Stats  : +150/-4 in 3 file(s)
            URL    : https://src.fedoraproject.org/rpms/ocaml-uuseg/c/78a56d04551973ef27c166937543b8cdf3ef4f96?branch=rawhide

            Log:
            Version 18.0.0

- Revert changes for an unreleased version of ocaml-b0

---
diff --git a/ocaml-uuseg-b0-downgrade.patch b/ocaml-uuseg-b0-downgrade.patch
new file mode 100644
index 0000000..b9d04ee
--- /dev/null
+++ b/ocaml-uuseg-b0-downgrade.patch
@@ -0,0 +1,144 @@
+--- uuseg-18.0.0/B0.ml.orig	2026-09-17 09:07:34.000000000 -0600
++++ uuseg-18.0.0/B0.ml	2026-09-18 10:24:22.056263919 -0600
+@@ -17,7 +17,7 @@ let uuseg = B0_ocaml.libname "uuseg"
+ 
+ let uuseg_lib =
+   let srcs = [ `Dir ~/"src" ] in
+-  let requires = [uucp] in
++  let requires = [ uucp ] in
+   B0_ocaml.lib uuseg ~doc:"The uuseg library" ~srcs ~requires
+ 
+ let uuseg_string_lib =
+@@ -28,18 +28,24 @@ let uuseg_string_lib =
+ 
+ let usegtrip =
+   let srcs = [ `File ~/"test/usegtrip.ml" ] in
+-  let requires = [cmdliner; uutf; uuseg] in
++  let requires = [ cmdliner; uutf; uuseg ] in
+   B0_ocaml.exe "usegtrip" ~public:true ~doc:"The usegtrip tool" ~srcs ~requires
+ 
+ (* Tests *)
+ 
+ let test =
+-  let requires = [b0_std; uucp; uuseg; cmdliner] in
+-  B0_ocaml.test ~/"test/test_uuseg.ml" ~doc:"Test segmentations" ~requires
++  let srcs = [ `File ~/"test/test_uuseg.ml" ] in
++  let meta =
++    B0_meta.(empty |> tag test |> tag run |> ~~ B0_unit.Action.cwd `Scope_dir)
++  in
++  let requires = [ b0_std; uucp; uuseg; cmdliner ] in
++  B0_ocaml.exe "test_uucp" ~doc:"Test segmentations" ~srcs ~meta ~requires
+ 
+ let examples =
+-  let requires = [uuseg] in
+-  B0_ocaml.test ~/"test/examples.ml" ~doc:"Doc samples" ~requires
++  let srcs = [ `File ~/"test/examples.ml" ] in
++  let meta = B0_meta.(empty |> tag test) in
++  let requires = [ uuseg ] in
++  B0_ocaml.exe "examples" ~doc:"Doc samples" ~srcs ~meta ~requires
+ 
+ (* Actions *)
+ 
+@@ -57,15 +63,14 @@ let download_tests =
+   B0_unit.of_action "download-tests" ~doc @@ fun env _ ~args:_ ->
+   let get kind =
+     let test_url = test_url kind in
+-    let test_file = Filepath.v (Fmt.str "test/%sBreakTest.txt" kind) in
++    let test_file = Fpath.v (Fmt.str "test/%sBreakTest.txt" kind) in
+     let test_file = B0_env.in_scope_dir env test_file in
+     (Log.stdout @@ fun m ->
+-     m "@[<v>Downloading %s@,to %a@]" test_url Filepath.pp test_file);
+-    let force = true and make_path = false in
+-    B0_action_kit.download_url env test_url ~force ~make_path ~dst:test_file
++     m "@[<v>Downloading %s@,to %a@]" test_url Fpath.pp test_file);
++    B0_action_kit.fetch_url env test_url test_file
+   in
+   let tests = ["Line"; "Grapheme"; "Word"; "Sentence"] in
+-  ignore (List.iter_iter_on_error ~error:(Log.if_error ~use:()) get tests);
++  List.iter_iter_on_error ~error:(Log.if_error ~use:()) get tests;
+   Ok ()
+ 
+ (* Packs *)
+--- uuseg-18.0.0/test/test_uuseg.ml.orig	2026-09-17 09:07:34.000000000 -0600
++++ uuseg-18.0.0/test/test_uuseg.ml	2026-09-18 10:26:25.446678820 -0600
+@@ -62,12 +62,12 @@ let decode_conformance_specs ignores ic
+               if ignores = [] then loop (spec :: specs) else
+               try
+                 let reason = List.assoc spec ignores in
+-                Test.Log.msg "Skip test (%s): %s" reason test;
++                Test.log "Skip test (%s): %s" reason test;
+                 loop (specs)
+               with
+               | Not_found -> loop (spec :: specs)
+               with Exit ->
+-                Test.Log.msg
++                Test.log
+                   "Skip test (surrogate not a scalar value): %s" test;
+                   loop specs
+             end
+@@ -109,13 +109,13 @@ let test_conformance seg name ignores in
+   Test.test (Printf.sprintf "conformance of %s" name) @@ fun () ->
+   let specs =
+     try
+-      In_channel.with_open_bin (Filepath.to_string inf) @@ fun ic ->
++      In_channel.with_open_bin (Fpath.to_string inf) @@ fun ic ->
+       decode_conformance_specs ignores ic
+     with Sys_error e -> Test.failstop "%s" e
+   in
+   let test spec = test_spec seg (seq_of_spec [] spec) spec in
+   let fail ?__POS__ n ~assertions =
+-    Test.Log.fail "%a assertions %a"
++    Test.log_fail "%a assertions %a"
+       Test.Fmt.fail_count_ratio (n, assertions) Test.Fmt.failed ()
+   in
+   Test.block ~__POS__ ~fail @@ fun () ->
+@@ -187,32 +187,34 @@ let test_LB30b_assumption =
+ let main () =
+   let open Cmdliner in
+   let g_file =
+-    Arg.(value & opt B0_std_cli.file (Filepath.v "test/GraphemeBreakTest.txt")
++    Arg.(value & opt B0_std_cli.filepath (Fpath.v "test/GraphemeBreakTest.txt")
+          & info ["g"] ~doc:"The GraphemeBreakTest.txt file")
+   in
+   let w_file =
+-    Arg.(value & opt B0_std_cli.file (Filepath.v "test/WordBreakTest.txt")
++    Arg.(value & opt B0_std_cli.filepath (Fpath.v "test/WordBreakTest.txt")
+          & info ["w"] ~doc:"The WordBreakTest.txt file")
+   in
+   let s_file =
+-    Arg.(value & opt B0_std_cli.file (Filepath.v "test/SentenceBreakTest.txt")
++    Arg.(value & opt B0_std_cli.filepath (Fpath.v "test/SentenceBreakTest.txt")
+          & info ["s"] ~doc:"The SentenceBreakTest.txt file")
+   in
+   let l_file =
+-    Arg.(value & opt B0_std_cli.file (Filepath.v "test/LineBreakTest.txt")
++    Arg.(value & opt B0_std_cli.filepath (Fpath.v "test/LineBreakTest.txt")
+          & info ["lb"] ~doc:"The LineBreakTest.txt file")
+   in
++  let args =
++    let open Term.Syntax in
++    let+ g_file and+ w_file and+ s_file and+ l_file in
++    (g_file, w_file, s_file, l_file)
++  in
+   let doc = "Run Unicode segmentation conformance tests" in
+-  Test.main' ~doc @@
+-  let open Cmdliner.Term.Syntax in
+-  let+ g_file and+ w_file and+ s_file and+ l_file in
+-  fun () ->
+-    test_LB30b_assumption ();
+-    test_conformance `Grapheme_cluster "grapheme cluster boundary" [] g_file ();
+-    test_conformance `Word "word boundary" [] w_file ();
+-    test_conformance `Sentence "sentence boundary" [] s_file ();
+-    test_conformance `Line_break "line break boundary" [] l_file ();
+-    test_others ();
+-    test_uuseg_string ()
++  Test.main' ~doc args @@ fun (g_file, w_file, s_file, l_file) ->
++  test_LB30b_assumption ();
++  test_conformance `Grapheme_cluster "grapheme cluster boundary" [] g_file ();
++  test_conformance `Word "word boundary" [] w_file ();
++  test_conformance `Sentence "sentence boundary" [] s_file ();
++  test_conformance `Line_break "line break boundary" [] l_file ();
++  test_others ();
++  test_uuseg_string ()
+ 
+ let () = if !Sys.interactive then () else exit (main ())

diff --git a/ocaml-uuseg.spec b/ocaml-uuseg.spec
index 09a16c8..43fda14 100644
--- a/ocaml-uuseg.spec
+++ b/ocaml-uuseg.spec
@@ -3,7 +3,7 @@
 %endif
 
 Name:           ocaml-uuseg
-Version:        17.0.0
+Version:        18.0.0
 Release:        %autorelease
 Summary:        Unicode text segmentation for OCaml
 
@@ -11,6 +11,8 @@ License:        ISC
 URL:            https://erratique.ch/software/uuseg
 VCS:            git:https://erratique.ch/repos/uuseg.git
 Source:         %{url}/releases/uuseg-%{version}.tbz
+# Revert changes for an unreleased version of ocaml-b0; affects tests only
+Patch:          %{name}-b0-downgrade.patch
 
 # OCaml packages not built on i686 since OCaml 5 / Fedora 39.
 ExcludeArch:    %{ix86}
@@ -29,7 +31,7 @@ BuildRequires:  ocaml-findlib
 BuildRequires:  ocaml-ocamlbuild
 BuildRequires:  ocaml-rpm-macros
 BuildRequires:  ocaml-topkg-devel >= 1.1.0
-BuildRequires:  ocaml-uucp-devel >= 17.0.0
+BuildRequires:  ocaml-uucp-devel >= 18.0.0
 BuildRequires:  ocaml-uutf-devel >= 1.0.0
 BuildRequires:  unicode-ucd
 
@@ -57,7 +59,7 @@ The %{name}-devel package contains libraries and signature files for
 developing applications that use %{name}.
 
 %prep
-%autosetup -n uuseg-%{version}
+%autosetup -n uuseg-%{version} -p1
 
 # Files needed for the tests
 cp -p %{_datadir}/unicode/ucd/auxiliary/*BreakTest.txt test

diff --git a/sources b/sources
index 483ba9f..2019a40 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (uuseg-17.0.0.tbz) = 8d81ca0a57516b94c66a0da256f3455ba26b0875ca9e354a665ec30223c9216be57abdd52c39c8c384fe127df8060c18ff07d92d4d9f53892bc4ed20699df3ef
+SHA512 (uuseg-18.0.0.tbz) = ff7f8d2548e6fe887813d98dae8240236d9881354200bdcf6c8186a958bf9d95ccdc2a19ae31f1dffdf266adaabdc444ba7727c1e50c8a3f1f339b99427f92f1