mirror of
https://src.fedoraproject.org/rpms/sagemath.git
synced 2025-04-22 11:45:56 -04:00
Version 9.3.
- Drop -arb and -openblas patches. - Add -cvxopt patch. - Add metainfo file.
This commit is contained in:
Jerry James
parent
26b688d416
commit
0a1b42ef2b
21 changed files with 1096 additions and 1037 deletions
|
|
@ -1,7 +1,7 @@
|
|||
diff -up src/bin/sage.orig src/bin/sage
|
||||
--- src/bin/sage.orig 2020-10-24 11:37:59.000000000 -0600
|
||||
+++ src/bin/sage 2020-10-30 13:43:06.816896461 -0600
|
||||
@@ -29,7 +29,6 @@ usage() {
|
||||
--- src/bin/sage.orig 2021-05-09 16:00:11.000000000 -0600
|
||||
+++ src/bin/sage 2021-05-28 11:16:43.936440802 -0600
|
||||
@@ -109,7 +109,6 @@ usage() {
|
||||
echo " --gap [...] -- run Sage's Gap with given arguments"
|
||||
echo " --gp [...] -- run Sage's PARI/GP calculator with given arguments"
|
||||
echo " -h -- print this help message"
|
||||
|
|
@ -9,8 +9,8 @@ diff -up src/bin/sage.orig src/bin/sage
|
|||
echo " --maxima [...] -- run Sage's Maxima with given arguments"
|
||||
echo " --mwrank [...] -- run Sage's mwrank with given arguments"
|
||||
echo " --notebook=[...] -- start the Sage notebook (valid options are"
|
||||
@@ -59,119 +58,6 @@ usage() {
|
||||
# below, after sourcing sage-env.
|
||||
@@ -159,111 +158,6 @@ if [ -f "${SELF}-env-config" ]; then
|
||||
fi
|
||||
|
||||
#####################################################################
|
||||
-# Special options to be processed without sage-env
|
||||
|
|
@ -22,7 +22,7 @@ diff -up src/bin/sage.orig src/bin/sage
|
|||
-if [ "$1" = '--nodotsage' ]; then
|
||||
- export DOT_SAGE=`mktemp -d ${TMPDIR:-/tmp}/dotsageXXXXXX`
|
||||
- shift
|
||||
- command "$0" "$@"
|
||||
- command "${SELF}" "$@"
|
||||
- status=$?
|
||||
- rm -rf "$DOT_SAGE"
|
||||
- exit $status
|
||||
|
|
@ -51,14 +51,6 @@ diff -up src/bin/sage.orig src/bin/sage
|
|||
- exit 127
|
||||
-fi
|
||||
-
|
||||
-# Check for '--upgrade' before sourcing sage-env: the top-level "make"
|
||||
-# should be run outside of the Sage shell, see #15517.
|
||||
-if [ "$1" = '-upgrade' -o "$1" = "--upgrade" ]; then
|
||||
- shift
|
||||
- cd "$SAGE_ROOT"
|
||||
- exec local/bin/sage-upgrade "$@"
|
||||
-fi
|
||||
-
|
||||
-# Check for '-i' before sourcing sage-env: running "make"
|
||||
-# should be run outside of the Sage shell.
|
||||
-if [ "$1" = '-f' ]; then
|
||||
|
|
@ -129,7 +121,7 @@ diff -up src/bin/sage.orig src/bin/sage
|
|||
# Report information about the Sage environment
|
||||
#####################################################################
|
||||
|
||||
@@ -217,20 +103,6 @@ fi
|
||||
@@ -308,20 +202,6 @@ fi
|
||||
|
||||
# Prepare for running Sage, either interactively or non-interactively.
|
||||
sage_setup() {
|
||||
|
|
@ -150,7 +142,7 @@ diff -up src/bin/sage.orig src/bin/sage
|
|||
if [ ! -d "$IPYTHONDIR" ]; then
|
||||
# make sure that $DOT_SAGE exists so that ipython will happily
|
||||
# create its config directories there. If DOT_SAGE doesn't
|
||||
@@ -241,20 +113,6 @@ sage_setup() {
|
||||
@@ -332,20 +212,6 @@ sage_setup() {
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -160,7 +152,7 @@ diff -up src/bin/sage.orig src/bin/sage
|
|||
-# if Python and sage-location haven't been installed yet.
|
||||
-maybe_sage_location()
|
||||
-{
|
||||
- if [ -w "$SAGE_LOCAL" ]; then
|
||||
- if [ -n "$SAGE_LOCAL" -a -w "$SAGE_LOCAL" ]; then
|
||||
- if [ -x "$SAGE_LOCAL/bin/python" ] && [ -x "$SAGE_LOCAL/bin/sage-location" ]; then
|
||||
- sage-location || exit $?
|
||||
- fi
|
||||
|
|
@ -171,7 +163,7 @@ diff -up src/bin/sage.orig src/bin/sage
|
|||
# Start an interactive Sage session, this function never returns.
|
||||
interactive_sage() {
|
||||
sage_setup
|
||||
@@ -292,8 +150,6 @@ usage_advanced() {
|
||||
@@ -383,8 +249,6 @@ usage_advanced() {
|
||||
echo " --nodotsage -- run Sage without using the user's"
|
||||
echo " .sage directory: create and use a temporary"
|
||||
echo " .sage directory instead."
|
||||
|
|
@ -180,7 +172,7 @@ diff -up src/bin/sage.orig src/bin/sage
|
|||
echo " --simple-prompt -- pass the option through to IPython: use"
|
||||
echo " this option with sage-shell mode in emacs"
|
||||
if [ -n "$SAGE_SRC" -a -d "$SAGE_SRC" ]; then
|
||||
@@ -327,18 +183,9 @@ usage_advanced() {
|
||||
@@ -418,18 +282,9 @@ usage_advanced() {
|
||||
echo " environment (not Sage), passing additional"
|
||||
echo " additional options to IPython"
|
||||
echo " --jupyter [...] -- run Sage's Jupyter with given arguments"
|
||||
|
|
@ -199,7 +191,7 @@ diff -up src/bin/sage.orig src/bin/sage
|
|||
echo " --python [...], --python3 [...]"
|
||||
echo " -- run the Python 3 interpreter"
|
||||
echo " -R [...] -- run Sage's R with the given arguments"
|
||||
@@ -601,11 +448,6 @@ if [ "$1" = '-lisp' -o "$1" = '--lisp' ]
|
||||
@@ -678,11 +533,6 @@ if [ "$1" = '-lisp' -o "$1" = '--lisp' ]
|
||||
exec ecl "$@"
|
||||
fi
|
||||
|
||||
|
|
@ -211,7 +203,7 @@ diff -up src/bin/sage.orig src/bin/sage
|
|||
if [ "$1" = '-maxima' -o "$1" = '--maxima' ]; then
|
||||
shift
|
||||
maxima_cmd=$(sage-config MAXIMA 2>/dev/null)
|
||||
@@ -630,11 +472,6 @@ if [ "$1" = '-R' -o "$1" = '--R' ]; then
|
||||
@@ -707,11 +557,6 @@ if [ "$1" = '-R' -o "$1" = '--R' ]; then
|
||||
exec R "$@"
|
||||
fi
|
||||
|
||||
|
|
@ -223,19 +215,19 @@ diff -up src/bin/sage.orig src/bin/sage
|
|||
#####################################################################
|
||||
# sage --sh and sage --buildsh
|
||||
#####################################################################
|
||||
@@ -804,11 +641,6 @@ fi
|
||||
@@ -883,11 +728,6 @@ fi
|
||||
# build_sage, sage -b, sage -br, etc. could be moved to
|
||||
# build/bin/sage-site. See #29111.
|
||||
|
||||
-build_sage() {
|
||||
- maybe_sage_location
|
||||
- ( cd "$SAGE_ROOT/build/make" && $MAKE sagelib-no-deps ) || exit $?
|
||||
- ( cd "$SAGE_ROOT/build/make" && ./install sagelib-no-deps ) || exit $?
|
||||
-}
|
||||
-
|
||||
if [[ "$1" =~ ^--notebook=.* || "$1" =~ ^-n=.* || "$1" =~ ^-notebook=.* ]] ; then
|
||||
sage-cleaner &>/dev/null &
|
||||
exec sage-notebook "$@"
|
||||
@@ -819,13 +651,6 @@ if [ "$1" = "-notebook" -o "$1" = '--not
|
||||
@@ -898,13 +738,6 @@ if [ "$1" = "-notebook" -o "$1" = '--not
|
||||
exec sage-notebook "$@"
|
||||
fi
|
||||
|
||||
|
|
@ -249,12 +241,12 @@ diff -up src/bin/sage.orig src/bin/sage
|
|||
if [ -n "$SAGE_SRC" -a -d "$SAGE_SRC" ]; then
|
||||
# Source inspection facilities, supported on sage-the-distribution and on distributions
|
||||
# that package the Sage sources.
|
||||
@@ -842,40 +667,12 @@ if [ -n "$SAGE_SRC" -a -d "$SAGE_SRC" ];
|
||||
@@ -921,36 +754,11 @@ if [ -n "$SAGE_SRC" -a -d "$SAGE_SRC" ];
|
||||
fi
|
||||
fi
|
||||
|
||||
-if [ "$1" = '-b' ]; then
|
||||
- time build_sage
|
||||
- build_sage
|
||||
- exit $?
|
||||
-fi
|
||||
-
|
||||
|
|
@ -283,15 +275,22 @@ diff -up src/bin/sage.orig src/bin/sage
|
|||
- exit $?
|
||||
-fi
|
||||
-
|
||||
exec-runtests() {
|
||||
sage_setup
|
||||
export PYTHONIOENCODING="utf-8" # Fix encoding for doctests
|
||||
@@ -967,10 +775,7 @@ exec-runtests() {
|
||||
exec sage-runtests "$@"
|
||||
}
|
||||
|
||||
-if [ "$1" = '-t' -o "$1" = '-bt' -o "$1" = '-tp' -o "$1" = '-btp' ]; then
|
||||
- if [ "$1" = '-bt' -o "$1" = '-btp' ]; then
|
||||
- build_sage
|
||||
- fi
|
||||
+if [ "$1" = '-t' -o "$1" = '-tp' ]; then
|
||||
sage_setup
|
||||
export PYTHONIOENCODING="utf-8" # Fix encoding for doctests
|
||||
if [ "$1" = '-tp' -o "$1" = '-btp' ]; then
|
||||
@@ -887,16 +684,6 @@ if [ "$1" = '-t' -o "$1" = '-bt' -o "$1"
|
||||
shift
|
||||
exec-runtests -p "$@"
|
||||
@@ -980,34 +785,11 @@ if [ "$1" = '-t' -o "$1" = '-bt' -o "$1"
|
||||
fi
|
||||
fi
|
||||
|
||||
|
|
@ -300,16 +299,12 @@ diff -up src/bin/sage.orig src/bin/sage
|
|||
- build_sage
|
||||
- fi
|
||||
- shift
|
||||
- sage_setup
|
||||
- export PYTHONIOENCODING="utf-8" # Fix encoding for doctests
|
||||
- exec sage-runtests --new "$@"
|
||||
- exec-runtests --new "$@"
|
||||
-fi
|
||||
-
|
||||
if [ "$1" = '-testall' -o "$1" = "--testall" ]; then
|
||||
shift
|
||||
sage_setup
|
||||
@@ -904,21 +691,6 @@ if [ "$1" = '-testall' -o "$1" = "--test
|
||||
exec sage-runtests -a "$@"
|
||||
exec-runtests -a "$@"
|
||||
fi
|
||||
|
||||
-if [ "$1" = '-fixdoctests' -o "$1" = '--fixdoctests' ]; then
|
||||
|
|
@ -324,13 +319,13 @@ diff -up src/bin/sage.orig src/bin/sage
|
|||
-
|
||||
-if [ "$1" = "-coverageall" -o "$1" = "--coverageall" ]; then
|
||||
- shift
|
||||
- exec sage-coverageall "$@"
|
||||
- exec sage-coverage --all "$@"
|
||||
-fi
|
||||
-
|
||||
if [ "$1" = '-startuptime' -o "$1" = '--startuptime' ]; then
|
||||
exec sage-startuptime.py "$@"
|
||||
fi
|
||||
@@ -941,53 +713,6 @@ fi
|
||||
@@ -1030,59 +812,11 @@ fi
|
||||
# Creating and handling Sage distributions
|
||||
#####################################################################
|
||||
|
||||
|
|
@ -364,27 +359,11 @@ diff -up src/bin/sage.orig src/bin/sage
|
|||
- exit 1
|
||||
- fi
|
||||
- done
|
||||
- # Display a message if we actually installed something (using this
|
||||
- # file, generated by sage-spkg, is a bit of a hack though)
|
||||
- if [ -f "$SAGE_LOCAL/lib/sage-force-relocate.txt" ]; then
|
||||
- echo
|
||||
- echo "Warning: it might be needed to update the Sage library before"
|
||||
- echo "installed packages work: you should run 'make' from \$SAGE_ROOT"
|
||||
- echo "before running Sage."
|
||||
- fi
|
||||
- exit 0
|
||||
-}
|
||||
-
|
||||
-
|
||||
-if [ "$1" = '-package' -o "$1" = "--package" ]; then
|
||||
- shift
|
||||
- exec sage-package $@
|
||||
-fi
|
||||
-
|
||||
if [ "$1" = '-optional' -o "$1" = "--optional" ]; then
|
||||
if [ "$1" = '-installed' -o "$1" = "--installed" ]; then
|
||||
shift
|
||||
exec sage-list-packages optional $@
|
||||
@@ -1008,30 +733,6 @@ if [ "$1" = '-installed' -o "$1" = "--in
|
||||
exec sage-list-packages all --installed-only $@
|
||||
fi
|
||||
|
||||
|
|
@ -397,15 +376,6 @@ diff -up src/bin/sage.orig src/bin/sage
|
|||
- install "$@"
|
||||
-fi
|
||||
-
|
||||
-if [ "$1" = '-info' -o "$1" = '--info' ]; then
|
||||
- shift
|
||||
- for PKG in "$@"
|
||||
- do
|
||||
- sage-spkg --info "$PKG" || exit $?
|
||||
- done
|
||||
- exit 0
|
||||
-fi
|
||||
-
|
||||
-if [ "$1" = '-sdist' -o "$1" = "--sdist" ]; then
|
||||
- maybe_sage_location
|
||||
- shift
|
||||
|
|
@ -415,7 +385,7 @@ diff -up src/bin/sage.orig src/bin/sage
|
|||
#####################################################################
|
||||
# Debugging tools
|
||||
#####################################################################
|
||||
@@ -1075,12 +776,6 @@ if [ "$1" = '-callgrind' -o "$1" = "--ca
|
||||
@@ -1126,12 +860,6 @@ if [ "$1" = '-callgrind' -o "$1" = "--ca
|
||||
exec sage-callgrind "$@"
|
||||
fi
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue