From 46ea019c0c10ccf5b6d576726ab70d3d2d7e3151 Mon Sep 17 00:00:00 2001
From: Ben Rosser <rosser.bjr@gmail.com>
Date: Sep 27 2018 21:29:22 +0000
Subject: Update ocaml-lwt to 4.1.0, the latest release.


---

diff --git a/.gitignore b/.gitignore
index 432e9ca..072e034 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ lwt-2.0.0+rc1.tar.gz
 /lwt-2.4.3.tar.gz
 /lwt-75b1dc1aefae75dc4ac6455f5a2688b3a52adabd.tar.gz
 /lwt-2.5.0.tar.gz
+/lwt-4.1.0.tar.gz
diff --git a/ocaml-lwt.spec b/ocaml-lwt.spec
index 6e8ddd9..33977e1 100644
--- a/ocaml-lwt.spec
+++ b/ocaml-lwt.spec
@@ -1,36 +1,28 @@
-# NB: We are stuck on an old version of LWT because we require various
-# packages to be added to Fedora to support the new version.  They are:
-#   - jbuilder (DONE)
-#   - ocaml-result (DONE)
-#   - bisect_ppx
-#   - ocaml-migrate-parsetree
-#   - ppx_tools_versioned
-# Please DO NOT move to a new version until you have added all of the
-# above to Fedora.
-
 Name:           ocaml-lwt
-Version:        2.5.0
-Release:        21%{?dist}
+Version:        4.1.0
+Release:        1%{?dist}
 Summary:        OCaml lightweight thread library
 
 # The openssl linking exception is granted.
 License:        LGPLv2+ with exceptions
 URL:            http://ocsigen.org/lwt
-Source0:        https://github.com/ocsigen/lwt/archive/2.5.0/lwt-2.5.0.tar.gz
-
-# Change some deprecated functions for OCaml 4.5.0.
-Patch1:         lwt-2.5.0-ocaml45.patch
-
-# Safe strings for OCaml 4.06.
-Patch2:         lwt-safe-strings.patch
+Source0:        https://github.com/ocsigen/lwt/archive/%{version}/lwt-%{version}.tar.gz
 
-BuildRequires:  ocaml >= 3.10.0
+BuildRequires:  ocaml >= 4.02.0
 BuildRequires:  ocaml-ocamlbuild
 BuildRequires:  ocaml-findlib-devel
-BuildRequires:  ocaml-ocamldoc
-BuildRequires:  ocaml-camlp4-devel
-BuildRequires:  ocaml-ssl-devel >= 0.5.1
-BuildRequires:  ocaml-react-devel >= 1.0.0
+
+BuildRequires:  jbuilder
+BuildRequires:  ocaml-cppo
+BuildRequires:  ocaml-result-devel
+
+# lwt_react dependencies.
+BuildRequires:  ocaml-react-devel
+
+# lwt_ppx dependencies.
+BuildRequires:  ocaml-migrate-parsetree-devel
+BuildRequires:  ocaml-ppx-tools-versioned-devel
+
 BuildRequires:  chrpath
 BuildRequires:  glib2-devel
 BuildRequires:  libev-devel
@@ -40,75 +32,72 @@ BuildRequires:  libev-devel
 Lwt is a lightweight thread library for Objective Caml.  This library
 is part of the Ocsigen project.
 
-
 %package        devel
 Summary:        Development files for %{name}
 Requires:       %{name}%{?_isa} = %{version}-%{release}
 
-
 %description    devel
 The %{name}-devel package contains libraries and signature files for
 developing applications that use %{name}.
 
-
 %prep
 %setup -q -n lwt-%{version}
-%autopatch -p1
 
+# Enable libev and pthread.
+sed 's/-use-libev false/-use-libev true -use-pthread true/g' -i Makefile
+
+# Remove '-dev' from the jbuilder command line.
+# This stops 'ambiguous documentation comment' from being a fatal error.
+sed 's/build --dev/build/g' -i Makefile
+sed 's/runtest --dev/runtest/g' -i Makefile
+
+# It looks like one test fails.
+sed 's,test_mcast "mcast-join-loop" true true;,(*test_mcast "mcast-join-loop" true true;*),' -i test/unix/test_mcast.ml
 
 %build
-./configure \
-    --enable-ssl --enable-glib --enable-react \
-    --enable-camlp4 \
-    --prefix=%{_prefix}
 make
 
-
 %install
 export DESTDIR=$RPM_BUILD_ROOT
 export OCAMLFIND_DESTDIR=$RPM_BUILD_ROOT%{_libdir}/ocaml
 mkdir -p $OCAMLFIND_DESTDIR $OCAMLFIND_DESTDIR/stublibs
-make install
+jbuilder install --prefix %{buildroot}%{_prefix}
 
 chrpath --delete $OCAMLFIND_DESTDIR/stublibs/dll*.so
 
+# Remove spurious jbuilder-installed documentation.
+rm -rf %{buildroot}/%{_prefix}/doc
 
 %check
-%ifarch %{ocaml_native_compiler}
-./configure --enable-ssl --enable-glib --enable-react --enable-tests \
-  --prefix=%{_prefix}
-# Some tests fail, unclear why.  Make the tests advisory for now.
-make test ||:
-%endif
-
-# Check lwt.react support is enabled (RHBZ#1048367).
-OCAMLPATH=$RPM_BUILD_ROOT%{_libdir}/ocaml ocamlfind query lwt.react
-
+make test
 
 %files
-%doc LICENSE COPYING
-%{_libdir}/ocaml/lwt
+%doc CHANGES README.md
+%license LICENSE.md
+%{_libdir}/ocaml/lwt*
 %ifarch %{ocaml_native_compiler}
-%exclude %{_libdir}/ocaml/lwt/*.a
-%exclude %{_libdir}/ocaml/lwt/*.cmxa
-#%exclude %{_libdir}/ocaml/lwt/*.cmx
+%exclude %{_libdir}/ocaml/lwt*/*.a
+%exclude %{_libdir}/ocaml/lwt*/*.cmxa
+%exclude %{_libdir}/ocaml/lwt*/*.cmx
 %endif
-%exclude %{_libdir}/ocaml/lwt/*.mli
+%exclude %{_libdir}/ocaml/lwt*/*.mli
 %{_libdir}/ocaml/stublibs/*.so
-%{_libdir}/ocaml/stublibs/*.so.owner
-
 
 %files devel
 %doc CHANGES README.md
 %ifarch %{ocaml_native_compiler}
-%{_libdir}/ocaml/lwt/*.a
-%{_libdir}/ocaml/lwt/*.cmxa
-#%{_libdir}/ocaml/lwt/*.cmx
+%{_libdir}/ocaml/lwt*/*.a
+%{_libdir}/ocaml/lwt*/*.cmxa
+%{_libdir}/ocaml/lwt*/*.cmx
 %endif
-%{_libdir}/ocaml/lwt/*.mli
+%{_libdir}/ocaml/lwt*/*.mli
 
 
 %changelog
+* Thu Sep 27 2018 Ben Rosser <rosser.bjr@gmail.com> - 4.1.0-1
+- Updated to 4.1.0, using jbuilder/dune as buildsystem. (rhbz#1289549).
+- lwt_react and lwt_ppx are now separate opam packages, built from this tarball.
+
 * Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.5.0-21
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
 
diff --git a/sources b/sources
index e6ae17f..fc23aa7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e241e57b48b50f5696e74fdbcced1d19  lwt-2.5.0.tar.gz
+SHA512 (lwt-4.1.0.tar.gz) = 28bc51e75d5e4c74171f17aaba86fdefad70f57f9f2023680044d5bf65250d8531501adc85d0422e644c1e318dcee0a4d53f7841c82d9dca9854e8fbb09987f2