public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Jerry James <loganjerry@gmail.com>
To: git-commits@fedoraproject.org
Subject: [rpms/ocaml-uucd] rawhide: Version 18.0.0
Date: Fri, 18 Sep 2026 17:00:39 GMT	[thread overview]
Message-ID: <178975083909.1.14653782043483117551.rpms-ocaml-uucd-9a5a6fa18326@fedoraproject.org> (raw)

            A new commit has been pushed.

            Repo   : rpms/ocaml-uucd
            Branch : rawhide
            Commit : 9a5a6fa1832633fd0160d08ca994f47858579902
            Author : Jerry James <loganjerry@gmail.com>
            Date   : 2026-09-18T11:00:12-06:00
            Stats  : +40/-5 in 3 file(s)
            URL    : https://src.fedoraproject.org/rpms/ocaml-uucd/c/9a5a6fa1832633fd0160d08ca994f47858579902?branch=rawhide

            Log:
            Version 18.0.0

- Revert changes for an unreleased version of ocaml-b0

---
diff --git a/ocaml-uucd-b0-downgrade.patch b/ocaml-uucd-b0-downgrade.patch
new file mode 100644
index 0000000..740e17b
--- /dev/null
+++ b/ocaml-uucd-b0-downgrade.patch
@@ -0,0 +1,33 @@
+--- uucd-18.0.0/B0.ml.orig	2026-09-17 08:52:50.000000000 -0600
++++ uucd-18.0.0/B0.ml	2026-09-18 09:40:11.851994525 -0600
+@@ -26,13 +26,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 ~/"test/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
+ 
+ let show_version =
+   B0_unit.of_action "unicode-version" ~doc:"Show supported unicode version" @@
+--- uucd-18.0.0/test/test_uucd.ml.orig	2026-09-17 08:52:50.000000000 -0600
++++ uucd-18.0.0/test/test_uucd.ml	2026-09-18 09:40:32.451358874 -0600
+@@ -10,8 +10,8 @@ let test_decode =
+   Test.test "Uucd.decode" @@ fun file ->
+   Test.noraise ~__POS__ @@ fun () ->
+   let cwd = Os.Dir.cwd () |> Result.error_to_failure in
+-  let inf = Filepath.(cwd // v "test/ucd.xml") in
+-  let inf = Filepath.to_string inf in
++  let inf = Fpath.(cwd // v "test/ucd.xml") in
++  let inf = Fpath.to_string inf in
+   try
+     In_channel.with_open_bin inf @@ fun ic ->
+     let d = Uucd.decoder (`Channel ic) in

diff --git a/ocaml-uucd.spec b/ocaml-uucd.spec
index 5afd4f6..744de21 100644
--- a/ocaml-uucd.spec
+++ b/ocaml-uucd.spec
@@ -3,7 +3,7 @@
 %endif
 
 Name:           ocaml-uucd
-Version:        17.0.0
+Version:        18.0.0
 Release:        %autorelease
 Summary:        Unicode character database decoder for OCaml
 
@@ -13,7 +13,9 @@ VCS:            git:https://erratique.ch/repos/uucd.git
 Source:         %{url}/releases/uucd-%{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}
@@ -51,7 +53,7 @@ The %{name}-devel package contains libraries and signature files for
 developing applications that use %{name}.
 
 %prep
-%autosetup -n uucd-%{version}
+%autosetup -n uucd-%{version} -p1
 unzip -d test %{SOURCE1}
 mv test/ucd.all.grouped.xml test/ucd.xml
 

diff --git a/sources b/sources
index 7a9b4fc..966ff89 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (uucd-17.0.0.tbz) = adcbf252bdb1851221b226b086f58d9c73b78ffa4fbfe02d98e8f8203e10d4f0d6d26f6a624a16cf9cff5f7043a26ebdf6fef5980ab7b24e48f35ff87a92f3a4
-SHA512 (ucd.all.grouped.zip) = bfe632ab01d3ef4f91f97dcf69f770cf6e2906e5fa9a4199219875d7964d46e09aa0b06f50efe3792c41e546d08d4e087aec7ac4f0e78dabe9e72a96b30f8438
+SHA512 (uucd-18.0.0.tbz) = 9af5ff0801df8defb9a74d0445cc656189b50a3212d51b3fdc79a0de8603daac49e6ae654663c8ad511e1553e3edd440f7ea306152c372d95b3697dac69382d5
+SHA512 (ucd.all.grouped.zip) = cada6ed9ebc1b027c9bb53d15765030cd80b8aa65ccb17131e3cf79bd0e794939fd246e25d683092f27ef10391e63668c7a4a9c05b5cb37f59d92b37479774d0

                 reply	other threads:[~2026-09-18 17:00 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=178975083909.1.14653782043483117551.rpms-ocaml-uucd-9a5a6fa18326@fedoraproject.org \
    --to=loganjerry@gmail.com \
    --cc=git-commits@fedoraproject.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox