[ocaml-extlib] Fix for OCaml 4.00.0.
Richard W.M. Jones
rjones at fedoraproject.org
Thu Jun 7 18:51:49 UTC 2012
commit d4e2eaa99d67a323555e3b61188fba473431d80d
Author: Richard W.M. Jones <rjones at redhat.com>
Date: Thu Jun 7 19:51:01 2012 +0100
Fix for OCaml 4.00.0.
extlib-1.5.2-ocaml-4.patch | 11 +++++++++++
ocaml-extlib.spec | 10 ++++++++--
2 files changed, 19 insertions(+), 2 deletions(-)
---
diff --git a/extlib-1.5.2-ocaml-4.patch b/extlib-1.5.2-ocaml-4.patch
new file mode 100644
index 0000000..2e0b9c1
--- /dev/null
+++ b/extlib-1.5.2-ocaml-4.patch
@@ -0,0 +1,11 @@
+--- extlib-1.5.2.old/extHashtbl.mli 2012-06-07 19:48:01.369156609 +0100
++++ extlib-1.5.2/extHashtbl.mli 2012-06-07 19:49:09.450474821 +0100
+@@ -73,7 +73,7 @@
+ functions. (note : functor support removed to avoid code
+ duplication). *)
+
+- val create : int -> ('a, 'b) t
++ val create : ?random:bool -> int -> ('a, 'b) t
+ val clear : ('a, 'b) t -> unit
+ val add : ('a, 'b) t -> 'a -> 'b -> unit
+ val copy : ('a, 'b) t -> ('a, 'b) t
diff --git a/ocaml-extlib.spec b/ocaml-extlib.spec
index 0a4a3c6..a086f5e 100644
--- a/ocaml-extlib.spec
+++ b/ocaml-extlib.spec
@@ -3,7 +3,7 @@
Name: ocaml-extlib
Version: 1.5.2
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: OCaml ExtLib additions to the standard library
Group: Development/Libraries
@@ -14,8 +14,10 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
ExcludeArch: sparc64 s390 s390x
Patch0: extlib-install.patch
+# Patch for OCaml 4.00.0 which added an extra optional arg to Hashtbl.create.
+Patch1: extlib-1.5.2-ocaml-4.patch
-BuildRequires: ocaml >= 3.10.1
+BuildRequires: ocaml >= 4.00.0
BuildRequires: ocaml-findlib-devel, ocaml-ocamldoc
BuildRequires: gawk
@@ -56,6 +58,7 @@ for f in *.ml *.mli README.txt LICENSE; do \
done
%patch0 -p1
+%patch1 -p1
%build
@@ -113,6 +116,9 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/ocaml/extlib/*.ml
%changelog
+* Thu Jun 7 2012 Richard W.M. Jones <rjones at redhat.com> - 1.5.2-2
+- Fix for OCaml 4.00.0.
+
* Fri Jan 6 2012 Richard W.M. Jones <rjones at redhat.com> - 1.5.2-1
- New upstream version 1.5.2.
More information about the scm-commits
mailing list