Update to sagemath 8.7.

- Drop upstreamed -giac patch.
- Add -sagetex patch to fix a python indentation error.
- Add -rubiks patch to fix compilation of the rubiks library.
- Add -random patch to fix a non-random random bit generator.
- Drop pip3 workaround; the binary is now named just pip again.
This commit is contained in:
Jerry James 2019-04-28 15:12:00 -06:00
parent b6408b9313
commit 05337076b6
21 changed files with 898 additions and 442 deletions

View file

@ -48,16 +48,16 @@
%global prompt_tookit_pkg prompt_toolkit-1.0.15
%endif
%if %{with bundled_ipywidgets}
%global ipywidgets_pkg ipywidgets-7.2.0
%global ipywidgets_pkg ipywidgets-7.4.2
%endif
%if %{with bundled_pexpect}
%global pexpect_pkg pexpect-4.6.0
%endif
%global polytopes_db_pkg polytopes_db-20170220
%global rubiks_pkg rubiks-20070912
%global sagenb_pkg sagenb-1.1.1
%global sagenb_pkg sagenb-1.1.2
%global sagenb_export_pkg sagenb_export-3.2
%global sagetex_pkg sagetex-3.0
%global sagetex_pkg sagetex-3.2
%global Sphinx_pkg Sphinx-1.7.6
%global singular_pkg singular-4.1.1p3
%if %{with bundled_thebe}
@ -67,13 +67,13 @@
%global threejs_pkg threejs-r80
%endif
%if %{with bundled_widgetsnbextension}
%global widgetsnbextension_pkg widgetsnbextension-3.2.0
%global widgetsnbextension_pkg widgetsnbextension-3.4.2
%endif
# Spkg equivalents of required rpms; we pretend they are installed as spkgs.
# The version numbers shown are those of the latest released spkg, if the Fedora
# version is not behind.
%global SAGE_REQUIRED_PKGS 4ti2-1.6.7 cbc-2.9.4 CoCoALib-0.99564 cryptominisat-5.0.1 gap_packages-4.10.0 gmp-6.1.2 gmpy2-2.1.0a4.p0 lrslib-062+autotools-2017-03-03 qepcad-B.1.71 saclib-2.2.7 sirocco-2.0 surf-1.0.6-gcc6
%global SAGE_REQUIRED_PKGS 4ti2-1.6.7 cbc-2.9.4 CoCoALib-0.99564 cryptominisat-5.6.6 gap_packages-4.10.1 gmp-6.1.2 libsirocco-2.0 lrslib-062+autotools-2017-03-03 qepcad-B.1.71 saclib-2.2.7 surf-1.0.6-gcc6
%global SAGE_ROOT %{_libdir}/sagemath
%global SAGE_LOCAL %{SAGE_ROOT}/local
@ -86,7 +86,7 @@
Name: sagemath
Summary: A free open-source mathematics software system
Version: 8.6
Version: 8.7
Release: 1%{?dist}
# The file ${SAGE_ROOT}/COPYING.txt is the upstream license breakdown file
# Additionally, every $files section has a comment with the license name
@ -101,8 +101,8 @@ ExclusiveArch: aarch64 %{arm} %{ix86} x86_64 ppc sparcv9
# Fix ecm interact() command
Patch0: %{name}-ecm.patch
# Adapt a giac doctest to recent versions of giac
Patch1: %{name}-giac.patch
# Fix a "random" bit chooser that always chooses 0
Patch1: %{name}-random.patch
# Set of patches to work with system wide packages
Patch2: %{name}-scripts.patch
@ -198,6 +198,12 @@ Patch27: %{name}-latte.patch
# Upstream fixes for random SIGFPEs due to ecl messing with the fp state
Patch28: %{name}-sigfpe.patch
# Add some missing #includes and types in the rubiks code
Patch29: %{name}-rubiks.patch
# Fix an indentation error in sagetex
Patch30: %{name}-sagetex.patch
BuildRequires: 4ti2
BuildRequires: arb-devel
BuildRequires: boost-devel
@ -273,6 +279,7 @@ BuildRequires: python3-devel
BuildRequires: python3-cypari2-devel
BuildRequires: python3-cysignals-devel
BuildRequires: python3-pillow-devel
BuildRequires: python3-pplpy-devel
BuildRequires: python3dist(brial)
%if %{with sphinx_hack}
BuildRequires: python3dist(configparser)
@ -416,6 +423,7 @@ Requires: python3dist(pexpect)
%endif
Requires: python3dist(pickleshare)
Requires: python3dist(pillow)
Requires: python3dist(pplpy)
Requires: python3dist(psutil)
Requires: python3dist(ptyprocess)
Requires: python3dist(pycryptosat)
@ -874,6 +882,8 @@ popd
%patch26
%patch27
%patch28
%patch29
%patch30
sed -e 's|@@SAGE_ROOT@@|%{SAGE_ROOT}|' \
-e 's|@@SAGE_DOC@@|%{SAGE_DOC}|' \
@ -927,9 +937,6 @@ sed -e "s|'%{_bindir}/env', 'which'|'%{_bindir}/which'|" \
-i build/pkgs/ipython/src/IPython/utils/_process_posix.py
%endif
# fix path to pip for python 3
sed -i 's/"pip",/"pip3",/' src/sage/misc/package.py
# GAP does not have enough memory to load the entire workspace
sed -i 's/64m/128m/' src/sage/libs/gap/util.pyx
@ -1414,7 +1421,8 @@ sed -i 's|%{buildroot}||g' $SAGE_DOC/test.log
# More wrong buildroot references
perl -pi -e 's|%{buildroot}||g;' \
-e "s|$PWD/src/doc|%{SAGE_DOC}|g;" \
%{buildroot}%{SAGE_DOC}/output/html/en/reference/todolist.html
%{buildroot}%{SAGE_DOC}/html/en/reference/combinat/sage/combinat/posets/poset_examples.html \
%{buildroot}%{SAGE_DOC}/html/en/reference/graphs/sage/graphs/graph_generators.html
# with docs
%endif
@ -1826,6 +1834,14 @@ rm -fr $DOT_SAGE
########################################################################
%changelog
* Sat Apr 27 2019 Jerry James <loganjerry@gmail.com> - 8.7-1
- Update to sagemath 8.7
- Drop upstreamed -giac patch
- Add -sagetex patch to fix a python indentation error
- Add -rubiks patch to fix compilation of the rubiks library
- Add -random patch to fix a non-random random bit generator
- Drop pip3 workaround; the binary is now named just pip again
* Mon Feb 18 2019 Jerry James <loganjerry@gmail.com> - 8.6-1
- Update to sagemath 8.6
- Install an SVG icon instead of a fixed size (128x128) icon