[ocaml-bisect] Patch for "Error: The constructor Ast.CrMth expects 6 argument(s), [etc]

[Richard W.M. Jones]

commit 49b2dd83589c17d5faa6ecfd1c15cf8244a22b2a
Author: Richard W.M. Jones <rjones at redhat.com>
Date:   Thu Jan 6 16:39:25 2011 +0000

    Patch for "Error: The constructor Ast.CrMth expects 6 argument(s), [etc]

 bisect-1.0-Ast.patch |   13 +++++++++++++
 ocaml-bisect.spec    |    7 +++++--
 2 files changed, 18 insertions(+), 2 deletions(-)
---
diff --git a/bisect-1.0-Ast.patch b/bisect-1.0-Ast.patch
new file mode 100644
index 0000000..91df82d
--- /dev/null
+++ b/bisect-1.0-Ast.patch
@@ -0,0 +1,13 @@
+--- bisect-1.0.old/src/instrument.ml	2009-12-17 18:31:36.000000000 +0000
++++ bisect-1.0/src/instrument.ml	2011-01-06 16:37:33.558696380 +0000
+@@ -149,8 +149,8 @@
+     method class_str_item csi =
+       match super#class_str_item csi with
+       | Ast.CrIni (loc, e) -> Ast.CrIni (loc, (wrap_expr Common.Class_init e))
+-      | Ast.CrMth (loc, id, priv, e, ct) -> Ast.CrMth (loc, id, priv, (wrap_expr Common.Class_meth e), ct)
+-      | Ast.CrVal (loc, id, mut, e) -> Ast.CrVal (loc, id, mut, (wrap_expr Common.Class_val e))
++      | Ast.CrMth (loc, id, override, priv, e, ct) -> Ast.CrMth (loc, id, override, priv, (wrap_expr Common.Class_meth e), ct)
++      | Ast.CrVal (loc, id, override, mut, e) -> Ast.CrVal (loc, id, override, mut, (wrap_expr Common.Class_val e))
+       | x -> x
+     method expr e =
+       let e' = super#expr e in
diff --git a/ocaml-bisect.spec b/ocaml-bisect.spec
index 7eafbed..8f44f9a 100644
--- a/ocaml-bisect.spec
+++ b/ocaml-bisect.spec
@@ -3,7 +3,7 @@
 
 Name:           ocaml-bisect
 Version:        1.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        OCaml code coverage tool
 
 Group:          Development/Libraries
@@ -15,6 +15,7 @@ URL:            http://bisect.x9c.fr/
 Source0:        http://bisect.x9c.fr/distrib/bisect-%{version}.tar.gz
 
 Patch0:         bisect-1.0-thread.patch
+Patch1:         bisect-1.0-Ast.patch
 
 BuildRequires:  ocaml >= 3.10.0
 BuildRequires:  ocaml-findlib-devel
@@ -46,6 +47,7 @@ developing applications that use %{name}.
 %prep
 %setup -q -n bisect-%{version}
 %patch0 -p1
+%patch1 -p1
 
 
 %build
@@ -98,8 +100,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Thu Jan 06 2011 Richard W.M. Jones <rjones at redhat.com> - 1.0-2
+* Thu Jan 06 2011 Richard W.M. Jones <rjones at redhat.com> - 1.0-3
 - Rebuild for OCaml 3.12 (http://fedoraproject.org/wiki/Features/OCaml3.12).
+- Patch for "Error: The constructor Ast.CrMth expects 6 argument(s), [etc]"
 
 * Tue Jan  5 2010 Richard W.M. Jones <rjones at redhat.com> - 1.0-1
 - Update to non-alpha 1.0 (requested by upstream author).