Build with sharedmeataxe and tdlib support.

Use local objects.inv when building documentation.
This commit is contained in:
Jerry James 2020-01-09 19:18:28 -07:00
parent 4f4f23c8e6
commit 44047e4277
7 changed files with 283 additions and 112 deletions

View file

@ -77,7 +77,7 @@
%endif
# Spkg equivalents of required rpms; we pretend they are installed as spkgs.
%global SAGE_REQUIRED_PKGS 4ti2-1.6.9 bliss-0.73 cbc-2.10.3 CoCoALib-0.99601 coxeter3-1.1 cryptominisat-5.6.8 database_cremona_ellcurve-%{cremona_ver} gap_packages-4.10.2 gmp-6.1.2 libsirocco-2.0 lrslib-070 mcqd-1.0 primecount-5.1 qepcad-B.1.72 saclib-2.2.7 surf-1.0.6-gcc6
%global SAGE_REQUIRED_PKGS 4ti2-1.6.9 bliss-0.73 cbc-2.10.3 CoCoALib-0.99601 coxeter3-1.1 cryptominisat-5.6.8 database_cremona_ellcurve-%{cremona_ver} gap_packages-4.10.2 gmp-6.1.2 libsirocco-2.0 lrslib-070 mcqd-1.0 meataxe-1.0 primecount-5.1 qepcad-B.1.72 saclib-2.2.7 surf-1.0.6-gcc6 tdlib-0.9.0
%ifarch %{ix86} x86_64
%global SAGE_REQUIRED_PKGS %{SAGE_REQUIRED_PKGS} fes-0.2
@ -95,7 +95,7 @@
Name: sagemath
Summary: A free open-source mathematics software system
Version: 8.9
Release: 1%{?dist}
Release: 2%{?dist}
# The file ${SAGE_ROOT}/COPYING.txt is the upstream license breakdown file
# Additionally, every $files section has a comment with the license name
# before files with that license
@ -212,6 +212,12 @@ Patch30: %{name}-sagenb-python3.patch
# Adapt to primecount 5.x
Patch31: %{name}-primecount.patch
# Adapt to recent tdlib 0.9
Patch32: %{name}-tdlib.patch
# Use local objects.inv for intersphinx since no network on koji builders
Patch33: %{name}-intersphinx.patch
BuildRequires: 4ti2
BuildRequires: arb-devel
BuildRequires: bliss-devel
@ -303,10 +309,12 @@ BuildRequires: ppl-devel
BuildRequires: primecount-devel
BuildRequires: pynac-devel
BuildRequires: python3-devel
BuildRequires: python3-docs
BuildRequires: python3-cypari2-devel
BuildRequires: python3-cysignals-devel
BuildRequires: python3-pillow-devel
BuildRequires: python3-pplpy-devel
BuildRequires: python3-tdlib-devel
BuildRequires: python3dist(brial)
BuildRequires: python3dist(cvxopt)
BuildRequires: python3dist(cython)
@ -367,6 +375,7 @@ BuildRequires: R
BuildRequires: ratpoints-devel
BuildRequires: readline-devel
BuildRequires: rw-devel
BuildRequires: sharedmeataxe-devel
BuildRequires: Singular-devel
BuildRequires: sirocco-devel
BuildRequires: stix-math-fonts
@ -448,6 +457,7 @@ Requires: palp
Requires: pari-galdata
Requires: pari-gp
Requires: pari-seadata
Requires: python3-tdlib
Requires: python3dist(brial)
Requires: python3dist(cypari2)
Requires: python3dist(cysignals)
@ -911,6 +921,8 @@ popd
%patch29
%patch30
%patch31
%patch32
%patch33
sed -e 's|@@SAGE_ROOT@@|%{SAGE_ROOT}|' \
-e 's|@@SAGE_DOC@@|%{SAGE_DOC}|' \
@ -1927,6 +1939,10 @@ rm -fr %{SAGE_LOCAL}/var/lib/sage/installed/database_cremona_ellcurve-%{cremona_
########################################################################
%changelog
* Thu Jan 9 2020 Jerry James <loganjerry@gmail.com> - 8.9-2
- Build with sharedmeataxe and tdlib support
- Use local objects.inv when building documentation
* Thu Nov 7 2019 pcpa <paulo.cesar.pereira.de.andrade@gmail.com> - 8.9-1
- Update to latest upstream release
- Drop no longer need patches and rediff current ones