OBS-URL: https://build.opensuse.org/package/show/science/coq?expand=0&rev=34

_constraints

@@ -2,7 +2,10 @@
 <constraints>
   <hardware>
     <memoryperjob>
-      <size unit="M">800</size>
+      <size unit="M">900</size>
     </memoryperjob>
+    <disk>
+      <size unit="G">4</size>
+    </disk>
   </hardware>
 </constraints>

coq-8.13.2.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1e7793d8483f1e939f62df6749f843df967a15d843a4a5acb024904b76e25a14
-size 6952855

coq-8.14.0.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b1501d686c21836302191ae30f610cca57fb309214c126518ca009363ad2cd3c
+size 7062331

coq-refman-8.13.2.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:209cf16781dc604271795e1c6eeab8662d3b5d3d887b9f2df78aa18959c54f66
-size 8992636

coq-refman-8.14.0.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1eaffc8ea592cdfcab4a87750c42693739321f2aaf586ecf0d699f00e519a42e
+size 9055764

coq-rpmlintrc

@@ -4,4 +4,4 @@ from Config import *
 # Unfortunate choice, but we can't easily change that.
 addFilter("hidden-file-or-dir .*/.coq-native")
 # These are loaded manually by the OCaml runtime and need no dependency information.
-addFilter("shared-lib-without-dependency-information .*\.cmxs")
+addFilter("shared-library-without-dependency-information .*\.cmxs")

coq-stdlib-8.13.2.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a238e81a0b18e06a2cb741f5dc2807cda491ac695a092eeec05301bd1f1fcf8c
-size 2801528

coq-stdlib-8.14.0.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:44f41036dff00953f7cfe6d24e1c9ca3948ba93d2dccb07e159a03c1388997c2
+size 2882516

coq.changes

@@ -1,3 +1,30 @@
+-------------------------------------------------------------------
+Wed Oct 20 21:31:46 UTC 2021 - Aaron Puchert <aaronpuchert@alice-dsl.net>
+
+- Update to version 8.14.0.
+  * The internal representation of match has changed to a more
+    space-efficient and cleaner structure, allowing the fix of a
+    completeness issue with cumulative inductive types in the type-
+    checker. The internal representation is now closer to the user-
+    level view of match, where the argument context of branches and
+    the inductive binders in and as do not carry type annotations.
+  * A new coqnative binary performs separate native compilation of
+    libraries, starting from a .vo file. It is supported by
+    coq_makefile.
+  * Improvements to typeclasses and canonical structure resolution,
+    allowing more terms to be considered as classes or keys.
+  * More control over notations declarations and support for
+    primitive types in string and number notations.
+  * Removal of deprecated tactics, notably omega, which has been
+    replaced by a greatly improved lia, along with many bug fixes.
+  * New Ltac2 APIs for interaction with Ltac1, manipulation of
+    inductive types and printing.
+  * Many changes and additions to the standard library in the
+    numbers, vectors and lists libraries. A new signed primitive
+    integers library Sint63 is available in addition to the
+    unsigned Uint63 library.
+  * For more details, see refman/changes.html in coq-doc.
+
 -------------------------------------------------------------------
 Sat Sep  4 12:51:43 UTC 2021 - Aaron Puchert <aaronpuchert@alice-dsl.net>
 

coq.spec

@@ -20,7 +20,7 @@
 %bcond_without ide
 
 Name:           coq
-Version:        8.13.2
+Version:        8.14.0
 Release:        0
 Summary:        Proof Assistant based on the Calculus of Inductive Constructions
 License:        LGPL-2.1-only
@@ -36,14 +36,12 @@ BuildRequires:  desktop-file-utils
 BuildRequires:  make >= 3.81
 BuildRequires:  ocaml >= 4.05.0
 BuildRequires:  ocaml-camlp5-devel >= 5.08
+BuildRequires:  ocaml-dune >= 2.5.1
 BuildRequires:  ocamlfind(findlib)
 BuildRequires:  ocamlfind(zarith)
 %if %{with ide}
 BuildRequires:  update-desktop-files
-BuildRequires:  ocamlfind(lablgtk3)
+BuildRequires:  ocamlfind(lablgtk3-sourceview3)
-BuildRequires:  pkgconfig(gdk-3.0)
-BuildRequires:  pkgconfig(gtk+-3.0)
-BuildRequires:  pkgconfig(gtksourceview-3.0)
 %endif
 
 %description
@@ -57,7 +55,7 @@ For a graphical interface install %{name}-ide.
 %package ide
 Summary:        IDE for The Coq Proof Assistant
 Group:          Productivity/Scientific/Math
-Requires:       %{name} = %{version}-%{release}
+Requires:       %{name} = %{version}
 
 %description ide
 The Coq Integrated Development Interface is a graphical interface for the Coq proof assistant.
@@ -65,7 +63,7 @@ The Coq Integrated Development Interface is a graphical interface for the Coq pr
 %package devel
 Summary:        Development files for coq
 Group:          Development/Libraries/Other
-Requires:       %{name} = %{version}-%{release}
+Requires:       %{name} = %{version}
 Requires:       ocaml >= 4.05.0
 Requires:       ocamlfind(findlib)
 
@@ -82,14 +80,12 @@ HTML reference manual for Coq and full documentation of the standard library.
 
 %prep
 %setup -q -a 50 -a 51
-# META for ocamlfind doesn't contain a version, so configure.ml fails. We patch that.
-sed -i 's/v, _ = tryrun camlexec.find \["query"; "-format"; "%v"; "lablgtk3"\]/v = "%{pkg_version ocamlfind(lablgtk3)}"/' \
-    configure.ml
 
 %build
 export CFLAGS='%{optflags}'
 # TODO: Add -with-doc yes
 ./configure                \
+   -prefix %{_prefix}      \
    -bindir %{_bindir}      \
    -libdir %{_libdir}/coq  \
    -mandir %{_mandir}      \
@@ -109,13 +105,12 @@ export CFLAGS='%{optflags}'
 make %{?_smp_mflags} world
 
 %install
-%if %{with ide}
+make DESTDIR=%{buildroot} install
-# Fixup dependencies before we install. Some are apparently not detected.
-sed -i 's#^ide/ide_MLLIB_DEPENDENCIES:=.*$#& ide/configwin_types ide/protocol/richpp#' \
-    .mllibfiles.d
-%endif
 
-make COQINSTALLPREFIX=%{buildroot} install
+# For some reason, some of the files are installed into /usr/lib.
+%if "${_libdir}" != "${_prefix}/lib"
+mv %{buildroot}%{_prefix}/lib/* %{buildroot}%{_libdir}
+%endif
 
 %if %{with ide}
 %suse_update_desktop_file -i %{SOURCE1}
@@ -124,7 +119,7 @@ install -D -m 644 %{SOURCE2} %{buildroot}%{_datadir}/mime/packages/coq.xml
 mkdir -p %{buildroot}%{_datadir}/icons/hicolor/256x256/apps
 ln -s %{_datadir}/coq/coq.png %{buildroot}%{_datadir}/icons/hicolor/256x256/apps/coq.png
 %else
-rm %{buildroot}%{_bindir}/coqidetop{,.opt} %{buildroot}%{_mandir}/man1/coqide.1
+rm %{buildroot}%{_bindir}/coqidetop{.byte,.opt}
 %endif
 
 # Sometimes we get identical x and x.opt files, replace by symlink x -> x.opt.
@@ -139,9 +134,12 @@ done
 
 # Fix executable bit and shebangs, preferring python3.
 # (https://www.python.org/dev/peps/pep-0394/#for-python-runtime-distributors)
-chmod -x %{buildroot}%{_libdir}/%{name}/tools/TimeFileMaker.py
+chmod -x %{buildroot}%{_libdir}/coq-core/tools/TimeFileMaker.py
 sed -i '1s|^#!/usr/bin/env *|#!/usr/bin/|;1s|^#!/usr/bin/python$|#!/usr/bin/python3|' \
-    %{buildroot}%{_libdir}/%{name}/tools/make-{one-time-file,both-{time,single-timing}-files}.py
+    %{buildroot}%{_libdir}/coq-core/tools/make-{one-time-file,both-{time,single-timing}-files}.py
+
+# Remove /usr/doc that's not FHS-compliant, also we have the files elsewhere.
+rm -r %{buildroot}%{_prefix}/doc
 
 # Remove superfluous man page.
 rm %{buildroot}%{_mandir}/man1/coqtop.byte.1
@@ -151,24 +149,27 @@ find %{buildroot}%{_libdir}/coq -empty -name '*.vos' -delete
 
 # Build lists of runtime and devel files by ending.
 # Compiled theories and shared objects are needed at runtime.
-find %{buildroot}%{_libdir}/coq/{plugins,theories} -type d | \
+find %{buildroot}%{_libdir} -type d | sed "s|%{buildroot}|%%dir |g" >dir.list
-    sed "s|%{buildroot}|%%dir |g" >runtime.list
+sed -i '1d; /coq-core\/tools/d' dir.list
-find %{buildroot}%{_libdir}/coq -name '*.cmxs' \
+find %{buildroot}%{_libdir} -name '*.cmxs' \
                 -or -name '*.so' \
-                -or -name '*.vo' | sed "s|%{buildroot}||g" >>runtime.list
+                -or -name '*.vo' | sed "s|%{buildroot}||g" >runtime.list
 
 # Object files, static libraries and import definitions are only needed for development.
 # For now, we also put the standard library Coq sources here, since the runtime
 # package contains the HTML documentation for the standard library.
-find %{buildroot}%{_libdir}/coq -type d | sed "s|%{buildroot}|%%dir |g" >devel.list
+find %{buildroot}%{_libdir} -name '*.a' \
-find %{buildroot}%{_libdir}/coq -name '*.a' \
                 -or -name '*.cma' \
                 -or -name '*.cmi' \
+                -or -name '*.cmt' \
+                -or -name '*.cmti' \
                 -or -name '*.cmx' \
                 -or -name '*.cmxa' \
                 -or -name '*.glob' \
+                -or -name '*.ml' \
+                -or -name '*.mli' \
                 -or -name '*.o' \
-                -or -name '*.v' | sed "s|%{buildroot}||g" >>devel.list
+                -or -name '*.v' | sed "s|%{buildroot}||g" >devel.list
 
 # Until we can build it, we fetch the documentation from the official website:
 # svn export https://github.com/coq/doc/trunk/V%{version}/refman
@@ -182,45 +183,43 @@ find %{buildroot}%{_libdir}/coq -name '*.a' \
 
 # Drop some CSS files and headers in stdlib documentation, add some margin directly.
 find stdlib/ -name '*.html' -exec sed -i '
-s#//coq.inria.fr/sites/all/themes/coq/coqdoc.css#/usr/lib64/coq/tools/coqdoc/coqdoc.css#
+s#//coq.inria.fr/sites/all/themes/coq/coqdoc.css#%{_libdir}/coq-core/tools/coqdoc/coqdoc.css#
 /<link type="text\/css" rel="stylesheet" media="all" href="\/\/coq.inria.fr\/.*.css" \/>/d
 /<div id="container">/s/>/ style="margin:1em;">/
 /^  <div id="headertop">$/,/^  <\/div>$/d
 /^  <div id="header">$/,/^  <\/div>$/d
 ' {} +
-cp -r refman stdlib %{buildroot}%{_docdir}/coq
+mkdir -p %{buildroot}%{_docdir}/%{name}
-rm -r %{buildroot}%{_docdir}/coq/refman/{.doctrees,_sources}
+cp -r refman stdlib %{buildroot}%{_docdir}/%{name}
+rm -r %{buildroot}%{_docdir}/%{name}/refman/{.buildinfo,.doctrees,_sources}
 
-%files -f runtime.list
+%files -f dir.list -f runtime.list
 %license LICENSE CREDITS
 %doc README.md
 
 %{_bindir}/coq-tex
 %{_bindir}/coq_makefile
 %{_bindir}/coqc
+%{_bindir}/coqc.byte
 %{_bindir}/coqchk
 %{_bindir}/coqdep
 %{_bindir}/coqdoc
+%{_bindir}/coqnative
 %{_bindir}/coqpp
 %{_bindir}/coqproofworker.opt
 %{_bindir}/coqqueryworker.opt
 %{_bindir}/coqtacticworker.opt
 %{_bindir}/coqtop
+%{_bindir}/coqtop.byte
 %{_bindir}/coqtop.opt
 %{_bindir}/coqwc
 %{_bindir}/coqworkmgr
+%{_bindir}/csdpcert
 %{_bindir}/ocamllibdep
 %{_bindir}/votour
 
-%dir %{_libdir}/coq
+%{_libdir}/coq-core/tools
-%{_libdir}/coq/META
+%exclude %{_libdir}/coq-core/tools/CoqMakefile.in
-%{_libdir}/coq/revision
-%dir %{_libdir}/coq/kernel
-%dir %{_libdir}/coq/kernel/byterun
-%{_libdir}/coq/plugins/micromega/csdpcert
-%{_libdir}/coq/tools
-%exclude %{_libdir}/coq/tools/CoqMakefile.in
-%dir %{_libdir}/coq/user-contrib
 
 %{_mandir}/man1/coq-tex.1%{ext_man}
 %{_mandir}/man1/coq_makefile.1%{ext_man}
@@ -228,6 +227,7 @@ rm -r %{buildroot}%{_docdir}/coq/refman/{.doctrees,_sources}
 %{_mandir}/man1/coqchk.1%{ext_man}
 %{_mandir}/man1/coqdep.1%{ext_man}
 %{_mandir}/man1/coqdoc.1%{ext_man}
+%{_mandir}/man1/coqnative.1%{ext_man}
 %{_mandir}/man1/coqtop.1%{ext_man}
 %{_mandir}/man1/coqtop.opt.1%{ext_man}
 %{_mandir}/man1/coqwc.1%{ext_man}
@@ -241,21 +241,22 @@ rm -r %{buildroot}%{_docdir}/coq/refman/{.doctrees,_sources}
 %if %{with ide}
 %files ide
 %{_bindir}/coqide
-%{_bindir}/coqidetop
+%{_bindir}/coqidetop.byte
 %{_bindir}/coqidetop.opt
 %{_mandir}/man1/coqide.1%{ext_man}
 %{_datadir}/%{name}
 %{_datadir}/applications/coq.desktop
 %{_datadir}/icons/hicolor/256x256/apps/coq.png
 %{_datadir}/mime/packages/coq.xml
-%{_docdir}/%{name}/FAQ-CoqIde
 %endif
 
-%files devel -f devel.list
+%files devel -f dir.list -f devel.list
-%{_libdir}/coq/tools/CoqMakefile.in
+%{_libdir}/coq-core/revision
+%{_libdir}/{coq,coq-core,coq-stdlib,coqide,coqide-server}/{META,dune-package,opam}
+%{_libdir}/coq-core/tools/CoqMakefile.in
 
 %files doc
-%{_docdir}/coq/refman
+%{_docdir}/%{name}/refman
-%{_docdir}/coq/stdlib
+%{_docdir}/%{name}/stdlib
 
 %changelog