[coq] Changes required by the new TeXLive 2012 packages.

Fri Oct 19 03:21:25 UTC 2012

commit 9887d05819470303f1f0805a34ea7370131a4518
Author: Jerry James <loganjerry at gmail.com>
Date:   Thu Oct 18 21:21:05 2012 -0600

    Changes required by the new TeXLive 2012 packages.

 coq-texlive.patch |  109 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 coq.spec          |   14 +++++--
 2 files changed, 119 insertions(+), 4 deletions(-)
---

diff --git a/coq-texlive.patch b/coq-texlive.patch
new file mode 100644
index 0000000..f1cdedc
--- /dev/null
+++ b/coq-texlive.patch
@@ -0,0 +1,109 @@
+--- ./dev/doc/versions-history.tex.orig	2009-05-24 06:07:49.000000000 -0600
++++ ./dev/doc/versions-history.tex	2012-10-18 09:20:39.627854029 -0600
+@@ -1,5 +1,5 @@
+ \documentclass[a4paper]{book}
+-\usepackage{fullpage}
++\usepackage[margin=1in]{geometry}
+ \usepackage[latin1]{inputenc}
+ \usepackage[T1]{fontenc}
+ \usepackage{amsfonts}
+--- ./dev/doc/naming-conventions.tex.orig	2009-12-13 14:23:17.000000000 -0700
++++ ./dev/doc/naming-conventions.tex	2012-10-18 09:21:05.173814169 -0600
+@@ -1,5 +1,5 @@
+ \documentclass[a4paper]{article}
+-\usepackage{fullpage}
++\usepackage[margin=1in]{geometry}
+ \usepackage[latin1]{inputenc}
+ \usepackage[T1]{fontenc}
+ \usepackage{amsfonts}
+--- ./dev/doc/minicoq.tex.orig	1999-09-07 10:23:42.000000000 -0600
++++ ./dev/doc/minicoq.tex	2012-10-18 09:21:30.002149082 -0600
+@@ -1,6 +1,6 @@
+ \documentclass{article}
+ 
+-\usepackage{fullpage}
++\usepackage[1in]{geometry}
+ \input{./macros.tex}
+ \newcommand{\minicoq}{\textsf{minicoq}}
+ \newcommand{\nonterm}[1]{\textit{#1}}
+--- ./dev/v8-syntax/syntax-v8.tex.orig	2010-12-24 16:49:15.000000000 -0700
++++ ./dev/v8-syntax/syntax-v8.tex	2012-10-18 09:26:37.263334056 -0600
+@@ -5,7 +5,7 @@
+ \usepackage{amsmath}
+ \usepackage{amssymb}
+ \usepackage{array}
+-\usepackage{fullpage}
++\usepackage[margin=1in]{geometry}
+ 
+ \author{B.~Barras}
+ \title{Syntax of Coq V8}
+--- ./dev/v8-syntax/memo-v8.tex.orig	2006-05-23 15:51:59.000000000 -0600
++++ ./dev/v8-syntax/memo-v8.tex	2012-10-18 09:26:01.440352109 -0600
+@@ -5,7 +5,7 @@
+ \usepackage{amsmath}
+ \usepackage{amssymb}
+ \usepackage{array}
+-\usepackage{fullpage}
++\usepackage[margin=1in]{geometry}
+ 
+ \author{B.~Barras}
+ \title{An introduction to syntax of Coq V8}
+--- ./tools/coqdoc/output.ml.orig	2012-08-08 12:54:37.000000000 -0600
++++ ./tools/coqdoc/output.ml	2012-10-18 09:27:44.077434292 -0600
+@@ -205,7 +205,7 @@ module Latex = struct
+       if !inputenc != "" then printf "\\usepackage[%s]{inputenc}\n" !inputenc;
+       if !inputenc = "utf8x" then utf8x_extra_support ();
+       printf "\\usepackage[T1]{fontenc}\n";
+-      printf "\\usepackage{fullpage}\n";
++      printf "\\usepackage[margin=1in]{geometry}\n";
+       printf "\\usepackage{coqdoc}\n";
+       printf "\\usepackage{amsmath,amssymb}\n";
+       (match !toc_depth with
+--- ./doc/tools/Translator.tex.orig	2006-02-23 06:58:10.000000000 -0700
++++ ./doc/tools/Translator.tex	2012-10-18 09:29:08.683027297 -0600
+@@ -11,7 +11,7 @@
+ \usepackage{amsmath}
+ \usepackage{amssymb}
+ \usepackage{array}
+-\usepackage{fullpage}
++\usepackage[margin=1in]{geometry}
+ 
+ \title{Translation from Coq V7 to V8}
+ \author{The Coq Development Team}
+--- ./doc/stdlib/Library.tex.orig	2010-09-28 10:27:28.000000000 -0600
++++ ./doc/stdlib/Library.tex	2012-10-18 09:29:34.857282701 -0600
+@@ -2,7 +2,7 @@
+ 
+ \usepackage[utf8x]{inputenc}
+ \usepackage[T1]{fontenc}
+-\usepackage{fullpage}
++\usepackage[margin=1in]{geometry}
+ \usepackage{amsfonts}
+ \usepackage[color]{../../coqdoc}
+ 
+--- ./doc/refman/Reference-Manual.tex.orig	2012-05-10 08:55:02.000000000 -0600
++++ ./doc/refman/Reference-Manual.tex	2012-10-18 09:35:51.139521197 -0600
+@@ -15,10 +15,11 @@
+ \usepackage{alltt}
+ \usepackage{hevea}
+ \usepackage{ifpdf}
+-\usepackage[headings]{fullpage}
++\usepackage[margin=1in]{geometry}
+ \usepackage{headers} % in this directory
+ \usepackage{multicol}
+ \usepackage{xspace}
++\pagestyle{headings}
+ 
+ % for coqide
+ \ifpdf   % si on est pas en pdflatex
+--- ./doc/faq/FAQ.tex.orig	2012-08-08 12:52:46.000000000 -0600
++++ ./doc/faq/FAQ.tex	2012-10-18 09:36:41.719246529 -0600
+@@ -12,7 +12,7 @@
+ \usepackage{url}
+ %\usepackage{multicol}
+ \usepackage{hevea}
+-\usepackage{fullpage}
++\usepackage[margin=1in]{geometry}
+ \usepackage[latin1]{inputenc}
+ \usepackage[english]{babel}
+ 
diff --git a/coq.spec b/coq.spec
index b11211c..1fa9912 100644
--- a/coq.spec
+++ b/coq.spec
@@ -1,6 +1,6 @@
 %global opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0)
 %global debug_package %{nil}
-%global tex_dir %{_texmf_vendor}/tex/latex/misc
+%global tex_dir %{_datadir}/texmf/tex/latex
 
 # Hevea is not universally available, so HTML documentation cannot be produced
 # on some arches.
@@ -36,11 +36,14 @@ Source2:        README.coq-emacs
 Source4:        coq.xml
 # Not yet sent upstream: support more GDK key modifiers
 Patch0:         %{name}-gdk.patch
+# Not yet sent upstream: adapt to TeXLive 2012
+Patch1:         %{name}-texlive.patch
 
 BuildRequires:  ocaml, ocaml-camlp5-devel, ocaml-lablgtk-devel
 BuildRequires:  desktop-file-utils, emacs-nox, emacs-proofgeneral
 # For documentation
-BuildRequires:  tex(latex), tex(comment.sty)
+BuildRequires:  texlive-collection-latexextra, texlive-collection-mathextra
+BuildRequires:  tex(latex), tex(epic.sty)
 %if %{build_html}
 BuildRequires:  hevea
 %endif
@@ -125,6 +128,7 @@ This package is not needed to use the Emacs interface.
 %prep
 %setup -q
 %patch0
+%patch1
 
 # Fix some files that are not in UTF-8 encoding
 
@@ -266,7 +270,7 @@ mktexlsr &> /dev/null
 %exclude %{coqdatadir}/*/*.cmxa
 %exclude %{coqdatadir}/*/*.a
 %endif
-%{tex_dir}/coq*
+%{tex_dir}/coqdoc.sty
 # A few documentation files here should stay in the main package (and
 # are excluded from doc), but the bulk of the documentation is in the
 # doc subpackage
@@ -309,7 +313,9 @@ mktexlsr &> /dev/null
 * Wed Oct 17 2012 Jerry James <loganjerry at gmail.com> - 8.4-2
 - Rebuild for OCaml 4.00.1
 - Support more GDK key modifiers in the IDE (hyper, meta, release, super)
-- BR tex(comment.sty) due to the new texlive package layout
+- New BRs due to the new texlive package layout
+- Substitute the geometry package for fullpage.sty, which is not included in
+  the latest Fedora TeXLive packages.
 
 * Tue Aug 21 2012 Jerry James <loganjerry at gmail.com> - 8.4-1
 - New upstream release
