[rpms/ocaml-uunf] rawhide: Version 18.0.0

[rpms/ocaml-uunf] rawhide: Version 18.0.0

[Jerry James]

            A new commit has been pushed.

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

            Log:
            Version 18.0.0

- Revert changes for an unreleased version of ocaml-b0

---
diff --git a/ocaml-uunf-b0-downgrade.patch b/ocaml-uunf-b0-downgrade.patch
new file mode 100644
index 0000000..d2ac117
--- /dev/null
+++ b/ocaml-uunf-b0-downgrade.patch
@@ -0,0 +1,111 @@
+--- uunf-18.0.0/B0.ml.orig	2026-09-17 09:02:26.000000000 -0600
++++ uunf-18.0.0/B0.ml	2026-09-18 09:56:46.873194709 -0600
+@@ -45,11 +45,17 @@ let unftrip =
+ (* Tests *)
+ 
+ let test =
++  let srcs = [ `File ~/"test/test_uunf.ml" ] in
++  let meta =
++    B0_meta.(empty |> tag test |> tag run |> ~~ B0_unit.Action.cwd `Scope_dir)
++  in
+   let requires = [b0_std; uunf; cmdliner] in
+   B0_ocaml.test ~/"test/test_uunf.ml" ~requires ~doc:"Test normalization"
+ 
+ let examples =
+-  B0_ocaml.test ~/"test/examples.ml" ~requires:[uunf] ~doc:"Doc samples"
++  let srcs = [ `File ~/"test/examples.ml" ] in
++  let meta = B0_meta.empty |> B0_meta.(tag test) in
++  B0_ocaml.exe "examples" ~srcs ~meta ~requires:[uunf] ~doc:"Doc samples"
+ 
+ (* Actions *)
+ 
+@@ -67,9 +73,8 @@ let download_tests =
+   let test_url = Fmt.str "%s/%s/ucd/NormalizationTest.txt" uc_base version in
+   let test_file = B0_env.in_scope_dir env ~/"test/NormalizationTest.txt" 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 ~force ~make_path test_url ~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
+ 
+ let download_ucdxml =
+   let doc = "Download the ucdxml to support/ucd.xml" in
+@@ -78,13 +83,12 @@ let download_ucdxml =
+   let version = B0_version.to_string unicode_version in
+   let ucd_url = Fmt.str "%s/%s/ucdxml/ucd.all.grouped.zip" uc_base version in
+   let ucd_file = B0_env.in_scope_dir env ~/"support/ucd.xml" in
+-  Result.join @@ Os.File.with_tmp_fd @@ fun dst tmpfd ->
++  Result.join @@ Os.File.with_tmp_fd @@ fun tmpfile tmpfd ->
+   (Log.stdout @@ fun m ->
+-   m "@[<v>Downloading %s@,to %a@]" ucd_url Filepath.pp ucd_file);
+-  let force = true and make_path = false in
+-  let* () = B0_action_kit.download_url env ~force ~make_path ucd_url ~dst in
++   m "@[<v>Downloading %s@,to %a@]" ucd_url Fpath.pp ucd_file);
++  let* () = B0_action_kit.fetch_url env ucd_url tmpfile in
+   let stdout = Os.Cmd.out_file ~force:true ~make_path:true ucd_file in
+-  Os.Cmd.run Cmd.(unzip % "-p" %% path dst) ~stdout
++  Os.Cmd.run Cmd.(unzip % "-p" %% path tmpfile) ~stdout
+ 
+ (* Packs *)
+ 
+--- uunf-18.0.0/support/generate_data.ml.orig	2026-09-17 09:02:26.000000000 -0600
++++ uunf-18.0.0/support/generate_data.ml	2026-09-18 09:54:26.834168545 -0600
+@@ -9,7 +9,7 @@ let str = Format.sprintf
+ let exec = Filename.basename Sys.executable_name
+ 
+ let ucd_or_die inf = try
+-  let ic = if inf = "-" then stdin else open_in_bin inf in
++  let ic = if inf = "-" then stdin else open_in inf in
+   let d = Uucd.decoder (`Channel ic) in
+   match Uucd.decode d with
+   | `Ok db -> db
+@@ -23,7 +23,7 @@ let process inf outf =
+   let ucd = (Gen.log "Loading Unicode character database.\n"; ucd_or_die inf) in
+   let generate pp outf ucd =
+     try
+-      let oc = if outf = "-" then stdout else open_out_bin outf in
++      let oc = if outf = "-" then stdout else open_out outf in
+       try
+         let ppf = Format.formatter_of_out_channel oc in
+         pp ppf ucd;
+--- uunf-18.0.0/test/test_uunf.ml.orig	2026-09-17 09:02:26.000000000 -0600
++++ uunf-18.0.0/test/test_uunf.ml	2026-09-18 09:53:53.051005971 -0600
+@@ -29,8 +29,7 @@ let uchar_of_string v = (* parses a scal
+ let uchars_of_string v = List.map uchar_of_string (String.split_on_char ' ' v)
+ 
+ let decode_conformance_data test_data_file =
+-  Test.Log.msg "Reading test data from %a"
+-    (Fmt.code' Filepath.pp) test_data_file;
++  Test.log "Reading test data from %a" (Fmt.code' Fpath.pp) test_data_file;
+   let split_string sep s =
+     List.filter (fun s -> s <> "") (String.split_on_char sep s)
+   in
+@@ -59,7 +58,7 @@ let decode_conformance_data test_data_fi
+           | _ -> failwith ""
+           end
+       with Failure _ ->
+-        Test.Log.msg "Unable to parse line:\n`%s'\n" l;
++        Test.log "Unable to parse line:\n`%s'\n" l;
+         loop tests collect_decomps decomps ls
+   in
+   let* s = Os.File.read test_data_file in
+@@ -238,14 +237,12 @@ let test_flushing_end_seq =
+ 
+ let main () =
+   let test_data_file =
+-    let default = Filepath.v "test/NormalizationTest.txt" in
++    let default = Fpath.v "test/NormalizationTest.txt" in
+     let doc = "Unicode normalization conformance test file." in
+-    Cmdliner.Arg.(value & pos 0 B0_std_cli.file default & info [] ~doc)
++    Cmdliner.Arg.(value & pos 0 B0_std_cli.filepath default & info [] ~doc)
+   in
+-  Test.main' @@
+-  let open Cmdliner.Term.Syntax in
+-  let+ test_data_file in
+-  fun () -> match decode_conformance_data test_data_file with
++  Test.main' test_data_file @@ fun test_data_file ->
++  match decode_conformance_data test_data_file with
+   | Error e -> Test.failstop "%s" e
+   | Ok data ->
+       let args = Test.Arg.[value conformance data] in

diff --git a/ocaml-uunf.spec b/ocaml-uunf.spec
index 77b82bb..0730326 100644
--- a/ocaml-uunf.spec
+++ b/ocaml-uunf.spec
@@ -3,7 +3,7 @@
 %endif
 
 Name:           ocaml-uunf
-Version:        17.0.0
+Version:        18.0.0
 Release:        %autorelease
 Summary:        Unicode text normalization for OCaml
 
@@ -11,6 +11,8 @@ License:        ISC
 URL:            https://erratique.ch/software/uunf
 VCS:            git:https://erratique.ch/repos/uunf.git
 Source:         %{url}/releases/uunf-%{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-uucd-devel >= 17.0.0
+BuildRequires:  ocaml-uucd-devel >= 18.0.0
 BuildRequires:  ocaml-uutf-devel >= 1.0.0
 BuildRequires:  unicode-ucd
 

diff --git a/sources b/sources
index 97d877e..5c1a2f3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (uunf-17.0.0.tbz) = 1ec4d7229bb473ab2dd146ec732c8c70f357f73211e71d32625cd2410a35766e684bbeb1bd4e186b7403d4af8d597d46b7ccf58b23ae95aac32a96c0b4321691
+SHA512 (uunf-18.0.0.tbz) = 739434317d84fb2f60f195d5645093fce5cfeb8ebb7e491345c80799528768a255cc39be05d12f873f028a302bbe0716b0591b8f47c6fe04fe309c6e6c93069c