diff --git a/.gitignore b/.gitignore index a6c305e..8a90ef7 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -coq-8.3pl1.tar.gz +coq-8.3pl2.tar.gz diff --git a/coq.spec b/coq.spec index c9ed5cc..c6d2a9d 100644 --- a/coq.spec +++ b/coq.spec @@ -16,8 +16,8 @@ # however, this name is proper as per the Coq documentation Name: coq -Version: 8.3pl1 -Release: 2%{?dist} +Version: 8.3pl2 +Release: 1%{?dist} Summary: Proof management system Group: Applications/Engineering @@ -40,10 +40,9 @@ BuildRequires: tex(latex), hevea Requires(posttrans): tex(tex) Requires(postun): tex(tex) -ExcludeArch: s390 s390x sparc64 -# ppc64 build fails in both opt and non-opt versions -# bz: 515813 -ExcludeArch: ppc64 +# This should always match the list in the ocaml spec file. +# TODO: ppc64 is NOT currently on this list, due to a missing hevea package. +ExclusiveArch: alpha armv4l %{ix86} ia64 x86_64 ppc sparc sparcv9 %description Coq is a formal proof management system. It allows for the development @@ -151,23 +150,6 @@ sed -i -e 's|"distrib/"|"distrib/V"|' configure cp -p %SOURCE1 %SOURCE2 %SOURCE3 . %build -# optimized binary ppc64 building does not work at the moment - the -# log files are no real help, but we fail on bootstrap with the -# optimized compiler: -# -# bin/coqtop.opt -boot -nois -compile theories/Init/Notations -# -# appears to be the command that dies. It appears that the status of -# OCaml has been somewhat uncertain on ppc64, perhaps this is the cause? -# However, bytecode compilation DOES work -> do this for now -# -# Update: now (6/18) appears that neither works, but I'll keep this -# here for now to remind myself when I can get it working on either -# byte or native -%ifarch ppc64 -%global opt 0 -%endif - # Define opt flag based upon prior opt detection and restrictions %if %{opt} %global opt_option --opt @@ -197,8 +179,6 @@ strip kernel/byterun/dllcoqrun.so find plugins -name \*.cmxs | xargs strip %install -rm -rf %{buildroot} - make COQINSTALLPREFIX="%{buildroot}%{_prefix}" OLDROOT="%{_prefix}" install # Install desktop icon and menu entry @@ -214,7 +194,7 @@ desktop-file-install --vendor="fedora" \ --dir=%{buildroot}%{_datadir}/applications \ coqide.desktop -# Temporary workaround for coq 8.3pl1 install bugs. +# Temporary workaround for coq 8.3 install bugs. # These files have to be installed for coq's provides to match its requires. cp -p plugins/dp/fol.cmi %{buildroot}%{coqdatadir}/plugins/dp cp -p plugins/extraction/miniml.cmi %{buildroot}%{coqdatadir}/plugins/extraction @@ -364,6 +344,11 @@ fi %{_xemacs_sitelispdir}/coq/*.el %changelog +* Tue Apr 26 2011 Jerry James - 8.3pl2-1 +- New upstream release +- Change the list of supported arches to match the ocaml list, except for + ppc64, which is missing hevea + * Mon Apr 4 2011 Jerry James - 8.3pl1-2 - Change the mime type to application/x-coq, and inherit from text/plain (bz 530254) diff --git a/sources b/sources index ab3d415..5516cd9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1869d22b337f5da59ba3bbe1433f9a3b coq-8.3pl1.tar.gz +db415f6c5372f5a443699c62f5affcb4 coq-8.3pl2.tar.gz