X-Git-Url: https://git.pld-linux.org/?p=packages%2Fcoq.git;a=blobdiff_plain;f=coq.spec;h=e918fa3b5990a6bde543edab8c298c279f06c39b;hp=0455810937c138de3cc630407ce10487d8e26b7b;hb=cf820e88211f86fb518bed89d8b59da0e6451cf7;hpb=3f4e388b0a272cc3813e56671955b7e427f28989

diff --git a/coq.spec b/coq.spec
index 0455810..e918fa3 100644
--- a/coq.spec
+++ b/coq.spec
@@ -1,21 +1,25 @@
+#
+# TODO:
+#	- desktop file for coqide
+#
 Summary:	The Coq Proof Assistant
-Summary(pl.UTF-8):   Coq - narzędzie pomagające w udowadnianiu
+Summary(pl.UTF-8):	Coq - narzędzie pomagające w udowadnianiu
 Name:		coq
-Version:	8.0pl2
-Release:	2
+Version:	8.3pl1
+Release:	1
 License:	GPL
 Group:		Applications/Math
 Vendor:		INRIA Rocquencourt
-Source0:	ftp://ftp.inria.fr/INRIA/coq/V%{version}/%{name}-%{version}.tar.gz
-# Source0-md5:	39ee0fed76e47a11de2f49e2c236ef79
-# 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
+Source0:	http://coq.inria.fr/V%{version}/files/%{name}-%{version}.tar.gz
+# Source0-md5:	1869d22b337f5da59ba3bbe1433f9a3b
+Patch0:		%{name}-lablgtk2.patch
 URL:		http://coq.inria.fr/
+BuildRequires:	bash
 BuildRequires:	emacs
 BuildRequires:	ocaml >= 3.09.0
-BuildRequires:	ocaml-camlp4
-BuildRequires:	ocaml-lablgtk2-devel >= 2.6.0
+BuildRequires:	camlp5 >= 5.01
+BuildRequires:	ocaml-lablgtk2-devel >= 2.12.0
+BuildRequires:	sed >= 4.0
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -37,8 +41,9 @@ Coq to narzędzie pomagające w udowadnianiu, które:
 
 %prep
 %setup -q
-%patch0 -p0
-%patch1 -p1
+%patch0 -p1
+
+%{__sed} -i -e 's|#!/bin/sh|#!/bin/bash|' test-suite/check
 
 %build
 ./configure \
@@ -52,7 +57,7 @@ Coq to narzędzie pomagające w udowadnianiu, które:
 	--coqide opt \
 	-reals all	# Need ocamlc.opt and ocamlopt.opt 
 
-%{__make} world check	# Use native coq to compile theories
+%{__make} -j1 world check	# Use native coq to compile theories
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -73,8 +78,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/coqc
 %attr(755,root,root) %{_bindir}/coqdep
 %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}/coqide*
 %attr(755,root,root) %{_bindir}/coqmktop
 %attr(755,root,root) %{_bindir}/coqtop
 %attr(755,root,root) %{_bindir}/coqtop.byte