[cduce/f21] Attempt to fix build for OCaml 4.01.

[Richard W.M. Jones]

commit 9407d340eb70a79b36a6265b69a75be76b58a155
Author: Richard W.M. Jones <rjones at redhat.com>
Date:   Mon Nov 3 13:27:26 2014 +0000

    Attempt to fix build for OCaml 4.01.

 cduce-0.6.0-loc-smart_merge.patch |   10 ++++++++++
 cduce.spec                        |    6 ++++++
 2 files changed, 16 insertions(+), 0 deletions(-)
---
diff --git a/cduce-0.6.0-loc-smart_merge.patch b/cduce-0.6.0-loc-smart_merge.patch
new file mode 100644
index 0000000..b54d86c
--- /dev/null
+++ b/cduce-0.6.0-loc-smart_merge.patch
@@ -0,0 +1,10 @@
+--- cduce-0.6.0.old/parser/ulexer.ml	2014-03-05 13:49:17.000000000 +0000
++++ cduce-0.6.0.new/parser/ulexer.ml	2014-11-03 13:25:41.137654318 +0000
+@@ -14,6 +14,7 @@
+   let to_tuple _ = assert false
+ 
+   let merge (x1, x2) (y1, y2) = (min x1 y1, max x2 y2)
++  let smart_merge x y = assert false
+   let join (x1, _) = (x1, x1)
+   let move _ _ _ = assert false
+   let shift _ _ = assert false
diff --git a/cduce.spec b/cduce.spec
index 35eaa0b..4bde4f7 100644
--- a/cduce.spec
+++ b/cduce.spec
@@ -39,6 +39,9 @@ Patch0009:      0009-Re-enable-parallel-build-of-the-project-make-j-works.patch
 Patch0010:      0010-Edit-CHANGES-and-VERSION-files.patch
 Patch0011:      0011-Sync-with-ocaml-4.02-trunk-changes-in-parser-locatio.patch
 
+# camlp4 on Fedora 21 has a field Loc.smart_merge.
+Patch0099:      cduce-0.6.0-loc-smart_merge.patch
+
 ExcludeArch:    ppc64 s390 s390x sparc64
 
 BuildRequires:  ocaml = %{ocaml_major}.%{ocaml_minor}
@@ -109,6 +112,8 @@ incorporates CDuce extensions for working with XML documents.
 %patch0010 -p1
 %patch0011 -p1
 
+%patch0099 -p1
+
 ./configure --prefix=%{_prefix} \
   --bindir=%{_bindir} \
   --mandir=%{_mandir} \
@@ -191,6 +196,7 @@ popd
 %changelog
 * Mon Nov  3 2014 Richard W.M. Jones <rjones at redhat.com> - 0.6.0-9
 - Rebase to cduce 0.6.0-9 (from Rawhide).
+- Attempt to fix build for OCaml 4.01.
 
 * Sat Sep 27 2014 Till Maas <opensource at till.name> - 0.5.5-9.1
 - Rebuilt to fix dependencies