From 1b87cbf1921d5f8cba588f4a0a20c8cc52dbe36f Mon Sep 17 00:00:00 2001
From: Jerry James <loganjerry@gmail.com>
Date: Wed, 14 Nov 2018 18:48:44 -0700
Subject: [PATCH] New upstream version.  New source URL.

---
 .gitignore        |  1 +
 ocaml-menhir.spec | 14 +++++++-------
 sources           |  2 +-
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/.gitignore b/.gitignore
index ed14d3f..33a5cac 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /menhir-*.tar.gz
+/menhir-*.tar.bz2
diff --git a/ocaml-menhir.spec b/ocaml-menhir.spec
index 8fc8192..3c757be 100644
--- a/ocaml-menhir.spec
+++ b/ocaml-menhir.spec
@@ -6,14 +6,14 @@
 %endif
 
 Name:           ocaml-menhir
-Version:        20181006
+Version:        20181113
 Release:        1%{?dist}
 Summary:        LR(1) parser generator for OCaml
 
 # The generator is GPLv2
 License:        GPLv2
 URL:            http://gallium.inria.fr/~fpottier/menhir/
-Source0:        http://gallium.inria.fr/~fpottier/menhir/menhir-%{version}.tar.gz
+Source0:        https://gitlab.inria.fr/fpottier/menhir/-/archive/%{version}/menhir-%{version}.tar.bz2
 
 BuildRequires:  hevea
 BuildRequires:  ImageMagick
@@ -61,13 +61,9 @@ mkdir -p $OCAMLFIND_DESTDIR
 make install PREFIX=%{buildroot}%{_prefix} TARGET=%{target}
 rm -fr %{buildroot}%{_docdir}/menhir
 
-# Remove executable bits from demo files
-chmod a-x demos/find-menhir.sh \
-  demos/generate-printers-dune/menhir-generate-printers
-
 # Remove demo files we do not want to ship
 find demos -name _build -exec rm -fr {} \+
-find demos -name .merlin -exec rm {} \+
+find demos \( -name .merlin -o -name .gitignore \) -exec rm {} \+
 
 %files
 %doc CHANGES.md README.md doc/manual.pdf demos
@@ -95,6 +91,10 @@ find demos -name .merlin -exec rm {} \+
 %{_libdir}/ocaml/menhirSdk/menhirSdk.o
 
 %changelog
+* Wed Nov 14 2018 Jerry James <loganjerry@gmail.com> - 20181113-1
+- New upstream version
+- New source URL
+
 * Mon Oct 22 2018 Jerry James <loganjerry@gmail.com> - 20181006-1
 - New upstream version
 - Ship libraries in the main package
diff --git a/sources b/sources
index 8816ce1..ceb0ee7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (menhir-20181006.tar.gz) = a838c0b6411345ae64e21f8649367541a7e137af7e552e1dcc3da0c2212813de3d0c359dbd863d0130be897148063b406e0757fd2f18b42d43d3964963ebd4c7
+SHA512 (menhir-20181113.tar.bz2) = 78027b453e83159ea30ec88f0adb5de0e2c289313f5c8e77d51ed305a8367e6f5b8cf92685d28d3fa5fd128ebe1ee5a851c1f17a0bcf7182cc448a2a76fc47d3