From 3a83cdb85d9acf78ff16c469608a9d895ef46547 Mon Sep 17 00:00:00 2001
From: Richard W.M. Jones <rjones@redhat.com>
Date: Aug 24 2014 08:58:53 +0000
Subject: Fixes for 4.02.0+rc1.


- Kill -warn-error everywhere hopefully.
- Update parsing/location.mli from OCaml sources.
- Fix release numbering.

---

diff --git a/0001-NOT-UPSTREAM-Update-parsing-location.mli.patch b/0001-NOT-UPSTREAM-Update-parsing-location.mli.patch
new file mode 100644
index 0000000..1f92ac0
--- /dev/null
+++ b/0001-NOT-UPSTREAM-Update-parsing-location.mli.patch
@@ -0,0 +1,26 @@
+From 06c7deea99f02352a2f19d0cfa132ede8b94d97a Mon Sep 17 00:00:00 2001
+From: "Richard W.M. Jones" <rjones@redhat.com>
+Date: Sun, 24 Aug 2014 09:57:52 +0100
+Subject: [PATCH] (NOT UPSTREAM) Update parsing/location.mli
+
+---
+ ocaml_stuff/4.02.0/parsing/location.mli | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/ocaml_stuff/4.02.0/parsing/location.mli b/ocaml_stuff/4.02.0/parsing/location.mli
+index 5e412b1..1a7feeb 100644
+--- a/ocaml_stuff/4.02.0/parsing/location.mli
++++ b/ocaml_stuff/4.02.0/parsing/location.mli
+@@ -96,6 +96,9 @@ val error: ?loc:t -> ?sub:error list -> ?if_highlight:string -> string -> error
+ val errorf: ?loc:t -> ?sub:error list -> ?if_highlight:string
+             -> ('a, unit, string, error) format4 -> 'a
+ 
++val raise_errorf: ?loc:t -> ?sub:error list -> ?if_highlight:string
++            -> ('a, unit, string, 'b) format4 -> 'a
++
+ val error_of_printer: t -> (formatter -> 'a -> unit) -> 'a -> error
+ 
+ val error_of_printer_file: (formatter -> 'a -> unit) -> 'a -> error
+-- 
+2.0.4
+
diff --git a/camlp5-6.11-kill-warn-error.patch b/camlp5-6.11-kill-warn-error.patch
new file mode 100644
index 0000000..4b5b501
--- /dev/null
+++ b/camlp5-6.11-kill-warn-error.patch
@@ -0,0 +1,15 @@
+--- camlp5-6.11/configure.old	2014-08-24 09:49:01.887731189 +0100
++++ camlp5-6.11/configure	2014-08-24 09:50:19.043742759 +0100
+@@ -246,11 +246,7 @@
+   OCAMLC_W_Y=""
+ fi
+ 
+-if [ "$($ocamlc -warn-error A 2>&1)" = "" ]; then
+-  WARNERR="-warn-error A"
+-else
+-  WARNERR=""
+-fi
++WARNERR=""
+ 
+ if make -f config/Makefile.check --no-print-directory >/dev/null 2>&1; then
+   NO_PR_DIR=--no-print-directory
diff --git a/ocaml-camlp5.spec b/ocaml-camlp5.spec
index 744916b..23f7866 100644
--- a/ocaml-camlp5.spec
+++ b/ocaml-camlp5.spec
@@ -2,7 +2,7 @@
 
 Name:           ocaml-camlp5
 Version:        6.12
-Release:        0.git63a8c30f%{?dist}.3
+Release:        0.4.git63a8c30f%{?dist}
 Summary:        Classical version of camlp4 OCaml preprocessor
 
 License:        BSD
@@ -15,6 +15,12 @@ Source0:        http://camlp5.gforge.inria.fr/distrib/src/camlp5-6.11.tgz
 # git://scm.gforge.inria.fr/camlp5/camlp5.git
 Patch1:         camlp5-6.12-63a8c30f.patch
 
+# Kill -warn-error A
+Patch2:         camlp5-6.11-kill-warn-error.patch
+
+# Update parsing/location.mli from OCaml 4.02.0 latest sources.
+Patch3:         0001-NOT-UPSTREAM-Update-parsing-location.mli.patch
+
 BuildRequires:  ocaml
 BuildRequires:  ocaml-ocamldoc
 
@@ -46,9 +52,11 @@ developing applications that use %{name}.
 %setup -q -n camlp5-6.11
 
 %patch1 -p1
+%patch2 -p1
+%patch3 -p1
 
 # Build with debug information
-sed -i 's,WARNERR="-warn-error A",WARNERR="-g -warn-error A",' configure
+sed -i 's,WARNERR="",WARNERR="-g",' configure
 sed -i 's,-linkall,& -g,g' top/Makefile
 for fil in compile/compile.sh $(find . -name Makefile); do
   sed -i 's,\$(OCAMLN)c,& -g,;s,\$(OCAMLN)opt,& -g,;s,LINKFLAGS=,&-g ,' $fil
@@ -56,7 +64,7 @@ done
 
 # But don't build pa_lisp with debug information because it triggers this:
 # Fatal error: exception Assert_failure("asmcomp/emitaux.ml", 226, 4)
-sed -i 's/$(WARNERR)/-warn-error A/' etc/Makefile.withnew
+sed -i 's/$(WARNERR)//' etc/Makefile.withnew
 
 
 %build
@@ -115,6 +123,12 @@ rm -f doc/html/.cvsignore doc/htmlp/{.cvsignore,*.sh,Makefile,html2*}
 
 
 %changelog
+* Sun Aug 24 2014 Richard W.M. Jones <rjones@redhat.com> - 6.12-0.4.git63a8c30f
+- Fixes for 4.02.0+rc1.
+- Kill -warn-error everywhere hopefully.
+- Update parsing/location.mli from OCaml sources.
+- Fix release numbering.
+
 * Sat Aug 23 2014 Richard W.M. Jones <rjones@redhat.com> - 6.12-0.git63a8c30f.3
 - ocaml-4.02.0+rc1 rebuild.