mirror of
https://src.fedoraproject.org/rpms/sagemath.git
synced 2025-04-22 11:45:56 -04:00
Update to latest upstream release
This commit is contained in:
pcpa
parent
fa050d6863
commit
7b54d2115b
20 changed files with 285 additions and 834 deletions
|
|
@ -60,15 +60,15 @@
|
|||
%global polytopes_db_pkg polytopes_db-20170220
|
||||
%global rubiks_pkg rubiks-20070912
|
||||
%global sagenb_pkg sagenb-1.1.2
|
||||
%global sagetex_pkg sagetex-3.2
|
||||
%global sagetex_pkg sagetex-3.3
|
||||
%global Sphinx_pkg Sphinx-1.8.5
|
||||
%global singular_pkg singular-4.1.1p3
|
||||
%global singular_pkg singular-4.1.1p2
|
||||
%if %{with bundled_thebe}
|
||||
%global thebe_ver 9624e0a0
|
||||
%global thebe_pkg thebe-%{thebe_ver}
|
||||
%endif
|
||||
%if %{with bundled_threejs}
|
||||
%global threejs_ver r100
|
||||
%global threejs_ver r105
|
||||
%global threejs_pkg threejs-%{threejs_ver}
|
||||
%endif
|
||||
%if %{with bundled_widgetsnbextension}
|
||||
|
|
@ -94,8 +94,8 @@
|
|||
|
||||
Name: sagemath
|
||||
Summary: A free open-source mathematics software system
|
||||
Version: 8.8
|
||||
Release: 7%{?dist}
|
||||
Version: 8.9
|
||||
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
|
||||
# before files with that license
|
||||
|
|
@ -180,45 +180,37 @@ Patch20: %{name}-sympy.patch
|
|||
|
||||
# Correct unable to start QEPCAD within sage
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=1243590
|
||||
Patch22: %{name}-qepcad.patch
|
||||
Patch21: %{name}-qepcad.patch
|
||||
|
||||
# Correct path to arb headers
|
||||
Patch23: %{name}-arb.patch
|
||||
|
||||
# Add missing escapes, or convert strings to raw strings
|
||||
Patch24: %{name}-escape.patch
|
||||
Patch22: %{name}-arb.patch
|
||||
|
||||
# Add missing include paths
|
||||
Patch25: %{name}-includes.patch
|
||||
Patch23: %{name}-includes.patch
|
||||
|
||||
# Use openblas
|
||||
Patch26: %{name}-openblas.patch
|
||||
Patch24: %{name}-openblas.patch
|
||||
|
||||
# Fix paths to latte-integrale binaries
|
||||
Patch27: %{name}-latte.patch
|
||||
Patch25: %{name}-latte.patch
|
||||
|
||||
# Upstream fixes for random SIGFPEs due to ecl messing with the fp state
|
||||
Patch28: %{name}-sigfpe.patch
|
||||
Patch26: %{name}-sigfpe.patch
|
||||
|
||||
# Add some missing #includes and types in the rubiks code
|
||||
Patch29: %{name}-rubiks.patch
|
||||
Patch27: %{name}-rubiks.patch
|
||||
|
||||
# Fix an indentation error in sagetex
|
||||
Patch30: %{name}-sagetex.patch
|
||||
Patch28: %{name}-sagetex.patch
|
||||
|
||||
# Fix some path settings in the sage environment
|
||||
Patch31: %{name}-env.patch
|
||||
Patch29: %{name}-env.patch
|
||||
|
||||
# Make notebook minimally function until upstream finally removes it
|
||||
Patch32: %{name}-sagenb-python3.patch
|
||||
|
||||
# Replace python's deprecated formatargspec with a custom implementation
|
||||
# https://trac.sagemath.org/ticket/27971
|
||||
# https://git.sagemath.org/sage.git/commit/?id=bbd5b28fc8e451bea4f87c2f2b0c27586386262a
|
||||
Patch33: %{name}-formatargspec.patch
|
||||
Patch30: %{name}-sagenb-python3.patch
|
||||
|
||||
# Adapt to primecount 5.x
|
||||
Patch34: %{name}-primecount.patch
|
||||
Patch31: %{name}-primecount.patch
|
||||
|
||||
BuildRequires: 4ti2
|
||||
BuildRequires: arb-devel
|
||||
|
|
@ -908,6 +900,7 @@ popd
|
|||
%endif
|
||||
|
||||
%patch20
|
||||
%patch21
|
||||
%patch22
|
||||
%patch23
|
||||
%patch24
|
||||
|
|
@ -918,9 +911,6 @@ popd
|
|||
%patch29
|
||||
%patch30
|
||||
%patch31
|
||||
%patch32
|
||||
%patch33
|
||||
%patch34
|
||||
|
||||
sed -e 's|@@SAGE_ROOT@@|%{SAGE_ROOT}|' \
|
||||
-e 's|@@SAGE_DOC@@|%{SAGE_DOC}|' \
|
||||
|
|
@ -1279,6 +1269,10 @@ pushd $SAGE_LOCAL/bin/
|
|||
spkg-install
|
||||
popd
|
||||
|
||||
#------------------------------------------------------------------------
|
||||
(
|
||||
source build/bin/sage-dist-helpers
|
||||
|
||||
#------------------------------------------------------------------------
|
||||
pushd build/pkgs/combinatorial_designs
|
||||
chmod a+x spkg-install
|
||||
|
|
@ -1318,7 +1312,7 @@ pushd build/pkgs/sagetex/src
|
|||
%py3_install "--install-purelib=%{python3_sitearch}"
|
||||
mv %{buildroot}%{_texmf}/tex/latex/sagetex/CONTRIBUTORS \
|
||||
%{buildroot}%{_docdir}/sagetex
|
||||
for file in PKG-INFO README; do
|
||||
for file in PKG-INFO; do
|
||||
install -p -m 0644 $file %{buildroot}%{_docdir}/sagetex/$file
|
||||
done
|
||||
popd
|
||||
|
|
@ -1358,6 +1352,9 @@ pushd build/pkgs/widgetsnbextension/src
|
|||
popd
|
||||
%endif
|
||||
|
||||
#------------------------------------------------------------------------
|
||||
) # source build/bin/sage-dist-helpers
|
||||
|
||||
#------------------------------------------------------------------------
|
||||
cat > %{buildroot}%{SAGE_LOCAL}/bin/sage-env << EOF
|
||||
export CUR=\$PWD
|
||||
|
|
@ -1485,11 +1482,6 @@ perl -pi -e 's|%{buildroot}||g;' \
|
|||
# with docs
|
||||
%endif
|
||||
|
||||
# Script was used to build documentation
|
||||
perl -pi -e 's|%{buildroot}||g;s|^##||g;' \
|
||||
%{buildroot}%{_bindir}/sage \
|
||||
%{buildroot}%{SAGE_LOCAL}/bin/sage-env
|
||||
|
||||
#------------------------------------------------------------------------
|
||||
# Fix links
|
||||
export SAGE_SRC=%{buildroot}%{SAGE_SRC}
|
||||
|
|
@ -1635,8 +1627,8 @@ popd
|
|||
|
||||
#------------------------------------------------------------------------
|
||||
# Build the large Cremona database
|
||||
PATH=%{buildroot}%{SAGE_LOCAL}/bin:$PATH
|
||||
PYTHONPATH=%{buildroot}%{SAGE_PYTHONPATH}:%{buildroot}%{python3_sitearch}
|
||||
export PATH=%{buildroot}%{SAGE_LOCAL}/bin:$PATH
|
||||
export PYTHONPATH=%{buildroot}%{SAGE_PYTHONPATH}:%{buildroot}%{python3_sitearch}
|
||||
cat > cremona.sage << EOF
|
||||
import sage.databases.cremona
|
||||
db_path = '%{buildroot}%{SAGE_SHARE}/cremona/cremona'
|
||||
|
|
@ -1645,6 +1637,12 @@ c._init_from_ftpdata('ecdata-%{cremona_ver}')
|
|||
EOF
|
||||
%{buildroot}%{SAGE_LOCAL}/bin/sage cremona.sage
|
||||
|
||||
#------------------------------------------------------------------------
|
||||
# Script was used to build documentation and possibly other operations
|
||||
perl -pi -e 's|%{buildroot}||g;s|^##||g;' \
|
||||
%{buildroot}%{_bindir}/sage \
|
||||
%{buildroot}%{SAGE_LOCAL}/bin/sage-env
|
||||
|
||||
# last install command
|
||||
rm -fr $DOT_SAGE
|
||||
|
||||
|
|
@ -1929,6 +1927,10 @@ rm -fr %{SAGE_LOCAL}/var/lib/sage/installed/database_cremona_ellcurve-%{cremona_
|
|||
|
||||
########################################################################
|
||||
%changelog
|
||||
* 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
|
||||
|
||||
* Fri Oct 11 2019 Jerry James <loganjerry@gmail.com> - 8.8-7
|
||||
- Rebuild for mpfr 4
|
||||
- Drop -mpfr patch
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue