From fe713f3e6742dc0b873e2d24ddb7b34a85a888aa Mon Sep 17 00:00:00 2001 From: Jerry James Date: Tue, 12 May 2020 10:14:00 -0600 Subject: [PATCH] New upstream version 0.5.3 (bz 1834874) --- .gitignore | 5 +-- ...74b8454332872d28b3d478e3e81c45ee1366.patch | 32 ------------------- ocaml-gen.spec | 13 ++++---- sources | 2 +- 4 files changed, 8 insertions(+), 44 deletions(-) delete mode 100644 f22b74b8454332872d28b3d478e3e81c45ee1366.patch diff --git a/.gitignore b/.gitignore index 7b1a4d5..64fb214 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1 @@ -/ocaml-gen-0.4.0.1.tar.gz -/ocaml-gen-0.5.tar.gz -/ocaml-gen-0.5.1.tar.gz -/ocaml-gen-0.5.2.tar.gz +/ocaml-gen-*.tar.gz diff --git a/f22b74b8454332872d28b3d478e3e81c45ee1366.patch b/f22b74b8454332872d28b3d478e3e81c45ee1366.patch deleted file mode 100644 index 2e24b56..0000000 --- a/f22b74b8454332872d28b3d478e3e81c45ee1366.patch +++ /dev/null @@ -1,32 +0,0 @@ -From f22b74b8454332872d28b3d478e3e81c45ee1366 Mon Sep 17 00:00:00 2001 -From: Simon Cruanes -Date: Wed, 15 Apr 2020 09:56:23 -0400 -Subject: [PATCH] fix: reorder optional args to make -nolabel cleaner - -see https://github.com/ocaml/ocaml/pull/9411#issuecomment-613879362 ---- - src/gen.ml | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/gen.ml b/src/gen.ml -index fbf6b0f..2540fd6 100644 ---- a/src/gen.ml -+++ b/src/gen.ml -@@ -1902,7 +1902,7 @@ module Restart = struct - match !cached with - | Some mlist -> GenMList.to_gen mlist - | None -> -- let mlist = GenMList.of_gen_lazy ?caching ?max_chunk_size g in -+ let mlist = GenMList.of_gen_lazy ?max_chunk_size ?caching g in - cached := Some mlist; - GenMList.to_gen mlist - end -@@ -1936,7 +1936,7 @@ let persistent gen = - *) - - let persistent_lazy ?caching ?max_chunk_size gen = -- let l = GenMList.of_gen_lazy ?caching ?max_chunk_size gen in -+ let l = GenMList.of_gen_lazy ?max_chunk_size ?caching gen in - fun () -> GenMList.to_gen l - - (*$T diff --git a/ocaml-gen.spec b/ocaml-gen.spec index 2c9f9a9..2bdacc2 100644 --- a/ocaml-gen.spec +++ b/ocaml-gen.spec @@ -1,18 +1,14 @@ Name: ocaml-gen -Version: 0.5.2 -Release: 11%{?dist} +Version: 0.5.3 +Release: 1%{?dist} Summary: Simple, efficient iterators for OCaml License: BSD URL: https://github.com/c-cube/gen Source0: https://github.com/c-cube/gen/archive/%{version}/%{name}-%{version}.tar.gz -# Upstream patch to fix OCaml 4.11. -# https://github.com/c-cube/gen/commit/f22b74b8454332872d28b3d478e3e81c45ee1366 -Patch1: f22b74b8454332872d28b3d478e3e81c45ee1366.patch - BuildRequires: ocaml -BuildRequires: ocaml-dune +BuildRequires: ocaml-dune-devel BuildRequires: ocaml-odoc BuildRequires: ocaml-ounit-devel BuildRequires: ocaml-qcheck-devel @@ -103,6 +99,9 @@ dune runtest -p gen --no-buffer %changelog +* Tue May 12 2020 Jerry James - 0.5.3-1 +- New upstream version 0.5.3 (bz 1834874) + * Tue May 05 2020 Richard W.M. Jones - 0.5.2-11 - OCaml 4.11.0+dev2-2020-04-22 rebuild diff --git a/sources b/sources index f1c24e1..a65862e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ocaml-gen-0.5.2.tar.gz) = c84e5ea0c9b3a678b6a5c935eacf91265a79b68a48375c44aa5f159d4cb02283c1be0786e172a153666c670bc7ee37b931004b8747a99e5f4ab90ca63e097ff5 +SHA512 (ocaml-gen-0.5.3.tar.gz) = 192178de106d2ae5f936caead8b21b4b9ec1b8fe35ba56296825900ea15a4ea702caf8824ac34d4478d107b954e22c3dffd81f12d4c08fbd6d9760f49a0deb14