commit f9ddd569487a8a66515da54a00fbf108c3d4d95b
Author: Richard W.M. Jones <rjones@xxxxxxxxxx>
Date: Thu Jan 6 17:13:20 2011 +0000
New upstream version 2.2.0.
.gitignore | 1 +
lwt-2.2.0-libev.patch | 22 ++++++++++++++++++++++
ocaml-lwt.spec | 29 ++++++++++++++++++++++-------
sources | 2 +-
4 files changed, 46 insertions(+), 8 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 9eb40b5..c9980a6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
lwt-2.0.0+rc1.tar.gz
+/lwt-2.2.0.tar.gz
diff --git a/lwt-2.2.0-libev.patch b/lwt-2.2.0-libev.patch
new file mode 100644
index 0000000..6d579f3
--- /dev/null
+++ b/lwt-2.2.0-libev.patch
@@ -0,0 +1,22 @@
+--- lwt-2.2.0/src/unix/lwt_unix.h 2010-12-13 14:37:37.000000000 +0000
++++ lwt-2.2.0.libev/src/unix/lwt_unix.h 2011-01-06 17:20:17.232473784 +0000
+@@ -25,7 +25,7 @@
+
+ #include <caml/mlvalues.h>
+ #include <caml/unixsupport.h>
+-#include <ev.h>
++#include <libev/ev.h>
+ #include <pthread.h>
+
+ /* Detect the target OS */
+--- lwt-2.2.0/src/unix/lwt_libev_stubs.c 2010-12-13 14:37:37.000000000 +0000
++++ lwt-2.2.0.libev/src/unix/lwt_libev_stubs.c 2011-01-06 17:20:35.703833869 +0000
+@@ -29,7 +29,7 @@
+ #include <caml/signals.h>
+ #include <caml/custom.h>
+ #include <caml/callback.h>
+-#include <ev.h>
++#include <libev/ev.h>
+
+ #include "lwt_unix.h"
+
diff --git a/ocaml-lwt.spec b/ocaml-lwt.spec
index afe99ae..e80d052 100644
--- a/ocaml-lwt.spec
+++ b/ocaml-lwt.spec
@@ -2,17 +2,21 @@
%define debug_package %{nil}
Name: ocaml-lwt
-Version: 2.0.0
-Release: 0.3.rc1%{?dist}
+Version: 2.2.0
+Release: 1%{?dist}
Summary: OCaml lightweight thread library
Group: Development/Libraries
License: LGPLv2+ with exceptions
URL: http://ocsigen.org/lwt
-Source0: http://ocsigen.org/download/lwt-%{version}+rc1.tar.gz
+Source0: http://ocsigen.org/download/lwt-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
ExcludeArch: sparc64 s390 s390x
+# Location of libev headers on Fedora is in /usr/include/libev/ev.h
+# so we need to patch the source accordingly.
+Patch0: lwt-2.2.0-libev.patch
+
BuildRequires: ocaml >= 3.10.0
BuildRequires: ocaml-findlib-devel
BuildRequires: ocaml-ocamldoc
@@ -20,6 +24,7 @@ BuildRequires: ocaml-camlp4-devel
BuildRequires: ocaml-ssl >= 0.4.0
BuildRequires: ocaml-react >= 0.9.0
BuildRequires: chrpath
+BuildRequires: libev-devel
%define _use_internal_dependency_generator 0
%define __find_requires /usr/lib/rpm/ocaml-find-requires.sh
@@ -43,7 +48,9 @@ developing applications that use %{name}.
%prep
-%setup -q -n lwt-%{version}+rc1
+%setup -q -n lwt-%{version}
+
+%patch0 -p1
mv README README.old
iconv -f iso-8859-1 -t utf-8 < README.old > README
@@ -75,7 +82,7 @@ rm -rf $RPM_BUILD_ROOT
%if %opt
%exclude %{_libdir}/ocaml/lwt/*.a
%exclude %{_libdir}/ocaml/lwt/*.cmxa
-%exclude %{_libdir}/ocaml/lwt/*.cmx
+#%exclude %{_libdir}/ocaml/lwt/*.cmx
%endif
%exclude %{_libdir}/ocaml/lwt/*.mli
%{_libdir}/ocaml/stublibs/*.so
@@ -84,16 +91,24 @@ rm -rf $RPM_BUILD_ROOT
%files devel
%defattr(-,root,root,-)
-%doc LICENSE COPYING CHANGES CHANGES.darcs README VERSION
+%doc LICENSE COPYING CHANGES CHANGES.darcs README
%if %opt
%{_libdir}/ocaml/lwt/*.a
%{_libdir}/ocaml/lwt/*.cmxa
-%{_libdir}/ocaml/lwt/*.cmx
+#%{_libdir}/ocaml/lwt/*.cmx
%endif
%{_libdir}/ocaml/lwt/*.mli
%changelog
+* Thu Jan 6 2011 Richard W.M. Jones <rjones@xxxxxxxxxx> - 2.2.0-1
+- New upstream version 2.2.0.
+- Rebuild for OCaml 3.12.0.
+- Add BR libev-devel.
+- Patch <ev.h> -> <libev/ev.h>
+- *.cmx files are no longer being distributed.
+- No VERSION file.
+
* Wed Dec 30 2009 Richard W.M. Jones <rjones@xxxxxxxxxx> - 2.0.0-0.3.rc1
- Rebuild for OCaml 3.11.2.
diff --git a/sources b/sources
index 2a9b080..6fc499b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-da266196ee3a1245eed3cf5df09f9ce1 lwt-2.0.0+rc1.tar.gz
+4e0b28cbc5a2dfe60013c91a5d051969 lwt-2.2.0.tar.gz
_______________________________________________
ocaml-devel mailing list
ocaml-devel@xxxxxxxxxxxxxxxxxxxxxxx
https://admin.fedoraproject.org/mailman/listinfo/ocaml-devel
