zyppe/sagemath
1
0
Fork 0
mirror of https://src.fedoraproject.org/rpms/sagemath.git synced 2025-04-22 11:45:56 -04:00
Code Issues Projects Releases Packages Wiki Activity

Version 9.3.

Browse source 
- Drop -arb and -openblas patches.
- Add -cvxopt patch.
- Add metainfo file.
This commit is contained in:
Jerry James 2021-06-18 11:37:21 -06:00
parent 26b688d416
commit 0a1b42ef2b
21 changed files with 1096 additions and 1037 deletions
Download patch file Download diff file Expand all files Collapse all files

93
sagemath-env.patch
View file

@ -1,43 +1,56 @@
diff -up src/sage/env.py.orig src/sage/env.py
--- src/sage/env.py.orig 2020-10-30 16:09:54.834029866 -0600
+++ src/sage/env.py 2020-10-30 16:10:20.089999891 -0600
@@ -159,14 +159,14 @@ var('SAGE_DATE', version.date)
var('SAGE_VERSION_BANNER', version.banner)
--- src/sage/env.py.orig 2021-05-29 21:01:26.503474025 -0600
+++ src/sage/env.py 2021-05-29 21:03:06.389635554 -0600
@@ -166,16 +166,16 @@ SAGE_DATE = var("SAGE_DATE", version.dat
SAGE_VERSION_BANNER = var("SAGE_VERSION_BANNER", version.banner)
# bunch of sage directories and files
-var('SAGE_LOCAL', os.path.abspath(sys.prefix))
-var('SAGE_ETC', join(SAGE_LOCAL, 'etc'))
-var('SAGE_INC', join(SAGE_LOCAL, 'include'))
-var('SAGE_SHARE', join(SAGE_LOCAL, 'share'))
-var('SAGE_DOC', join(SAGE_SHARE, 'doc', 'sage'))
+var('SAGE_LOCAL', '@@SAGE_LOCAL@@')
+var('SAGE_ETC', join('/usr', 'share', 'sagemath', 'etc'))
+var('SAGE_INC', join('/usr', 'include'))
+var('SAGE_SHARE', join('/usr', 'share', 'sagemath'))
+var('SAGE_DOC', join('/usr', 'share', 'doc', 'sagemath'))
var('SAGE_SPKG_INST', join(SAGE_LOCAL, 'var', 'lib', 'sage', 'installed'))
var('SAGE_LIB', os.path.dirname(os.path.dirname(sage.__file__)))
-var('SAGE_EXTCODE', join(SAGE_LIB, 'sage', 'ext_data'))
+var('SAGE_EXTCODE', join('/usr', 'share', 'sagemath', 'etc'))
# virtual environment where sagelib is installed
-SAGE_VENV = var("SAGE_VENV", os.path.abspath(sys.prefix))
+SAGE_VENV = var("SAGE_VENV", "@@SAGE_LOCAL@@")
SAGE_LIB = var("SAGE_LIB", os.path.dirname(os.path.dirname(sage.__file__)))
-SAGE_EXTCODE = var("SAGE_EXTCODE", join(SAGE_LIB, "sage", "ext_data"))
+SAGE_EXTCODE = var("SAGE_EXTCODE", join("/usr", "share", "sagemath", "etc"))
var('SAGE_ROOT') # no fallback for SAGE_ROOT
var('SAGE_SRC', join(SAGE_ROOT, 'src'), SAGE_LIB)
@@ -187,13 +187,13 @@ var('THEBE_DIR', joi
var('COMBINATORIAL_DESIGN_DATA_DIR', join(SAGE_SHARE, 'combinatorial_designs'))
var('CREMONA_MINI_DATA_DIR', join(SAGE_SHARE, 'cremona'))
var('CREMONA_LARGE_DATA_DIR', join(SAGE_SHARE, 'cremona'))
-var('JMOL_DIR', join(SAGE_SHARE, 'jmol'))
-var('JSMOL_DIR', join(SAGE_SHARE, 'jsmol'))
-var('MATHJAX_DIR', join(SAGE_SHARE, 'mathjax'))
-var('MTXLIB', join(SAGE_SHARE, 'meataxe'))
+var('JMOL_DIR', join('/usr', 'share', 'java', 'jmol'))
+var('JSMOL_DIR', join('/usr', 'share', 'javascript', 'jsmol'))
+var('MATHJAX_DIR', join('/usr', 'share', 'javascript', 'mathjax'))
+var('MTXLIB', join(DOT_SAGE, 'meataxe'))
var('THREEJS_DIR', join(SAGE_SHARE, 'threejs'))
var('SINGULARPATH', join(SAGE_SHARE, 'singular'))
-var('PPLPY_DOCS', join(SAGE_SHARE, 'doc', 'pplpy'))
+var('PPLPY_DOCS', join('/usr', 'share', 'doc', 'python3-pplpy'))
var('MAXIMA', 'maxima')
var('MAXIMA_FAS')
var('SAGE_NAUTY_BINS_PREFIX', '')
# prefix hierarchy where non-Python packages are installed
SAGE_LOCAL = var("SAGE_LOCAL", SAGE_VENV)
-SAGE_ETC = var("SAGE_ETC", join(SAGE_LOCAL, "etc"))
-SAGE_INC = var("SAGE_INC", join(SAGE_LOCAL, "include"))
-SAGE_SHARE = var("SAGE_SHARE", join(SAGE_LOCAL, "share"))
-SAGE_DOC = var("SAGE_DOC", join(SAGE_SHARE, "doc", "sage"))
+SAGE_ETC = var("SAGE_ETC", join("/usr", "share", "sagemath", "etc"))
+SAGE_INC = var("SAGE_INC", join("/usr", "include"))
+SAGE_SHARE = var("SAGE_SHARE", join("/usr", "share", "sagemath"))
+SAGE_DOC = var("SAGE_DOC", join("/usr", "share", "doc", "sagemath"))
SAGE_SPKG_INST = var("SAGE_SPKG_INST", join(SAGE_LOCAL, "var", "lib", "sage", "installed"))
# source tree of the Sage distribution
@@ -199,12 +199,12 @@ THEBE_DIR = var("THEBE_DIR", join(SAGE_S
COMBINATORIAL_DESIGN_DATA_DIR = var("COMBINATORIAL_DESIGN_DATA_DIR", join(SAGE_SHARE, "combinatorial_designs"))
CREMONA_MINI_DATA_DIR = var("CREMONA_MINI_DATA_DIR", join(SAGE_SHARE, "cremona"))
CREMONA_LARGE_DATA_DIR = var("CREMONA_LARGE_DATA_DIR", join(SAGE_SHARE, "cremona"))
-JMOL_DIR = var("JMOL_DIR", join(SAGE_SHARE, "jmol"))
-MATHJAX_DIR = var("MATHJAX_DIR", join(SAGE_SHARE, "mathjax"))
-MTXLIB = var("MTXLIB", join(SAGE_SHARE, "meataxe"))
+JMOL_DIR = var("JMOL_DIR", join("/usr", "share", "java", "jmol"))
+MATHJAX_DIR = var("MATHJAX_DIR", join("/usr", "share", "javascript", "mathjax"))
+MTXLIB = var("MTXLIB", join(DOT_SAGE, "meataxe"))
THREEJS_DIR = var("THREEJS_DIR", join(SAGE_SHARE, "threejs"))
SINGULARPATH = var("SINGULARPATH", join(SAGE_SHARE, "singular"))
-PPLPY_DOCS = var("PPLPY_DOCS", join(SAGE_SHARE, "doc", "pplpy"))
+PPLPY_DOCS = var("PPLPY_DOCS", join("/usr", "share", "doc", "python3-pplpy"))
MAXIMA = var("MAXIMA", "maxima")
MAXIMA_FAS = var("MAXIMA_FAS")
SAGE_NAUTY_BINS_PREFIX = var("SAGE_NAUTY_BINS_PREFIX", "")
@@ -301,10 +301,10 @@ def _get_shared_lib_path(*libnames: str)
# locate singular shared object
# On Debian it's libsingular-Singular so try that as well
-SINGULAR_SO = var("SINGULAR_SO", _get_shared_lib_path("Singular", "singular-Singular"))
+SINGULAR_SO = var("SINGULAR_SO", "@@LIBDIR@@/libSingular.so")
# locate libgap shared object
-GAP_SO = var("GAP_SO", _get_shared_lib_path("gap", ""))
+GAP_SO = var("GAP_SO", "@@LIBDIR@@/libgap.so")
# post process
if ' ' in DOT_SAGE: