From e11c48c639322f13a16c81a55e7370e436f647ee Mon Sep 17 00:00:00 2001
From: Jerry James <loganjerry@gmail.com>
Date: Jul 30 2019 00:12:02 +0000
Subject: Bump Epoch on antlr4-python3-runtime due to decrease in version number.

Work around pr_dump.cmo snafu with new ocaml-camlp5.

---

diff --git a/coq.spec b/coq.spec
index dd92de8..f96659e 100644
--- a/coq.spec
+++ b/coq.spec
@@ -2,7 +2,7 @@
 # the necessary python3 runtime for antlr4.  Once those bugs are addressed, we
 # can unbundle and use the system antlr4 python3 runtime.
 %global antlr4ver 4.7.2
-%global antlr4rel 1%{?dist}
+%global antlr4rel 2%{?dist}
 
 %ifarch %{ocaml_native_compiler}
 %global camlsuffix opt
@@ -77,7 +77,7 @@ BuildRequires:  tex-xindy
 BuildRequires:  tex-zapfchan
 BuildRequires:  tex-zapfding
 
-Requires:       antlr4-python3-runtime = %{antlr4ver}-%{antlr4rel}
+Requires:       antlr4-python3-runtime = 1:%{antlr4ver}-%{antlr4rel}
 Requires:       csdp-tools
 Requires:       texlive-base
 
@@ -138,15 +138,11 @@ for the latter is also included.
 
 %package -n antlr4-python3-runtime
 Summary:        Python 3 runtime support for ANTLR4
+Epoch:          1
 Version:        %{antlr4ver}
-Release:        %{antlr4rel}.1
+Release:        %{antlr4rel}
 BuildArch:      noarch
 
-# Recover from a versioning error.  This can and should be removed when Fedora
-# 30 reaches EOL.  If antlr4 reaches major version 8 before then, which seems
-# highly unlikely, then we have to drop all this anyway and bump the epoch.
-Obsoletes:      antlr4-python3-runtime > 8.7.0-1
-
 %description -n antlr4-python3-runtime
 Python 3 runtime support for ANTLR4 4.7.2.
 
@@ -181,6 +177,9 @@ sed -i 's,/usr/bin/env python2,/usr/bin/python2,' \
     doc/tools/coqrst/notations/fontsupport.py
 sed -i 's,/usr/bin/env time,/usr/bin/time,' tools/CoqMakefile.in Makefile.build
 
+# Work around pr_dump.cmo snafu with recent versions of ocaml-camlp5
+sed -i 's/ -I \$(MYCAMLP5LIB) \$(PR_O)//' Makefile.build Makefile.ide
+
 %build
 # Build and install the ANTLR4 python3 runtime first
 pushd ../antlr4-python3-runtime-%{antlr4ver}
@@ -281,6 +280,9 @@ done
 # We don't need both PostScript and PDF documentation
 rm -fr %{buildroot}%{coqdocdir}/ps
 
+# We don't need a hidden Sphinx marker
+rm -f %{buildroot}%{coqdocdir}/sphinx/html/.buildinfo
+
 # Don't install libcoqrun.a (it might not exist, but get rid of it if it does)
 rm -f %{buildroot}%{coqdatadir}/libcoqrun.a
 
@@ -363,6 +365,10 @@ rm -f %{buildroot}%{coqdatadir}/libcoqrun.a
 %{python3_sitelib}/antlr4*
 
 %changelog
+* Mon Jul 29 2019 Jerry James <loganjerry@gmail.com> - 8.9.1-2
+- Bump Epoch on antlr4-python3-runtime due to decrease in version number
+- Work around pr_dump.cmo snafu with new ocaml-camlp5
+
 * Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 8.9.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild