diff --git a/.gitignore b/.gitignore index c8fe938..7ce20e9 100644 --- a/.gitignore +++ b/.gitignore @@ -3,4 +3,3 @@ 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 a9be790..92ede94 100644 --- a/ocaml-lwt.spec +++ b/ocaml-lwt.spec @@ -1,16 +1,19 @@ -%global commit 75b1dc1aefae75dc4ac6455f5a2688b3a52adabd %global opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0) Name: ocaml-lwt -Version: 2.4.5 -Release: 1%{?dist} +Version: 2.4.3 +Release: 12%{?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/%{commit}/lwt-%{commit}.tar.gz +Source0: http://ocsigen.org/download/lwt-%{version}.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 @@ -39,7 +42,10 @@ developing applications that use %{name}. %prep -%setup -q -n lwt-%{commit} +%setup -q -n lwt-%{version} + +%patch1 +%patch2 -p1 mv README README.old iconv -f iso-8859-1 -t utf-8 < README.old > README @@ -93,10 +99,6 @@ OCAMLPATH=$RPM_BUILD_ROOT%{_libdir}/ocaml ocamlfind query lwt.react %changelog -* Mon Aug 18 2014 Scott Tsai 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. - * Mon Aug 18 2014 Scott Tsai - 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 ed910d5..86ae44e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -cc47518652ef6c498c0baf3112676726 lwt-75b1dc1aefae75dc4ac6455f5a2688b3a52adabd.tar.gz +4a4a22da7da4301c6282f361edd0c241 lwt-2.4.3.tar.gz