diff --git a/.gitignore b/.gitignore index df59066..d487fbf 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/coq-8.3pl4.tar.gz +/coq-8.4.tar.gz diff --git a/coq-camlp5.patch b/coq-camlp5.patch deleted file mode 100644 index 7dc4195..0000000 --- a/coq-camlp5.patch +++ /dev/null @@ -1,39 +0,0 @@ ---- ./scripts/coqmktop.ml.orig 2011-11-06 04:59:10.000000000 -0700 -+++ ./scripts/coqmktop.ml 2012-06-15 14:38:09.600706944 -0600 -@@ -63,6 +63,7 @@ let includes () = - (src_dirs ()) - (["-I"; "\"" ^ camlp4lib ^ "\""] @ - ["-I"; "\"" ^ coqlib ^ "\""] @ -+ ["-I"; "+compiler-libs"] @ - (if !coqide then ["-thread"; "-I"; "+lablgtk2"] else [])) - - (* Transform bytecode object file names in native object file names *) -@@ -274,7 +275,7 @@ let main () = - ocamloptexec^" -linkall" - end else - (* bytecode (we shunt ocamlmktop script which fails on win32) *) -- let ocamlmktoplib = " toplevellib.cma" in -+ let ocamlmktoplib = " ocamlcommon.cma ocamlbytecomp.cma ocamltoplevel.cma" in - let ocamlcexec = Filename.concat camlbin "ocamlc" in - let ocamlccustom = Printf.sprintf "%s %s -linkall " - ocamlcexec Coq_config.coqrunbyteflags in ---- ./configure.orig 2012-03-26 10:41:59.000000000 -0600 -+++ ./configure 2012-06-15 14:34:56.241970501 -0600 -@@ -444,7 +444,7 @@ esac - - if [ "$coq_debug_flag" = "-g" ]; then - case $CAMLTAG in -- OCAML31*) -+ OCAML31*|OCAML4*) - # Compilation debug flag - coq_debug_flag_opt="-g" - ;; -@@ -494,7 +494,7 @@ if [ "$camlp5dir" != "" ]; then - camlp4oexec=`echo $camlp4oexec | sed -e 's/4/5/'` - else - case $CAMLTAG in -- OCAML31*) -+ OCAML31*|OCAML4*) - if [ -x "${CAMLLIB}/camlp5" ]; then - CAMLP4LIB=+camlp5 - elif [ -x "${CAMLLIB}/site-lib/camlp5" ]; then diff --git a/coq.spec b/coq.spec index 2b06ffd..a09b569 100644 --- a/coq.spec +++ b/coq.spec @@ -23,8 +23,8 @@ # however, this name is proper as per the Coq documentation Name: coq -Version: 8.3pl4 -Release: 3%{?dist} +Version: 8.4 +Release: 1%{?dist} Summary: Proof management system Group: Applications/Engineering @@ -35,9 +35,6 @@ Source1: coqide.desktop Source2: README.coq-emacs Source4: coq.xml -# Adapt to new camlp5 version -Patch0: %{name}-camlp5.patch - BuildRequires: ocaml, ocaml-camlp5-devel, ocaml-lablgtk-devel BuildRequires: desktop-file-utils, emacs-nox, emacs-proofgeneral # For documentation @@ -125,11 +122,10 @@ This package is not needed to use the Emacs interface. %prep %setup -q -%patch0 # Fix some files that are not in UTF-8 encoding -for f in CHANGES CREDITS doc/LICENSE; do +for f in CREDITS doc/LICENSE; do iconv -f ISO-8859-1 -t UTF-8 -o $f.utf8 $f touch -r $f $f.utf8 mv -f $f.utf8 $f @@ -137,6 +133,9 @@ done cp -p %SOURCE1 %SOURCE2 . +# Fix a Makefile rule that causes installation to fail +sed -ri '/FULLCONFIGDIR/s/OLDROOT|COQINSTALLPREFIX/&2/g' Makefile.build + %build # Define opt flag based upon prior opt detection and restrictions %if %{opt} @@ -152,6 +151,7 @@ cp -p %SOURCE1 %SOURCE2 . -bindir %{_bindir} \ -mandir %{_mandir} \ -docdir %{coqdocdir} \ + -configdir %{_sysconfdir}/xdg/%{name} \ -emacs %{_emacs_sitelispdir} \ -coqdocdir %{tex_dir} \ %{opt_option} \ @@ -172,7 +172,9 @@ strip kernel/byterun/dllcoqrun.so find plugins -name \*.cmxs | xargs strip %install -make COQINSTALLPREFIX="%{buildroot}%{_prefix}" OLDROOT="%{_prefix}" install +make COQINSTALLPREFIX="%{buildroot}%{_prefix}" OLDROOT="%{_prefix}" \ + COQINSTALLPREFIX2="%{buildroot}%{_sysconfdir}" OLDROOT2="%{_sysconfdir}" \ + install # Install desktop icon and menu entry @@ -181,19 +183,12 @@ make COQINSTALLPREFIX="%{buildroot}%{_prefix}" OLDROOT="%{_prefix}" install mkdir -p %{buildroot}%{coqdatadir} %endif -sed -i -e 's|ICON-LOCATION-BASE|%{coqdatadir}/ide/coq.png|' coqide.desktop +sed -i -e 's|ICON-LOCATION-BASE|%{_datadir}/coq/coq.png|' coqide.desktop desktop-file-install --vendor="fedora" \ --dir=%{buildroot}%{_datadir}/applications \ coqide.desktop -# 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 -cp -p plugins/micromega/sos_lib.cmi %{buildroot}%{coqdatadir}/plugins/micromega -cp -p proofs/decl_expr.cmi %{buildroot}%{coqdatadir}/proofs - # Make a MIME type for .v files mkdir -p %{buildroot}%{_datadir}/mime/packages cp -p %{SOURCE4} %{buildroot}%{_datadir}/mime/packages @@ -222,7 +217,7 @@ cp -p doc/tutorial/Tutorial.v.pdf %{buildroot}%{coqdocdir}/pdf/Tutorial.pdf %endif # Install documentation not installed by install-doc in Makefile -for f in CHANGES COMPATIBILITY COPYRIGHT CREDITS INSTALL LICENSE README; +for f in CHANGES COMPATIBILITY COPYRIGHT CREDITS README; do cp -p $f %{buildroot}%{coqdocdir}; done @@ -238,7 +233,7 @@ cd %{buildroot}%{_emacs_sitelispdir}/coq mv ../*.el . %{_emacs_bytecompile} *.el -%posttrans +%post mktexlsr &> /dev/null || : update-mime-database %{_datadir}/mime &> /dev/null || : update-desktop-database -q &> /dev/null || : @@ -259,6 +254,7 @@ mktexlsr &> /dev/null # DON'T use the doc macro here or else it wipes out all the other documentation installed! %{_mandir}/man1/* %{coqdatadir} +%{_datadir}/%{name}/ %{_bindir}/coq* %{_bindir}/gallina %exclude %{_bindir}/coqide* @@ -276,18 +272,16 @@ mktexlsr &> /dev/null %{coqdocdir}/COMPATIBILITY %{coqdocdir}/COPYRIGHT %{coqdocdir}/CREDITS -%{coqdocdir}/INSTALL -%{coqdocdir}/LICENSE +%{coqdocdir}/LICENSE.doc %{coqdocdir}/README %files coqide %doc INSTALL.ide %{_bindir}/coqide* +%{_sysconfdir}/xdg/%{name}/ %{coqdatadir}/ide %exclude %{coqdatadir}/ide/ide.cmxa %exclude %{coqdatadir}/ide/ide.a - -# Is it ok to assume this is what desktop-file-install renames coqide.desktop to? %{_datadir}/applications/fedora-coqide.desktop %{_datadir}/mime/packages/coq.xml @@ -297,8 +291,7 @@ mktexlsr &> /dev/null %exclude %{coqdocdir}/COMPATIBILITY %exclude %{coqdocdir}/COPYRIGHT %exclude %{coqdocdir}/CREDITS -%exclude %{coqdocdir}/INSTALL -%exclude %{coqdocdir}/LICENSE +%exclude %{coqdocdir}/LICENSE.doc %exclude %{coqdocdir}/README %files emacs @@ -310,6 +303,11 @@ mktexlsr &> /dev/null %{_emacs_sitelispdir}/coq/*.el %changelog +* Tue Aug 21 2012 Jerry James - 8.4-1 +- New upstream release +- Drop patch; merged upstream +- Drop workaround for install bug; fixed in 8.4 + * Fri Jul 27 2012 Jerry James - 8.3pl4-3 - ProofGeneral dropped support for XEmacs, so we have to drop it too diff --git a/coqide.desktop b/coqide.desktop index 2d02921..d819c59 100644 --- a/coqide.desktop +++ b/coqide.desktop @@ -1,5 +1,4 @@ [Desktop Entry] -Encoding=UTF-8 Name=CoqIDE Comment=Examine and develop Coq .v files Exec=coqide diff --git a/sources b/sources index dfb1f96..e5751ea 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -88e2ce021b09eca207e3119d5202a695 coq-8.3pl4.tar.gz +f28662cd687f66ed3c372ca3d35ea928 coq-8.4.tar.gz