diff --git a/.gitignore b/.gitignore index d487fbf..aa01581 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/coq-8.4.tar.gz +/coq-8.4pl1.tar.gz diff --git a/coq-gdk.patch b/coq-gdk.patch deleted file mode 100644 index 1b8f920..0000000 --- a/coq-gdk.patch +++ /dev/null @@ -1,40 +0,0 @@ ---- ./ide/utils/okey.ml.orig 2006-03-08 04:44:47.000000000 -0700 -+++ ./ide/utils/okey.ml 2012-10-17 20:06:05.547147151 -0600 -@@ -47,6 +47,10 @@ let int_of_modifier = function - | `BUTTON3 -> 1024 - | `BUTTON4 -> 2048 - | `BUTTON5 -> 4096 -+ | `SUPER -> 67108864 -+ | `HYPER -> 134217728 -+ | `META -> 268435456 -+ | `RELEASE -> 1073741824 - - let print_modifier l = - List.iter -@@ -65,7 +69,11 @@ let print_modifier l = - | `BUTTON2 -> "B2" - | `BUTTON3 -> "B3" - | `BUTTON4 -> "B4" -- | `BUTTON5 -> "B5") -+ | `BUTTON5 -> "B5" -+ | `SUPER -> "SUPER" -+ | `HYPER -> "HYPER" -+ | `META -> "META" -+ | `RELEASE -> "RELEASE") - m)^" ") - ) - l; ---- ./ide/preferences.ml.orig 2012-08-08 12:54:37.000000000 -0600 -+++ ./ide/preferences.ml 2012-10-17 20:07:41.938343259 -0600 -@@ -35,7 +35,10 @@ let mod_to_str (m:Gdk.Tags.modifier) = - | `MOD5 -> "" - | `CONTROL -> "" - | `SHIFT -> "" -- | `BUTTON1| `BUTTON2| `BUTTON3| `BUTTON4| `BUTTON5| `LOCK -> "" -+ | `SUPER -> "" -+ | `HYPER -> "" -+ | `META -> "" -+ | `BUTTON1| `BUTTON2| `BUTTON3| `BUTTON4| `BUTTON5| `LOCK | `RELEASE -> "" - - let mod_list_to_str l = List.fold_left (fun s m -> (mod_to_str m)^s) "" l - diff --git a/coq-texlive.patch b/coq-texlive.patch deleted file mode 100644 index f1cdedc..0000000 --- a/coq-texlive.patch +++ /dev/null @@ -1,109 +0,0 @@ ---- ./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 6ed731b..be8a2fc 100644 --- a/coq.spec +++ b/coq.spec @@ -23,8 +23,8 @@ # however, this name is proper as per the Coq documentation Name: coq -Version: 8.4 -Release: 3%{?dist} +Version: 8.4pl1 +Release: 1%{?dist} Summary: Proof management system Group: Applications/Engineering @@ -34,12 +34,11 @@ Source0: http://coq.inria.fr/V%{version}/files/%{name}-%{version}.tar.gz Source1: coqide.desktop Source2: README.coq-emacs Source4: coq.xml -# Not yet sent upstream: support more GDK key modifiers -Patch0: %{name}-gdk.patch BuildRequires: ocaml BuildRequires: ocaml-camlp5-devel BuildRequires: ocaml-lablgtk-devel +BuildRequires: csdp-tools BuildRequires: desktop-file-utils BuildRequires: emacs-nox BuildRequires: emacs-proofgeneral @@ -65,6 +64,7 @@ BuildRequires: tex-times BuildRequires: tex-zapfchan BuildRequires: tex-zapfding +Requires: csdp-tools Requires(posttrans): tex(tex) Requires(postun): tex(tex) @@ -145,7 +145,6 @@ This package is not needed to use the Emacs interface. %prep %setup -q -%patch0 # Fix some files that are not in UTF-8 encoding @@ -163,9 +162,9 @@ sed -ri '/FULLCONFIGDIR/s/OLDROOT|COQINSTALLPREFIX/&2/g' Makefile.build %build # Define opt flag based upon prior opt detection and restrictions %if %{opt} -%global opt_option --opt +%global opt_option -opt %else -%global opt_option --byte-only +%global opt_option -byte-only %endif %global coqdocdir %{_defaultdocdir}/coq-%{version} @@ -176,7 +175,8 @@ sed -ri '/FULLCONFIGDIR/s/OLDROOT|COQINSTALLPREFIX/&2/g' Makefile.build -mandir %{_mandir} \ -docdir %{coqdocdir} \ -configdir %{_sysconfdir}/xdg/%{name} \ - -emacs %{_emacs_sitelispdir} \ + -emacslib %{_emacs_sitelispdir} \ + -lablgtkdir %{_libdir}/ocaml/lablgtk2 \ -coqdocdir %{tex_dir} \ %{opt_option} \ -browser "xdg-open %s" \ @@ -327,6 +327,12 @@ mktexlsr &> /dev/null %{_emacs_sitelispdir}/coq/*.el %changelog +* Mon Jan 7 2013 Jerry James - 8.4pl1-1 +- New upstream release +- Drop upstreamed GDK patch +- Adapt configure arguments to new version +- Add csdp-tools requirement to get csdp binary + * Thu Dec 13 2012 Jerry James - 8.4-3 - Use minimal TeXLive BRs @@ -475,5 +481,5 @@ mktexlsr &> /dev/null * Thu Jul 17 2008 Alan Dunn 8.1pl3-2 - Added check for Fedora distribution number to allow for Fedora 8 release. -* Wed Jun 14 2008 Alan Dunn 8.1pl3-1 +* Wed Jun 11 2008 Alan Dunn 8.1pl3-1 - Initial Fedora RPM version. diff --git a/sources b/sources index e5751ea..26e3907 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f28662cd687f66ed3c372ca3d35ea928 coq-8.4.tar.gz +07e44e89fc99d6c414605dc96be37f12 coq-8.4pl1.tar.gz