[ocaml-camlp5] New upstream version 6.11 (provides OCaml 4.01.0 support). Build with debug information. Drop upstre

[Jerry James]

commit 2fb75ff39602d201f922c16b30cbe9bddf9d921e
Author: Jerry James <loganjerry at gmail.com>
Date:   Sun Sep 15 21:30:55 2013 -0600

    New upstream version 6.11 (provides OCaml 4.01.0 support).
    Build with debug information.
    Drop upstreamed -typevar patch.
    Upstream now provides its own META file.

 .gitignore           |    2 +-
 camlp5-META          |   95 --------------------------------------------------
 camlp5-typevar.patch |   30 ----------------
 ocaml-camlp5.spec    |   38 +++++++++++++-------
 sources              |    2 +-
 5 files changed, 27 insertions(+), 140 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index de621ef..83579c1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/camlp5-6.07.tgz
+/camlp5-6.11.tgz
diff --git a/ocaml-camlp5.spec b/ocaml-camlp5.spec
index 4637438..f86ec98 100644
--- a/ocaml-camlp5.spec
+++ b/ocaml-camlp5.spec
@@ -1,9 +1,8 @@
 %global opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0)
-%global debug_package %{nil}
 
 Name:           ocaml-camlp5
-Version:        6.07
-Release:        3%{?dist}
+Version:        6.11
+Release:        1%{?dist}
 Summary:        Classical version of camlp4 OCaml preprocessor
 
 Group:          Development/Libraries
@@ -12,9 +11,6 @@ URL:            http://pauillac.inria.fr/~ddr/camlp5/
 ExclusiveArch:  %{ocaml_arches}
 
 Source0:        http://pauillac.inria.fr/~ddr/camlp5/distrib/src/camlp5-%{version}.tgz
-Source1:        camlp5-META
-# Not yet sent upstream: experimental patch to fix the build with OCaml 4.00.1
-Patch0:         camlp5-typevar.patch
 
 BuildRequires:  ocaml
 BuildRequires:  ocaml-ocamldoc
@@ -45,17 +41,27 @@ developing applications that use %{name}.
 
 %prep
 %setup -q -n camlp5-%{version}
-%patch0
+
+# Build with debug information
+sed -i 's,WARNERR="-warn-error A",WARNERR="-g -warn-error A",' 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
+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
 
 
 %build
 ./configure
-make all
 %if %opt
-make opt
-strip meta/camlp5r.opt etc/camlp5o.opt
+make world.opt
+%else
+make world
 %endif
-
+make -C doc/htmlp
 
 %install
 mkdir -p $RPM_BUILD_ROOT%{_libdir}/ocaml
@@ -66,7 +72,7 @@ make install \
   OLIBDIR=$RPM_BUILD_ROOT%{_libdir}/ocaml \
   BINDIR=$RPM_BUILD_ROOT%{_bindir} \
   MANDIR=$RPM_BUILD_ROOT%{_mandir}
-cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_libdir}/ocaml/camlp5/META
+cp -p etc/META $RPM_BUILD_ROOT%{_libdir}/ocaml/camlp5
 rm -f doc/html/.cvsignore doc/htmlp/{.cvsignore,*.sh,Makefile,html2*}
 
 
@@ -82,7 +88,7 @@ rm -f doc/html/.cvsignore doc/htmlp/{.cvsignore,*.sh,Makefile,html2*}
 
 
 %files devel
-%doc CHANGES ICHANGES DEVEL UPGRADING doc/html doc/htmlp
+%doc CHANGES ICHANGES DEVEL UPGRADING doc/html
 %if %opt
 %{_libdir}/ocaml/camlp5/*.a
 %{_libdir}/ocaml/camlp5/*.cmxa
@@ -96,6 +102,12 @@ rm -f doc/html/.cvsignore doc/htmlp/{.cvsignore,*.sh,Makefile,html2*}
 
 
 %changelog
+* Sat Sep 14 2013 Jerry James <loganjerry at gmail.com> - 6.11-1
+- New upstream version 6.11 (provides OCaml 4.01.0 support)
+- Build with debug information
+- Drop upstreamed -typevar patch
+- Upstream now provides its own META file
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 6.07-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 
diff --git a/sources b/sources
index cc6d305..e88d35b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e6ab7d29cbd851f6f99c4e5a9010178f  camlp5-6.07.tgz
+5bd3d0e8a32d762b28107caef631f860  camlp5-6.11.tgz