X-Git-Url: http://git.pld-linux.org/?p=packages%2Fcoq.git;a=blobdiff_plain;f=coq.spec;h=8d9284a3f4ccaf15d1a8bb3d28e608b4b55742a4;hp=4ad971ece5e9cfd0e6505171d2b890e89441f730;hb=650aa0b620c8ca80f44133d4dd3a7c9b51407325;hpb=9019ffc759bcf2e3191c2bb59c34e40a838bbe2c

diff --git a/coq.spec b/coq.spec
index 4ad971e..8d9284a 100644
--- a/coq.spec
+++ b/coq.spec
@@ -1,13 +1,20 @@
+#
+# TODO:
+#	- package and R: Csdp (https://projects.coin-or.org/Csdp)
+#
+# Conditional build:
+%bcond_with	tests	# run testsuite (csdp dependant micromega tests fail badly on x86_64)
+#
 Summary:	The Coq Proof Assistant
 Summary(pl.UTF-8):	Coq - narzędzie pomagające w udowadnianiu
 Name:		coq
-Version:	8.3pl1
-Release:	0.1
+Version:	8.4pl3
+Release:	1
 License:	GPL
 Group:		Applications/Math
 Vendor:		INRIA Rocquencourt
 Source0:	http://coq.inria.fr/V%{version}/files/%{name}-%{version}.tar.gz
-# Source0-md5:	1869d22b337f5da59ba3bbe1433f9a3b
+# Source0-md5:	40a3057ae296bbb228e1e6537f44ccb1
 Source1:	coqide.desktop
 Source2:	coqide.xpm
 Patch0:		%{name}-lablgtk2.patch
@@ -25,6 +32,7 @@ BuildRequires:	texlive-latex-comment
 BuildRequires:	texlive-latex-moreverb
 BuildRequires:	texlive-psutils
 BuildRequires:	texlive-format-pdflatex
+%requires_eq	ocaml-runtime
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -73,6 +81,7 @@ Styl dokumentacji Coq dla latexa.
 %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 \
@@ -80,15 +89,17 @@ Styl dokumentacji Coq dla latexa.
 	-libdir %{_libdir}/coq \
 	-mandir %{_mandir} \
 	-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 \
 	--coqdocdir %{_datadir}/texmf/tex/latex/misc \
 	--coqide opt
 
-%{__make} -j1 world
-%{__make} -j1 check	# Use native coq to compile theories
+%{__make} -j1 world VERBOSE=1
+%{?with_tests:%{__make} -j1 check VERBOSE=1}	# Use native coq to compile theories
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -101,11 +112,17 @@ 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
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
+%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
@@ -137,6 +154,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/gallina.1*
 %{_desktopdir}/coqide.desktop
 %{_pixmapsdir}/coqide.xpm
+%{_datadir}/%{name}
 
 %files emacs
 %defattr(644,root,root,755)