diff --git a/ocaml-lwt.spec b/ocaml-lwt.spec index 7246991..9e7bb81 100644 --- a/ocaml-lwt.spec +++ b/ocaml-lwt.spec @@ -3,7 +3,7 @@ Name: ocaml-lwt Version: 2.4.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: OCaml lightweight thread library License: LGPLv2+ with exceptions @@ -19,9 +19,10 @@ BuildRequires: ocaml >= 3.10.0 BuildRequires: ocaml-findlib-devel BuildRequires: ocaml-ocamldoc BuildRequires: ocaml-camlp4-devel -BuildRequires: ocaml-ssl >= 0.4.0 -BuildRequires: ocaml-react >= 0.9.0 +BuildRequires: ocaml-ssl-devel >= 0.4.0 +BuildRequires: ocaml-react-devel >= 0.9.0 BuildRequires: chrpath +BuildRequires: glib2-devel BuildRequires: libev-devel @@ -50,6 +51,7 @@ iconv -f iso-8859-1 -t utf-8 < README.old > README %build +./configure --enable-ssl --enable-glib --enable-react --prefix=%{_prefix} make @@ -63,6 +65,11 @@ strip $OCAMLFIND_DESTDIR/stublibs/dll*.so chrpath --delete $OCAMLFIND_DESTDIR/stublibs/dll*.so +%check +# Check lwt.react support is enabled (RHBZ#1048367). +OCAMLPATH=$RPM_BUILD_ROOT%{_libdir}/ocaml ocamlfind query lwt.react + + %files %doc LICENSE COPYING %{_libdir}/ocaml/lwt @@ -87,6 +94,11 @@ chrpath --delete $OCAMLFIND_DESTDIR/stublibs/dll*.so %changelog +* Tue Feb 18 2014 Michel Salim - 2.4.2-3 +- Backport changes from F20's 2.4.2-4: +- Enable lwt.react support, and check it gets enabled (RHBZ#1048367). +- Enable SSL & glib integration (from Rawhide). + * Thu Feb 14 2013 Fedora Release Engineering - 2.4.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild