[rpms/ocaml-uucp] rawhide: Version 18.0.0

[Jerry James <loganjerry@gmail.com>]

            A new commit has been pushed.

            Repo   : rpms/ocaml-uucp
            Branch : rawhide
            Commit : 822678f26c0a7ce5300cb809454e757f639592ba
            Author : Jerry James <loganjerry@gmail.com>
            Date   : 2026-09-18T11:33:11-06:00
            Stats  : +69/-7 in 3 file(s)
            URL    : https://src.fedoraproject.org/rpms/ocaml-uucp/c/822678f26c0a7ce5300cb809454e757f639592ba?branch=rawhide

            Log:
            Version 18.0.0

- Revert changes for an unreleased version of ocaml-b0

---
diff --git a/ocaml-uucp-b0-downgrade.patch b/ocaml-uucp-b0-downgrade.patch
new file mode 100644
index 0000000..98f55b2
--- /dev/null
+++ b/ocaml-uucp-b0-downgrade.patch
@@ -0,0 +1,60 @@
+--- uucp-18.0.0/B0.ml.orig	2026-09-17 08:58:02.000000000 -0600
++++ uucp-18.0.0/B0.ml	2026-09-18 10:06:07.067233007 -0600
+@@ -64,7 +64,7 @@ let test ?doc ?(meta = B0_meta.empty) ?r
+   let srcs = [ `File src ] in
+   let requires = uucp :: requires in
+   let meta = B0_meta.(meta |> tag test |> add run r) in
+-  let name = Filepath.basename ~drop_exts:true src in
++  let name = Fpath.basename ~strip_exts:true src in
+   B0_ocaml.exe name ?doc ~srcs ~meta ~requires
+ 
+ let test_uucp =
+@@ -92,13 +92,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 *)
+ 
+--- uucp-18.0.0/support/generate_data.ml.orig	2026-09-17 08:58:02.000000000 -0600
++++ uucp-18.0.0/support/generate_data.ml	2026-09-18 10:04:50.116401937 -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
+@@ -29,7 +29,7 @@ let process
+   | `Default _ when not use_default  -> ()
+   | `Default fn | `Set fn ->
+       try
+-        let oc = if fn = "-" then stdout else open_out_bin fn in
++        let oc = if fn = "-" then stdout else open_out fn in
+         try
+           let ppf = Format.formatter_of_out_channel oc in
+           pp ppf ucd;
+--- uucp-18.0.0/test/test_uucp.ml.orig	2026-09-17 08:58:02.000000000 -0600
++++ uucp-18.0.0/test/test_uucp.ml	2026-09-18 10:04:04.156484257 -0600
+@@ -16,7 +16,7 @@ let uchar_dump ppf u = Format.fprintf pp
+ 
+ let load_ucd inf =
+   try
+-    Test.Log.msg "Loading Unicode character database.";
++    Test.log "Loading Unicode character database.";
+     let inf = match inf with None -> "support/ucd.xml" | Some inf -> inf in
+     let ic = if inf = "-" then stdin else open_in inf in
+     let d = Uucd.decoder (`Channel ic) in

diff --git a/ocaml-uucp.spec b/ocaml-uucp.spec
index d4d983f..157f3cd 100644
--- a/ocaml-uucp.spec
+++ b/ocaml-uucp.spec
@@ -3,7 +3,7 @@
 %endif
 
 Name:           ocaml-uucp
-Version:        17.0.0
+Version:        18.0.0
 Release:        %autorelease
 Summary:        Unicode character properties for OCaml
 
@@ -13,7 +13,9 @@ VCS:            git:https://erratique.ch/repos/uucp.git
 Source:         %{url}/releases/uucp-%{version}.tbz
 # Unicode character database, used by the tests
 # See B0.ml for the supported Unicode version
-Source:         https://www.unicode.org/Public/17.0.0/ucdxml/ucd.all.grouped.zip
+Source:         https://www.unicode.org/Public/18.0.0/ucdxml/ucd.all.grouped.zip
+# 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}
@@ -32,8 +34,8 @@ 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-uunf-devel >= 17.0.0
+BuildRequires:  ocaml-uucd-devel >= 18.0.0
+BuildRequires:  ocaml-uunf-devel >= 18.0.0
 
 %description
 Uucp is an OCaml library providing efficient access to a selection of
@@ -52,7 +54,7 @@ The %{name}-devel package contains libraries and signature files for
 developing applications that use %{name}.
 
 %prep
-%autosetup -n uucp-%{version}
+%autosetup -n uucp-%{version} -p1
 unzip -d support %{SOURCE1}
 mv support/ucd.all.grouped.xml support/ucd.xml
 

diff --git a/sources b/sources
index 62f32d3..1661af7 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (uucp-17.0.0.tbz) = c2b5c883c2ed1ee8e7bc9102339dfbca5940e68cd2af59a10abc827fb64c91ad03f85cfc12d4c79605c10e9b3a90743267af8b069143fefeeff6658ec8ed843f
-SHA512 (ucd.all.grouped.zip) = bfe632ab01d3ef4f91f97dcf69f770cf6e2906e5fa9a4199219875d7964d46e09aa0b06f50efe3792c41e546d08d4e087aec7ac4f0e78dabe9e72a96b30f8438
+SHA512 (uucp-18.0.0.tbz) = 89047b5586244c6636e8ebef64c911cb830bfe4e3cb62a344a1938a934ef51fdde75418785dc46da6e9a8d0eec1bdd22d508b6c4a4b29f6a48a220c8f718ad9f
+SHA512 (ucd.all.grouped.zip) = cada6ed9ebc1b027c9bb53d15765030cd80b8aa65ccb17131e3cf79bd0e794939fd246e25d683092f27ef10391e63668c7a4a9c05b5cb37f59d92b37479774d0