X-Git-Url: http://git.pld-linux.org/?p=packages%2Fcoq.git;a=blobdiff_plain;f=coq.spec;h=a8b512ad02fdc9d0f336534bae1489ee2e4817c1;hp=b784158f6a492fe176f999b8727f59454c33325c;hb=1993b991f3f5a80b24e7144dd64beb40cedf9f90;hpb=8edb6738a092466875d4b7e8823724c69a7705b8

diff --git a/coq.spec b/coq.spec
index b784158..a8b512a 100644
--- a/coq.spec
+++ b/coq.spec
@@ -1,13 +1,24 @@
+#
+# TODO:
+#	- package and R: Csdp (https://projects.coin-or.org/Csdp)
+#
+# Conditional build:
+%bcond_without	ocaml_opt	# skip building native optimized binaries (bytecode is always built)
+%bcond_with	tests		# run testsuite (csdp dependant micromega tests fail badly on x86_64)
+#
+%ifnarch %{ix86} %{x8664} arm aarch64 ppc sparc sparcv9
+%undefine	with_ocaml_opt
+%endif
+
 Summary:	The Coq Proof Assistant
 Summary(pl.UTF-8):	Coq - narzędzie pomagające w udowadnianiu
 Name:		coq
-Version:	8.3pl1
-Release:	0.1
-License:	GPL
+Version:	8.4pl6
+Release:	3
+License:	LGPL v2.1
 Group:		Applications/Math
-Vendor:		INRIA Rocquencourt
-Source0:	http://coq.inria.fr/V%{version}/files/%{name}-%{version}.tar.gz
-# Source0-md5:	1869d22b337f5da59ba3bbe1433f9a3b
+Source0:	http://coq.inria.fr/distrib/V%{version}/files/%{name}-%{version}.tar.gz
+# Source0-md5:	2334a98b64578cb81d2b4127e327b368
 Source1:	coqide.desktop
 Source2:	coqide.xpm
 Patch0:		%{name}-lablgtk2.patch
@@ -20,11 +31,19 @@ BuildRequires:	ocaml >= 3.09.0
 BuildRequires:	camlp5 >= 5.01
 BuildRequires:	ocaml-lablgtk2-devel >= 2.12.0
 BuildRequires:	sed >= 4.0
+BuildRequires:	texlive-fonts-cmextra
+BuildRequires:	texlive-fonts-cmsuper
+BuildRequires:	texlive-fonts-other
+BuildRequires:	texlive-format-pdflatex
 BuildRequires:	texlive-latex-ams
 BuildRequires:	texlive-latex-comment
 BuildRequires:	texlive-latex-moreverb
+BuildRequires:	texlive-latex-ucs
+BuildRequires:	texlive-makeindex
 BuildRequires:	texlive-psutils
-BuildRequires:	texlive-format-pdflatex
+# hyperref.sty (from latex) requires ifxexex.sty (from xetex)
+BuildRequires:	texlive-xetex
+%requires_eq	ocaml-runtime
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -44,26 +63,54 @@ Coq to narzędzie pomagające w udowadnianiu, które:
 - wyciągać program o dowiedzionej poprawności z konstruktywnego
   dowodu jego formalnej specyfikacji.
 
+%package emacs
+Summary:	Emacs mode and syntax for Coq
+Summary(pl.UTF-8):	Tryb i składnia Coq dla Emacsa
+Group:		Development/Tools
+Requires:	%{name} = %{version}-%{release}
+
+%description emacs
+Emacs mode and suyntax files for Coq.
+
+%description emacs -l pl.UTF-8
+Pliki trybu i składni Coq dla Emacsa.
+
+%package latex
+Summary:	Coq documentation style for latex
+Summary(pl.UTF-8):	Styl dokumentacji Coq dla latexa
+Group:		Development/Tools
+Requires:	%{name} = %{version}-%{release}
+
+%description latex
+Coq documentation style for latex.
+
+%description latex -l pl.UTF-8
+Styl dokumentacji Coq dla latexa.
+
 %prep
 %setup -q
 %patch0 -p1
 
 %{__sed} -i -e 's|#!/bin/sh|#!/bin/bash|' test-suite/check
+%{__sed} -i -e 's|\(MAKE_TSOPTS=.*\) -s \(.*\)|\1 \2|' Makefile.build
 
 %build
 ./configure \
 	-bindir %{_bindir} \
 	-libdir %{_libdir}/coq \
 	-mandir %{_mandir} \
-	-docdir %{_datadir}/coq/doc \
+	-docdir %{_docdir}/%{name}-%{version} \
+	-configdir %{_sysconfdir}/%{name} \
+	-datadir %{_datadir}/%{name} \
 	-emacs emacs \
-	-browser 'iceweasel -remote "OpenURL(%s,new-tab)" || iceweasel %s &' \
+	-browser "xdg-open %s" \
 	-emacslib %{_datadir}/emacs/site-lisp \
-	-opt \
+	%{?with_ocaml_opt:-opt} \
 	--coqdocdir %{_datadir}/texmf/tex/latex/misc \
-	--coqide opt
+	--coqide %{?with_ocaml_opt:opt}%{!?with_ocaml_opt:byte}
 
-%{__make} -j1 world check	# Use native coq to compile theories
+%{__make} -j1 world VERBOSE=1 CAML_LD_LIBRARY_PATH=kernel/byterun
+%{?with_tests:%{__make} -j1 check VERBOSE=1 CAML_LD_LIBRARY_PATH=kernel/byterun} # Use native coq to compile theories
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -76,44 +123,59 @@ install -d $RPM_BUILD_ROOT{%{_desktopdir},%{_pixmapsdir}}
 install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
 install %{SOURCE2} $RPM_BUILD_ROOT%{_pixmapsdir}
 
+# pdf is enough
+%{__rm} -r $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/ps
+cp -p CHANGES COMPATIBILITY COPYRIGHT CREDITS README $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/coq-interface
-%attr(755,root,root) %{_bindir}/coq-interface.opt
-%attr(755,root,root) %{_bindir}/coq-tex
+%doc %{_docdir}/%{name}-%{version}
+%dir %{_sysconfdir}/%{name}
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/coqide-gtk2rc
 %attr(755,root,root) %{_bindir}/coq_makefile
+%attr(755,root,root) %{_bindir}/coq-tex
 %attr(755,root,root) %{_bindir}/coqc
+%attr(755,root,root) %{_bindir}/coqchk
+%{?with_ocaml_opt:%attr(755,root,root) %{_bindir}/coqchk.opt}
 %attr(755,root,root) %{_bindir}/coqdep
 %attr(755,root,root) %{_bindir}/coqdoc
 %attr(755,root,root) %{_bindir}/coqide*
 %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
+%{?with_ocaml_opt:%attr(755,root,root) %{_bindir}/coqtop.opt}
 %attr(755,root,root) %{_bindir}/coqwc
 %attr(755,root,root) %{_bindir}/gallina
-%attr(755,root,root) %{_bindir}/parser
-%attr(755,root,root) %{_bindir}/parser.opt
 %dir %{_libdir}/coq
 %{_libdir}/coq/*
-%{_datadir}/emacs/site-lisp/coq.el
-%{_datadir}/emacs/site-lisp/coq-inferior.el
+%{_mandir}/man1/coq_makefile.1*
 %{_mandir}/man1/coq-tex.1*
-%{_mandir}/man1/coqdep.1*
-%{_mandir}/man1/gallina.1*
 %{_mandir}/man1/coqc.1*
+%{_mandir}/man1/coqchk.1*
+%{_mandir}/man1/coqdep.1*
+%{_mandir}/man1/coqdoc.1*
+%{_mandir}/man1/coqide.1*
+%{_mandir}/man1/coqmktop.1*
 %{_mandir}/man1/coqtop.1*
 %{_mandir}/man1/coqtop.byte.1*
-%{_mandir}/man1/coqtop.opt.1*
-%{_mandir}/man1/coq_makefile.1*
-%{_mandir}/man1/coqmktop.1*
-%{_mandir}/man1/coq-interface.1*
-%{_mandir}/man1/parser.1*
-%{_mandir}/man1/coqdoc.1*
+%{?with_ocaml_opt:%{_mandir}/man1/coqtop.opt.1*}
 %{_mandir}/man1/coqwc.1*
-%{_datadir}/texmf/tex/latex/misc/coqdoc.sty
+%{_mandir}/man1/gallina.1*
 %{_desktopdir}/coqide.desktop
 %{_pixmapsdir}/coqide.xpm
+%{_datadir}/%{name}
+
+%files emacs
+%defattr(644,root,root,755)
+%{_datadir}/emacs/site-lisp/coq.el
+%{_datadir}/emacs/site-lisp/coq-db.el
+%{_datadir}/emacs/site-lisp/coq-font-lock.el
+%{_datadir}/emacs/site-lisp/coq-inferior.el
+%{_datadir}/emacs/site-lisp/coq-syntax.el
+
+%files latex
+%defattr(644,root,root,755)
+%{_datadir}/texmf/tex/latex/misc/coqdoc.sty