- official build fix for ocaml 3.09

[packages/coq.git] / coq.spec

diff --git a/coq.spec b/coq.spec
index f39f93e11b87aa7f3faa8d700dbfc3063abfe8da..8f17a8ece61dc0d964bec92c4adc4d971d28bbf3 100644 (file)
--- a/coq.spec
+++ b/coq.spec
@@ -2,19 +2,21 @@ Summary:      The Coq Proof Assistant
 Summary(pl):   Coq - narzêdzie pomagaj±ce w udowadnianiu
 Name:          coq
 Version:       8.0pl2
-Release:       1
+Release:       2
 License:       GPL
 Group:         Applications/Math
 Vendor:                INRIA Rocquencourt
 Source0:       ftp://ftp.inria.fr/INRIA/coq/V%{version}/%{name}-%{version}.tar.gz
 # Source0-md5: 39ee0fed76e47a11de2f49e2c236ef79
-Patch0:                coq-ocaml-3.07.patch
+# ftp://ftp.inria.fr/INRIA/coq/V8.0pl2/patch-coq-8.0pl2-ocaml-3.09
+Patch0:                %{name}-ocaml-3.09.patch
+Patch1:                %{name}-lablgtk26.patch
 Icon:          petit-coq.gif
 URL:           http://coq.inria.fr/
 BuildRequires: emacs
-BuildRequires: ocaml
+BuildRequires: ocaml >= 3.09.0
 BuildRequires: ocaml-camlp4
-BuildRequires: ocaml-lablgtk-devel
+BuildRequires: ocaml-lablgtk2-devel >= 2.6.0
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -36,6 +38,8 @@ Coq to narz
 
 %prep
 %setup -q
+%patch0 -p0
+%patch1 -p1
 
 %build
 ./configure \
@@ -46,6 +50,7 @@ Coq to narz
        -emacslib %{_datadir}/emacs/site-lisp \
        -opt \
        --coqdocdir %{_datadir}/texmf/tex/latex/misc \
+       --coqide opt \
        -reals all      # Need ocamlc.opt and ocamlopt.opt 
 
 %{__make} world check  # Use native coq to compile theories
@@ -62,19 +67,21 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/coqmktop
+%attr(755,root,root) %{_bindir}/coq-interface
+%attr(755,root,root) %{_bindir}/coq-interface.opt
+%attr(755,root,root) %{_bindir}/coq-tex
+%attr(755,root,root) %{_bindir}/coq_makefile
 %attr(755,root,root) %{_bindir}/coqc
-%attr(755,root,root) %{_bindir}/coqtop.byte
-%attr(755,root,root) %{_bindir}/coqtop.opt
-%attr(755,root,root) %{_bindir}/coqtop
 %attr(755,root,root) %{_bindir}/coqdep
-%attr(755,root,root) %{_bindir}/gallina
-%attr(755,root,root) %{_bindir}/coq_makefile
 %attr(755,root,root) %{_bindir}/coqdoc
+%attr(755,root,root) %{_bindir}/coqide.byte
+%attr(755,root,root) %{_bindir}/coqide.opt
+%attr(755,root,root) %{_bindir}/coqmktop
+%attr(755,root,root) %{_bindir}/coqtop
+%attr(755,root,root) %{_bindir}/coqtop.byte
+%attr(755,root,root) %{_bindir}/coqtop.opt
 %attr(755,root,root) %{_bindir}/coqwc
-%attr(755,root,root) %{_bindir}/coq-tex
-%attr(755,root,root) %{_bindir}/coq-interface
-%attr(755,root,root) %{_bindir}/coq-interface.opt
+%attr(755,root,root) %{_bindir}/gallina
 %attr(755,root,root) %{_bindir}/parser
 %attr(755,root,root) %{_bindir}/parser.opt
 %dir %{_libdir}/coq