X-Git-Url: http://git.pld-linux.org/?p=packages%2Fcoq.git;a=blobdiff_plain;f=coq.spec;h=1a70cbc2f75e5b4da2e77376f3545ac5ba22f2c5;hp=5d9fcec8849b7c70d133018fca38d7e0291f4da7;hb=6b871b2;hpb=c10c241b4cc14104c4b5a66634b0545fa0f97151

diff --git a/coq.spec b/coq.spec
index 5d9fcec..1a70cbc 100644
--- a/coq.spec
+++ b/coq.spec
@@ -3,18 +3,22 @@
 #	- 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)
+%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.6
+Release:	1
+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:	e7f1704b85d648468160abe03338f1bd
 Source1:	coqide.desktop
 Source2:	coqide.xpm
 Patch0:		%{name}-lablgtk2.patch
@@ -26,12 +30,21 @@ BuildRequires:	netpbm-progs
 BuildRequires:	ocaml >= 3.09.0
 BuildRequires:	camlp5 >= 5.01
 BuildRequires:	ocaml-lablgtk2-devel >= 2.12.0
+BuildRequires:	ocaml-lablgtk2-gtksourceview2-devel
 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
@@ -88,15 +101,17 @@ Styl dokumentacji Coq dla latexa.
 	-libdir %{_libdir}/coq \
 	-mandir %{_mandir} \
 	-docdir %{_docdir}/%{name}-%{version} \
+	-configdir %{_sysconfdir}/%{name} \
+	-datadir %{_datadir}/%{name} \
 	-emacs emacs \
 	-browser "xdg-open %s" \
 	-emacslib %{_datadir}/emacs/site-lisp \
-	-opt \
-	--coqdocdir %{_datadir}/texmf/tex/latex/misc \
-	--coqide opt
+	%{?with_ocaml_opt:-opt} \
+	-coqdocdir %{_datadir}/texmf/tex/latex/misc \
+	-coqide %{?with_ocaml_opt:opt}%{!?with_ocaml_opt:byte}
 
-%{__make} -j1 world VERBOSE=1
-%{?with_tests:%{__make} -j1 check VERBOSE=1}	# 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
@@ -109,8 +124,7 @@ 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.md $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -118,19 +132,19 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %doc %{_docdir}/%{name}-%{version}
+%dir %{_sysconfdir}/%{name}
 %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
-%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
 %attr(755,root,root) %{_bindir}/coqwc
+%attr(755,root,root) %{_bindir}/coqworkmgr
 %attr(755,root,root) %{_bindir}/gallina
 %dir %{_libdir}/coq
 %{_libdir}/coq/*
@@ -144,19 +158,20 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/coqmktop.1*
 %{_mandir}/man1/coqtop.1*
 %{_mandir}/man1/coqtop.byte.1*
-%{_mandir}/man1/coqtop.opt.1*
+%{?with_ocaml_opt:%{_mandir}/man1/coqtop.opt.1*}
 %{_mandir}/man1/coqwc.1*
 %{_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
+%{_datadir}/emacs/site-lisp/gallina-db.el
+%{_datadir}/emacs/site-lisp/gallina-syntax.el
+%{_datadir}/emacs/site-lisp/gallina.el
 
 %files latex
 %defattr(644,root,root,755)