Update to 6.12 final.

Also:
- Drop upstreamed patches (all but -kill-warn-error).
- Drop debuginfo workaround; fixed upstream.

.gitignore

@@ -1 +1 @@
-/camlp5-6.11.tgz
+/camlp5-6.12.tgz

0001-NOT-UPSTREAM-Update-parsing-location.mli.patch

@@ -1,26 +0,0 @@
-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
-

ocaml-camlp5.spec

@@ -1,25 +1,20 @@
 %global opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0)
+%if !%{opt}
+%global debug_package %{nil}
+%endif
 
 Name:           ocaml-camlp5
 Version:        6.12
-Release:        0.5.git63a8c30f%{?dist}
+Release:        1%{?dist}
 Summary:        Classical version of camlp4 OCaml preprocessor
 
 License:        BSD
 URL:            http://camlp5.gforge.inria.fr/
 
-Source0:        http://camlp5.gforge.inria.fr/distrib/src/camlp5-6.11.tgz
-
-# This is a patch from the 6.11 tarball to the 63a8c30f commit which
-# is a prerelease of 6.12.  The git repo can be found here:
-# git://scm.gforge.inria.fr/camlp5/camlp5.git
-Patch1:         camlp5-6.12-63a8c30f.patch
+Source0:        http://camlp5.gforge.inria.fr/distrib/src/camlp5-%{version}.tgz
 
 # 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
+Patch0:         camlp5-6.11-kill-warn-error.patch
 
 BuildRequires:  ocaml
 BuildRequires:  ocaml-ocamldoc
@@ -49,23 +44,17 @@ developing applications that use %{name}.
 
 
 %prep
-%setup -q -n camlp5-6.11
+%setup -q -n camlp5-%{version}
 
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
+%patch0 -p1
 
 # Build with debug information
 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
+  sed -i 's,\$[({]OCAMLN[})]c,& -g,;s,\$[({]OCAMLN[})]opt,& -g,;s,LINKFLAGS=,&-g ,' $fil
 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)//' etc/Makefile.withnew
-
 
 %build
 ./configure
@@ -123,6 +112,11 @@ rm -f doc/html/.cvsignore doc/htmlp/{.cvsignore,*.sh,Makefile,html2*}
 
 
 %changelog
+* Thu Nov  6 2014 Jerry James <loganjerry@gmail.com> - 6.12-1
+- Update to 6.12 final
+- Drop upstreamed patches (all but -kill-warn-error)
+- Drop debuginfo workaround; fixed upstream
+
 * Sat Aug 30 2014 Richard W.M. Jones <rjones@redhat.com> - 6.12-0.5.git63a8c30f
 - ocaml-4.02.0 final rebuild.
 

sources

@@ -1 +1 @@
-5bd3d0e8a32d762b28107caef631f860  camlp5-6.11.tgz
+d49d30b62396b7285f3d609ac90c3fe5  camlp5-6.12.tgz