New upstream version 2.3.2.

This commit is contained in:
Scott Tsai 2011-12-08 22:31:10 +08:00
parent 35e6ed069e
commit 6277ccd8b6
5 changed files with 30 additions and 26 deletions

1
.gitignore vendored
View File

@ -1,2 +1,3 @@
lwt-2.0.0+rc1.tar.gz
/lwt-2.2.0.tar.gz
/lwt-2.3.2.tar.gz

View File

@ -1,22 +0,0 @@
--- 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"

22
lwt-2.3.2-libev.patch Normal file
View File

@ -0,0 +1,22 @@
--- lwt-2.3.2.orig/discover.ml 2011-04-15 17:42:59.000000000 +0200
+++ lwt-2.3.2/discover.ml 2011-05-21 21:21:58.882050121 +0200
@@ -56,7 +56,7 @@
let libev_code = "
#include <caml/mlvalues.h>
-#include <ev.h>
+#include <libev/ev.h>
CAMLprim value lwt_test()
{
--- lwt-2.3.2.orig/src/unix/lwt_libev_stubs.c 2011-04-15 17:42:59.000000000 +0200
+++ lwt-2.3.2/src/unix/lwt_libev_stubs.c 2011-05-21 21:24:05.681330220 +0200
@@ -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"

View File

@ -2,8 +2,8 @@
%define debug_package %{nil}
Name: ocaml-lwt
Version: 2.2.0
Release: 2%{?dist}
Version: 2.3.2
Release: 0%{?dist}
Summary: OCaml lightweight thread library
Group: Development/Libraries
@ -15,7 +15,7 @@ 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
Patch0: lwt-2.3.2-libev.patch
BuildRequires: ocaml >= 3.10.0
BuildRequires: ocaml-findlib-devel
@ -101,6 +101,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
* Thu Dec 08 2011 Scott Tsai scottt.tw@gmail.com - 2.3.2-0
- New upstream version 2.3.2.
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.2.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild

View File

@ -1 +1 @@
4e0b28cbc5a2dfe60013c91a5d051969 lwt-2.2.0.tar.gz
d1b4a8c1ad320c8f7876a8bff157d2d3 lwt-2.3.2.tar.gz