- filter out autodeps on private interfaces master auto/th/coq-8.13.1-2
authorJan Rękorajski <baggins@pld-linux.org>
Mon, 29 Mar 2021 06:48:08 +0000 (08:48 +0200)
committerJan Rękorajski <baggins@pld-linux.org>
Mon, 29 Mar 2021 06:48:08 +0000 (08:48 +0200)
- rel 2

coq-lablgtk2.patch [deleted file]
coq.spec

diff --git a/coq-lablgtk2.patch b/coq-lablgtk2.patch
deleted file mode 100644 (file)
index 1102759..0000000
+++ /dev/null
@@ -1,46 +0,0 @@
---- coq-8.1pl4/configure~      2008-10-09 11:40:41.000000000 +0200
-+++ coq-8.1pl4/configure       2009-02-16 14:03:00.496249846 +0100
-@@ -634,7 +634,7 @@
-             # Beware of the final \r in Win32
-             lablgtkdirtmp="$(ocamlfind query lablgtk2 2> /dev/null | tr -d '\r')"
-             if [ "$lablgtkdirtmp" != "" ]; then
--                if [ -f "$lablgtkdirtmp/glib.cmi" -a -f "$lablgtkdirtmp/glib.mli" ]; then
-+                if [ -f "$lablgtkdirtmp/glib.cmi" -o -f "$lablgtkdirtmp/glib.mli" ]; then
-                     lablgtkdirfoundmsg="LabelGtk2 found by ocamlfind"
-                     lablgtkdir=$lablgtkdirtmp
-                     LABLGTKLIB=$lablgtkdir # Pour le message utilisateur
-@@ -652,7 +652,7 @@
-                 echo "$lablgtkdir is not a valid directory."
-               echo "Configuration script failed!"
-               exit 1
--          elif [ -f "$lablgtkdir/glib.cmi" -a -f "$lablgtkdir/glib.mli" ]; then
-+          elif [ -f "$lablgtkdir/glib.cmi" -o -f "$lablgtkdir/glib.mli" ]; then
-                 lablgtkdirfoundmsg="LablGtk2 directory found"
-                 LABLGTKLIB=$lablgtkdir # Pour le message utilisateur
-             else
-@@ -664,9 +664,6 @@
-     if [ "$lablgtkdir" = "" ]; then
-       echo "LablGtk2 not found: CoqIde will not be available."
-       COQIDE=no
--    elif [ -z "`grep -w convert_with_fallback "$lablgtkdir/glib.mli"`" ]; then
--      echo "$lablgtkdirfoundmsg but too old: CoqIde will not be available."
--      COQIDE=no;
-     elif [ "$coqide_spec" = "yes" -a "$COQIDE" = "byte" ]; then 
-       echo "$lablgtkdirfoundmsg, bytecode CoqIde will be used as requested."
-       COQIDE=byte
-@@ -855,15 +852,7 @@
- ####################################################
- if [ ! "$COQIDE" = "no" ]; then 
--    if grep "class view " "$lablgtkdir/gText.mli" | grep -q "\[>" ; then
--       if grep -q "?accepts_tab:bool" "$lablgtkdir/gText.mli" ; then
-         cp -f ide/undo_lablgtk_ge212.mli ide/undo.mli
--       else
--      cp -f ide/undo_lablgtk_ge26.mli ide/undo.mli
--       fi
--    else
--      cp -f ide/undo_lablgtk_lt26.mli ide/undo.mli
--    fi
- fi  
- ##################################################
index a8b512ad02fdc9d0f336534bae1489ee2e4817c1..60c1ab9028c5a9b3c74a6d2b1bc119854e4b128d 100644 (file)
--- a/coq.spec
+++ b/coq.spec
@@ -1,35 +1,34 @@
 #
-# TODO:
-#      - package and R: Csdp (https://projects.coin-or.org/Csdp)
-#
 # Conditional build:
 %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
+%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.4pl6
-Release:       3
+Version:       8.13.1
+Release:       2
 License:       LGPL v2.1
 Group:         Applications/Math
-Source0:       http://coq.inria.fr/distrib/V%{version}/files/%{name}-%{version}.tar.gz
-# Source0-md5: 2334a98b64578cb81d2b4127e327b368
+Source0:       https://github.com/coq/coq/archive/V%{version}/%{name}-%{version}.tar.gz
+# Source0-md5: 03ebbf1034c224a0a3327db2d5688c29
 Source1:       coqide.desktop
 Source2:       coqide.xpm
-Patch0:                %{name}-lablgtk2.patch
 URL:           http://coq.inria.fr/
 BuildRequires: bash
-BuildRequires: emacs
 BuildRequires: hevea
 BuildRequires: netpbm-progs
-BuildRequires: ocaml >= 3.09.0
+BuildRequires: ocaml >= 1:4.05
 BuildRequires: camlp5 >= 5.01
-BuildRequires: ocaml-lablgtk2-devel >= 2.12.0
+BuildRequires: ocaml-dune > 2.5.0
+BuildRequires: ocaml-findlib >= 1.8.1
+BuildRequires: ocaml-zarith-devel >= 1.10
+BuildRequires: ocaml-lablgtk3-devel
+BuildRequires: ocaml-lablgtk3-gtksourceview-devel
 BuildRequires: sed >= 4.0
 BuildRequires: texlive-fonts-cmextra
 BuildRequires: texlive-fonts-cmsuper
@@ -44,8 +43,14 @@ BuildRequires:       texlive-psutils
 # hyperref.sty (from latex) requires ifxexex.sty (from xetex)
 BuildRequires: texlive-xetex
 %requires_eq   ocaml-runtime
+Obsoletes:     coq-emacs < 8.13.1
+# same as ocaml-zarith
+ExclusiveArch: %{ix86} %{x8664} %{arm} aarch64 ppc sparc sparcv9
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+# Exclude private ocaml interfaces
+%define                _noautoreq      ocamlx?\\\((Configwin_types|Interface|Richpp|Serialize|Xml_p(arser|rinter)|Xmlprotocol)\\\)
+
 %description
 Coq is a proof assistant which:
  - allows to handle calculus assertions,
@@ -60,20 +65,8 @@ Coq to narzędzie pomagające w udowadnianiu, które:
   różniczkowego,
 - mechanicznie sprawdzać dowody tych twierdzeń,
 - pomagać w znalezieniu formalnych dowodów,
-- wyciągać program o dowiedzionej poprawności z konstruktywnego
-  dowodu jego formalnej specyfikacji.
-
-%package emacs
-Summary:       Emacs mode and syntax for Coq
-Summary(pl.UTF-8):     Tryb i składnia Coq dla Emacsa
-Group:         Development/Tools
-Requires:      %{name} = %{version}-%{release}
-
-%description emacs
-Emacs mode and suyntax files for Coq.
-
-%description emacs -l pl.UTF-8
-Pliki trybu i składni Coq dla Emacsa.
+- wyciągać program o dowiedzionej poprawności z konstruktywnego dowodu
+  jego formalnej specyfikacji.
 
 %package latex
 Summary:       Coq documentation style for latex
@@ -89,10 +82,19 @@ Styl dokumentacji Coq dla latexa.
 
 %prep
 %setup -q
-%patch0 -p1
 
-%{__sed} -i -e 's|#!/bin/sh|#!/bin/bash|' test-suite/check
-%{__sed} -i -e 's|\(MAKE_TSOPTS=.*\) -s \(.*\)|\1 \2|' Makefile.build
+%{__sed} -ri '/FULLCONFIGDIR/s/OLDROOT|COQINSTALLPREFIX/&2/g' Makefile.install
+%{__sed} -i 's|-Wall.*-O2|%{rpmcflags} -Wno-unused|' configure.ml
+%{__sed} -i "s|-oc|-ccopt '%{rpmldflags}' -g &|" Makefile.build
+%{__sed} -i 's,-shared,& -g,g' tools/CoqMakefile.in Makefile.build
+
+%{__sed} -E -i -e '1s,#!\s*/usr/bin/env\s+python3(\s|$),#!%{__python3}\1,' \
+      tools/make-both-single-timing-files.py \
+      tools/make-both-time-files.py \
+      tools/make-one-time-file.py
+
+%{__sed} -E -i -e '1s,#!\s*/usr/bin/env\s+python2(\s|$),#!%{__python3}\1,' \
+      doc/tools/coqrst/notations/fontsupport.py
 
 %build
 ./configure \
@@ -102,30 +104,36 @@ Styl dokumentacji Coq dla latexa.
        -docdir %{_docdir}/%{name}-%{version} \
        -configdir %{_sysconfdir}/%{name} \
        -datadir %{_datadir}/%{name} \
-       -emacs emacs \
-       -browser "xdg-open %s" \
-       -emacslib %{_datadir}/emacs/site-lisp \
-       %{?with_ocaml_opt:-opt} \
-       --coqdocdir %{_datadir}/texmf/tex/latex/misc \
-       --coqide %{?with_ocaml_opt:opt}%{!?with_ocaml_opt:byte}
+       -coqdocdir %{_datadir}/texmf/tex/latex/misc \
+%if %{with ocaml_opt}
+       -native-compiler yes \
+       -coqide opt \
+%else
+       -byte-only \
+       -native-compiler no \
+       -coqide byte \
+%endif
+       -browser "xdg-open %s"
 
-%{__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
+%{__make} world VERBOSE=1 CAML_LD_LIBRARY_PATH=kernel/byterun
+%{?with_tests:%{__make} check VERBOSE=1 CAML_LD_LIBRARY_PATH=kernel/byterun} # Use native coq to compile theories
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_desktopdir},%{_pixmapsdir}}
 
-%{__make} -e install \
-       COQINSTALLPREFIX=$RPM_BUILD_ROOT/
+%{__make} install \
+       COQINSTALLPREFIX=$RPM_BUILD_ROOT%{_prefix} \
+       COQINSTALLPREFIX2=$RPM_BUILD_ROOT%{_sysconfdir} \
+       OLDROOT=%{_prefix} \
+       OLDROOT2=%{_sysconfdir}
+
 # To install only locally the binaries compiled with absolute paths
 
-install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
-install %{SOURCE2} $RPM_BUILD_ROOT%{_pixmapsdir}
+cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
+cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_pixmapsdir}
 
-# pdf is enough
-%{__rm} -r $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/ps
-cp -p CHANGES COMPATIBILITY COPYRIGHT CREDITS README $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
+cp -p CONTRIBUTING.md README.md $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -134,21 +142,23 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc %{_docdir}/%{name}-%{version}
 %dir %{_sysconfdir}/%{name}
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/coqide-gtk2rc
-%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
-%{?with_ocaml_opt:%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}/coq_makefile
+%attr(755,root,root) %{_bindir}/coqpp
+%attr(755,root,root) %{_bindir}/coqproofworker.opt
+%attr(755,root,root) %{_bindir}/coqqueryworker.opt
+%attr(755,root,root) %{_bindir}/coqtacticworker.opt
+%attr(755,root,root) %{_bindir}/coq-tex
 %attr(755,root,root) %{_bindir}/coqtop
-%attr(755,root,root) %{_bindir}/coqtop.byte
-%{?with_ocaml_opt:%attr(755,root,root) %{_bindir}/coqtop.opt}
+%attr(755,root,root) %{_bindir}/coqtop.opt
 %attr(755,root,root) %{_bindir}/coqwc
-%attr(755,root,root) %{_bindir}/gallina
+%attr(755,root,root) %{_bindir}/coqworkmgr
+%attr(755,root,root) %{_bindir}/ocamllibdep
+%attr(755,root,root) %{_bindir}/votour
 %dir %{_libdir}/coq
 %{_libdir}/coq/*
 %{_mandir}/man1/coq_makefile.1*
@@ -158,24 +168,14 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/coqdep.1*
 %{_mandir}/man1/coqdoc.1*
 %{_mandir}/man1/coqide.1*
-%{_mandir}/man1/coqmktop.1*
 %{_mandir}/man1/coqtop.1*
 %{_mandir}/man1/coqtop.byte.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
-
 %files latex
 %defattr(644,root,root,755)
 %{_datadir}/texmf/tex/latex/misc/coqdoc.sty
This page took 0.184075 seconds and 4 git commands to generate.