From 945f3d56e925aabf658be09f00946ce72ef78c63 Mon Sep 17 00:00:00 2001
From: Scott Tsai <scottt.tw@gmail.com>
Date: Tue, 19 Aug 2014 22:17:33 +0800
Subject: [PATCH] Try upstream release 2.4.5 again

- New upstream version 2.4.5 (tarball created from tag through github
  https://github.com/ocsigen/lwt/tags)
- Remove patches which are now upstream.
- Disable ocaml-react support since it breaks the build
  (https://github.com/ocsigen/lwt/issues/77)
- Remove manual.pdf for now since tarballs from git tags don't include
  the pre-built documentation
---
 .gitignore     |  1 +
 ocaml-lwt.spec | 32 ++++++++++++++++----------------
 sources        |  2 +-
 3 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/.gitignore b/.gitignore
index 7ce20e9..c8fe938 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ lwt-2.0.0+rc1.tar.gz
 /lwt-2.3.2.tar.gz
 /lwt-2.4.2.tar.gz
 /lwt-2.4.3.tar.gz
+/lwt-75b1dc1aefae75dc4ac6455f5a2688b3a52adabd.tar.gz
diff --git a/ocaml-lwt.spec b/ocaml-lwt.spec
index 92ede94..e2b9c9d 100644
--- a/ocaml-lwt.spec
+++ b/ocaml-lwt.spec
@@ -1,26 +1,23 @@
+%global commit 75b1dc1aefae75dc4ac6455f5a2688b3a52adabd
 %global opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0)
 
 Name:           ocaml-lwt
-Version:        2.4.3
-Release:        12%{?dist}
+Version:        2.4.5
+Release:        1%{?dist}
 Summary:        OCaml lightweight thread library
 
 # The openssl linking exception is granted.
 License:        LGPLv2+ with exceptions
 URL:            http://ocsigen.org/lwt
-Source0:        http://ocsigen.org/download/lwt-%{version}.tar.gz
+Source0:        https://github.com/ocsigen/lwt/archive/%{commit}/lwt-%{commit}.tar.gz
 
-# Adapt to changes in OCaml 4.01.0
-Patch1:         lwt-2.4.3-ocaml41.patch
-# https://github.com/ocaml/camlp4/issues/19
-Patch2:         lwt-fix-ocaml-camlp4-19.patch
 
 BuildRequires:  ocaml >= 3.10.0
 BuildRequires:  ocaml-findlib-devel
 BuildRequires:  ocaml-ocamldoc
 BuildRequires:  ocaml-camlp4-devel
 BuildRequires:  ocaml-ssl-devel >= 0.4.0
-BuildRequires:  ocaml-react-devel >= 0.9.0
+# BuildRequires:  ocaml-react-devel >= 0.9.0
 BuildRequires:  chrpath
 BuildRequires:  glib2-devel
 BuildRequires:  libev-devel
@@ -42,10 +39,7 @@ developing applications that use %{name}.
 
 
 %prep
-%setup -q -n lwt-%{version}
-
-%patch1
-%patch2 -p1
+%setup -q -n lwt-%{commit}
 
 mv README README.old
 iconv -f iso-8859-1 -t utf-8 < README.old > README
@@ -53,7 +47,7 @@ touch -r README.old README
 
 
 %build
-./configure --enable-ssl --enable-glib --enable-react --prefix=%{_prefix}
+./configure --enable-ssl --enable-glib --disable-react --prefix=%{_prefix}
 make
 
 
@@ -67,12 +61,12 @@ chrpath --delete $OCAMLFIND_DESTDIR/stublibs/dll*.so
 
 
 %check
-./configure --enable-ssl --enable-glib --enable-react --enable-tests \
+./configure --enable-ssl --enable-glib --disable-react --enable-tests \
   --prefix=%{_prefix}
 make test
 
 # Check lwt.react support is enabled (RHBZ#1048367).
-OCAMLPATH=$RPM_BUILD_ROOT%{_libdir}/ocaml ocamlfind query lwt.react
+# OCAMLPATH=$RPM_BUILD_ROOT%{_libdir}/ocaml ocamlfind query lwt.react
 
 
 %files
@@ -89,7 +83,7 @@ OCAMLPATH=$RPM_BUILD_ROOT%{_libdir}/ocaml ocamlfind query lwt.react
 
 
 %files devel
-%doc CHANGES CHANGES.darcs README manual/manual.pdf
+%doc CHANGES README
 %if %opt
 %{_libdir}/ocaml/lwt/*.a
 %{_libdir}/ocaml/lwt/*.cmxa
@@ -99,6 +93,12 @@ OCAMLPATH=$RPM_BUILD_ROOT%{_libdir}/ocaml ocamlfind query lwt.react
 
 
 %changelog
+* Mon Aug 18 2014 Scott Tsai <scottt.tw@gmail.com> 2.4.5-1
+- New upstream version 2.4.5 (tarball created from tag through github https://github.com/ocsigen/lwt/tags)
+- Remove patches which are now upstream.
+- Disable ocaml-react support since it breaks the build (https://github.com/ocsigen/lwt/issues/77)
+- Remove manual.pdf for now since tarballs from git tags don't include the pre-built documentation
+
 * Mon Aug 18 2014 Scott Tsai <scottt.tw@gmail.com> - 2.4.3-12
 - Add lwt-fix-ocaml-camlp4-19.patch to fix OCaml 4.02+ build failure
 - Rebuild for ocaml-4.02.0-0.8.git10e45753.fc22.
diff --git a/sources b/sources
index 86ae44e..ed910d5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4a4a22da7da4301c6282f361edd0c241  lwt-2.4.3.tar.gz
+cc47518652ef6c498c0baf3112676726  lwt-75b1dc1aefae75dc4ac6455f5a2688b3a52adabd.tar.gz