[ocaml-sexplib] Patch for OCaml 4.00.0 official.

[Richard W.M. Jones]

commit 8c88dae32f29df38c597c8d269128855d2dd6458
Author: Richard W.M. Jones <rjones at redhat.com>
Date:   Mon Jul 30 11:40:32 2012 +0100

    Patch for OCaml 4.00.0 official.

 ocaml-sexplib.spec                          |   10 +++++++++-
 sexplib-7.0.5-patch-ocamlbuild-ocaml4.patch |   27 +++++++++++++++++++++++++++
 2 files changed, 36 insertions(+), 1 deletions(-)
---
diff --git a/ocaml-sexplib.spec b/ocaml-sexplib.spec
index 07c0474..a123487 100644
--- a/ocaml-sexplib.spec
+++ b/ocaml-sexplib.spec
@@ -5,7 +5,7 @@
 
 Name:           ocaml-sexplib
 Version:        7.0.5
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        OCaml library for converting OCaml values to S-expressions
 
 Group:          Development/Libraries
@@ -15,6 +15,9 @@ Source0:        http://forge.ocamlcore.org/frs/download.php/%{dlnode}/sexplib-%{
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 ExcludeArch:    sparc64 s390 s390x
 
+# Fix ocamlbuild for ocaml 4.00.0.
+Patch1:         sexplib-7.0.5-patch-ocamlbuild-ocaml4.patch
+
 BuildRequires:  ocaml >= 3.12.0
 BuildRequires:  ocaml-findlib-devel
 BuildRequires:  ocaml-ocamldoc
@@ -65,6 +68,8 @@ ocaml setup.ml -configure --prefix %{_prefix} \
       --sharedstatedir %{_sharedstatedir} \
       --destdir $RPM_BUILD_ROOT
 
+%patch1 -p1
+
 
 %build
 ocaml setup.ml -build
@@ -110,6 +115,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Jul 30 2012 Richard W.M. Jones <rjones at redhat.com> - 7.0.5-3
+- Patch for OCaml 4.00.0 official.
+
 * Fri Jul 20 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 7.0.5-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 
diff --git a/sexplib-7.0.5-patch-ocamlbuild-ocaml4.patch b/sexplib-7.0.5-patch-ocamlbuild-ocaml4.patch
new file mode 100644
index 0000000..496be6d
--- /dev/null
+++ b/sexplib-7.0.5-patch-ocamlbuild-ocaml4.patch
@@ -0,0 +1,27 @@
+--- sexplib-7.0.5.old/myocamlbuild.ml	2012-03-20 16:41:54.000000000 +0000
++++ sexplib-7.0.5/myocamlbuild.ml	2012-07-30 11:38:21.829869635 +0100
+@@ -438,7 +438,13 @@
+                    BaseEnvLight.var_choose cond_specs env
+                  in
+                    flag tags & spec)
+-              t.flags
++              t.flags;
++
++            flag ["ocaml"; "compile"; "byte"; "use_toploop"] (S[A"-I"; A"+compiler-libs"]);
++            flag ["ocaml"; "link"; "byte"; "use_toploop"] (S[A"-I"; A"+compiler-libs"; A"+compiler-libs/ocamltoplevel.cma"]);
++            flag ["ocaml"; "compile"; "native"; "use_toploop"] (S[A"-I"; A"+compiler-libs"]);
++            flag ["ocaml"; "link"; "native"; "use_toploop"] (S[A"-I"; A"+compiler-libs"; A"+compiler-libs/ocamltoplevel.cmxa"]);
++
+         | _ -> 
+             ()
+   
+--- sexplib-7.0.5.old/_tags	2012-03-20 16:41:54.000000000 +0000
++++ sexplib-7.0.5/_tags	2012-07-30 11:37:01.749255839 +0100
+@@ -49,6 +49,7 @@
+ <lib_test/*.ml{,i}>: pkg_camlp4.extend
+ # Library sexplib_top
+ "top": include
++<top/*.ml{,i}>: use_toploop
+ # Executable sexp_test
+ "lib_test/sexp_test.byte": use_sexplib
+ "lib_test/sexp_test.byte": pkg_unix