From 7c97020403710d140717935c9c7f3c2e57fe7dc8 Mon Sep 17 00:00:00 2001
From: Jerry James <jamesjer@betterlinux.com>
Date: Thu, 12 Sep 2013 14:07:47 -0600
Subject: [PATCH] New upstream version. Allow debuginfo generation since ocaml
 4 supports it.

---
 .gitignore        |  2 +-
 ocaml-menhir.spec | 22 +++++++++++++---------
 sources           |  2 +-
 3 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/.gitignore b/.gitignore
index 5210883..75ca73a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/menhir-20130116.tar.gz
+/menhir-20130911.tar.gz
diff --git a/ocaml-menhir.spec b/ocaml-menhir.spec
index c145d1e..f0be53f 100644
--- a/ocaml-menhir.spec
+++ b/ocaml-menhir.spec
@@ -1,16 +1,17 @@
-%global debug_package %{nil}
 %global opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0)
 %if %opt
-%global target opt
+%global target native
 %else
 %global target byte
 %endif
 
 Name:           ocaml-menhir
-Version:        20130116
-Release:        3%{?dist}
+Version:        20130911
+Release:        1%{?dist}
 Summary:        LR(1) parser generator for OCaml
 
+# The library is LGPLv2+ with a linking exception.
+# The remaining code is QPL, with an exception granted to clause 6c.
 License:        (QPL with exceptions) and (LGPLv2+ with exceptions)
 URL:            http://gallium.inria.fr/~fpottier/menhir/
 Source0:        http://gallium.inria.fr/~fpottier/menhir/menhir-%{version}.tar.gz
@@ -18,7 +19,7 @@ Source0:        http://gallium.inria.fr/~fpottier/menhir/menhir-%{version}.tar.g
 Patch0:         0001-Makfile-use-menhir-ocamldep-instead-of-ocamldep.wra.patch
 
 BuildRequires:  ocaml
-BuildRequires:  ocaml-findlib-devel
+BuildRequires:  ocaml-findlib
 
 ExclusiveArch:  %{ocaml_arches}
 
@@ -48,18 +49,17 @@ for f in AUTHORS menhir.1; do
   mv -f $f.fixed $f
 done
 
-# Remove OMake generated files in the upstream tarball
-rm -f demos/calc/.omakedb* demos/calc/*.omc
-
 # Fix a dependency
 sed "s|/usr/bin/env ocaml|/usr/bin/ocaml|" demos/ocamldep.wrapper > foo
 touch -r demos/ocamldep.wrapper foo
 mv -f foo demos/ocamldep.wrapper
 chmod a+x demos/ocamldep.wrapper
 
+# Prevent embedding buildroot paths into the executable
+sed -i 's/install: all/install:/' Makefile
+
 %build
 make PREFIX=%{_prefix} TARGET=%{target}
-strip src/menhir
 make -C demos clean
 
 %install
@@ -81,6 +81,10 @@ mv demos/ocamldep.wrapper $RPM_BUILD_ROOT%{_bindir}/menhir-ocamldep
 %{_libdir}/ocaml/menhirLib/
 
 %changelog
+* Thu Sep 12 2013 Jerry James <loganjerry@gmail.com> - 20130911-1
+- New upstream version
+- Allow debuginfo generation since ocaml 4 supports it
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 20130116-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 
diff --git a/sources b/sources
index 187b272..eeabc93 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-47b3666ecf799168c1250169b2c7f052  menhir-20130116.tar.gz
+66374f3626f9403b37eed43819210113  menhir-20130911.tar.gz