public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/ocaml-camomile] rawhide: Version 2.1.0
@ 2026-09-17 17:05 Jerry James
  0 siblings, 0 replies; only message in thread
From: Jerry James @ 2026-09-17 17:05 UTC (permalink / raw)
  To: git-commits

            A new commit has been pushed.

            Repo   : rpms/ocaml-camomile
            Branch : rawhide
            Commit : 4f8fec91971f80932b229fb4a0661474b2ff04b8
            Author : Jerry James <loganjerry@gmail.com>
            Date   : 2026-09-17T11:05:09-06:00
            Stats  : +15/-45 in 4 file(s)
            URL    : https://src.fedoraproject.org/rpms/ocaml-camomile/c/4f8fec91971f80932b229fb4a0661474b2ff04b8?branch=rawhide

            Log:
            Version 2.1.0

- Drop upstreamed dune 3.24 patch
- Do not build the camomile-embedded package for now
- ppc64le stack overflow fix is no longer needed

---
diff --git a/.gitignore b/.gitignore
index 9ffc1e3..7d7c14e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@ camomile-0.7.2.tar.bz2
 /camomile-1.0.1.tar.gz
 /camomile-1.0.2.tar.gz
 /Camomile-2.0.0.tar.gz
+/Camomile-2.1.0.tar.gz

diff --git a/13.patch b/13.patch
deleted file mode 100644
index bb995f9..0000000
--- a/13.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-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 2cad57b..48e70a6 100644
--- a/ocaml-camomile.spec
+++ b/ocaml-camomile.spec
@@ -6,8 +6,8 @@ ExcludeArch: %{ix86}
 %endif
 
 Name:           ocaml-camomile
-Version:        2.0.0
-Release:        25%{?dist}
+Version:        2.1.0
+Release:        1%{?dist}
 Summary:        Unicode library for OCaml
 
 # LGPL-2.1-or-later WITH OCaml-LGPL-linking-exception: the project as a whole
@@ -23,13 +23,14 @@ Source0:        %{url}/archive/v%{version}/Camomile-%{version}.tar.gz
 # accepted upstream: https://github.com/yoriyuki/Camomile/pull/84
 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
+BuildOption(build): -p camomile
+BuildOption(install): camomile
+BuildOption(check): -p camomile
+
 BuildRequires:  ocaml >= 4.13
 BuildRequires:  ocaml-camlp-streams-devel
-BuildRequires:  ocaml-dune >= 3.4
+BuildRequires:  ocaml-dune >= 3.23
 BuildRequires:  ocaml-dune-site-devel
 BuildRequires:  ocaml-stdlib-random-devel
 
@@ -73,16 +74,6 @@ applications that use %{name}.
 %autosetup -p1 -n Camomile-%{version}
 
 
-%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
-%ifarch %{power64}
-ulimit -Hs 65536
-ulimit -Ss 65536
-%endif
-
-
 %install -a
 # The data files are in their own package
 sed -i '\@%{_datadir}@d' .ofiles
@@ -103,6 +94,12 @@ sed -i '\@%{_datadir}@d' .ofiles
 
 
 %changelog
+* Thu Sep 17 2026 Jerry James <loganjerry@gmail.com> - 2.1.0-1
+- Version 2.1.0
+- Drop upstreamed dune 3.24 patch
+- Do not build the camomile-embedded package for now
+- ppc64le stack overflow fix is no longer needed
+
 * Tue Sep 15 2026 Richard W.M. Jones <rjones@redhat.com> - 2.0.0-25
 - Bump release and rebuild
 

diff --git a/sources b/sources
index 48dee35..32ae163 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (Camomile-2.0.0.tar.gz) = b0ae3d921f65390e8ec88a04901dd097b568db9f9ae70fb328e9d3ddb2dd8922b9a8e8da9ace91ad9cb5f6a1310ae5b6ba502e287d6c828f4d60622289316ac8
+SHA512 (Camomile-2.1.0.tar.gz) = fff70942e1866c5ad180a9de392a153809db7858f6d9f1067cd88db8b23b03643d09666abf09e6fae3d4da99f44570158b83170104cee68fdd5c1fc41b7c3e7b

^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2026-09-17 17:05 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-09-17 17:05 [rpms/ocaml-camomile] rawhide: Version 2.1.0 Jerry James

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox