diff --git a/.gitignore b/.gitignore index b98a954..c1a4100 100644 --- a/.gitignore +++ b/.gitignore @@ -1,14 +1,2 @@ -*.src.rpm -lwt-2.0.0+rc1.tar.gz -/lwt-2.2.0.tar.gz -/lwt-2.3.2.tar.gz -/lwt-2.4.2.tar.gz -/lwt-2.4.3.tar.gz -/lwt-75b1dc1aefae75dc4ac6455f5a2688b3a52adabd.tar.gz -/lwt-2.5.0.tar.gz -/lwt-4.1.0.tar.gz -/lwt-4.2.1.tar.gz -/lwt-4.3.0.tar.gz -/lwt-4.3.1.tar.gz -/lwt-4.4.0.tar.gz -/lwt-5.1.2.tar.gz +/*.src.rpm +/lwt-*.tar.gz diff --git a/lwt-5.1.2-bytes.patch b/lwt-5.1.2-bytes.patch deleted file mode 100644 index 61a8b9e..0000000 --- a/lwt-5.1.2-bytes.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- src/unix/lwt_unix_stubs.c.old 2020-02-25 11:21:55.690509741 +0000 -+++ src/unix/lwt_unix_stubs.c 2020-02-25 11:22:16.500678309 +0000 -@@ -124,7 +124,7 @@ - CAMLprim value lwt_unix_blit_to_bytes(value val_buf1, value val_ofs1, - value val_buf2, value val_ofs2, - value val_len) { -- memcpy(String_val(val_buf2) + Long_val(val_ofs2), -+ memcpy(Bytes_val(val_buf2) + Long_val(val_ofs2), - (char *)Caml_ba_data_val(val_buf1) + Long_val(val_ofs1), - Long_val(val_len)); - return Val_unit; diff --git a/ocaml-lwt.spec b/ocaml-lwt.spec index 04193f5..be24831 100644 --- a/ocaml-lwt.spec +++ b/ocaml-lwt.spec @@ -1,6 +1,6 @@ Name: ocaml-lwt -Version: 5.1.2 -Release: 4%{?dist} +Version: 5.2.0 +Release: 1%{?dist} Summary: OCaml lightweight thread library # The openssl linking exception is granted. @@ -8,10 +8,6 @@ License: LGPLv2+ with exceptions URL: http://ocsigen.org/lwt Source0: https://github.com/ocsigen/lwt/archive/%{version}/lwt-%{version}.tar.gz -# Fix for OCaml 4.10. -# Sent upstream on 2020-02-25. -Patch1: lwt-5.1.2-bytes.patch - BuildRequires: ocaml >= 4.02.0 BuildRequires: ocaml-findlib @@ -30,9 +26,7 @@ BuildRequires: ocaml-ocplib-endian-devel BuildRequires: ocaml-react-devel # lwt_ppx dependencies. -BuildRequires: ocaml-migrate-parsetree-devel BuildRequires: ocaml-ppx-tools-versioned-devel >= 5.2.3 -BuildRequires: ocaml-ppx-derivers-devel #BuildRequires: chrpath BuildRequires: glib2-devel @@ -68,6 +62,7 @@ Summary: Development files for ocaml-lwt-react Requires: %{name}-react%{?_isa} = %{version}-%{release} Requires: %{name}-devel%{?_isa} = %{version}-%{release} +Requires: ocaml-bisect-ppx-devel %description react-devel The %{name}-react-devel package contains libraries and signature files for @@ -91,8 +86,7 @@ The %{name}-ppx-devel package contains libraries and signature files for developing applications that use %{name}-ppx. %prep -%setup -q -n lwt-%{version} -%patch1 -p0 +%autosetup -n lwt-%{version} # Enable libev and pthread. sed 's/-use-libev false/-use-libev true -use-pthread true/g' -i Makefile @@ -229,6 +223,12 @@ dune runtest --profile=release %changelog +* Thu Apr 16 2020 Jerry James - 5.2.0-1 +- New upstream version 5.2.0 +- Remove upstreamed lwt-5.1.2-bytes.patch +- Remove unneeded BRs +- Require ocaml-bisect-ppx-devel from ocaml-lwt-react-devel + * Fri Apr 03 2020 Richard W.M. Jones - 5.1.2-4 - Update all OCaml dependencies for RPM 4.16. diff --git a/sources b/sources index ce02243..69a69de 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lwt-5.1.2.tar.gz) = 94b1459e8d914fb505d5b340b0a1886f06255333bdc2a94a66bba53842ac0ca6828b75d5072d01a9cf4aa1331314cff8aea5a746b9af04f728ecc7d942c4343a +SHA512 (lwt-5.2.0.tar.gz) = 361019d128bd2924cfa3251a5d8929b0ba85fc519c4c987ab0e3e2023dfc06cf376146941546abd2c03b6999bce0abf0de342507c1ac9674c2915b3b6f280707