mirror of
https://src.fedoraproject.org/rpms/sagemath.git
synced 2025-04-04 04:28:51 -04:00
Also: - Drop upstreamed patches: -fes-build, -python3.11 - Add patches: -catch-value, -gap-split-root, -bind2nd, -mem-fun-ref
46 lines
2.6 KiB
Diff
46 lines
2.6 KiB
Diff
diff -up src/sage/env.py.orig src/sage/env.py
|
|
--- src/sage/env.py.orig 2023-01-15 17:04:08.814627154 -0700
|
|
+++ src/sage/env.py 2023-01-15 17:17:20.339009783 -0700
|
|
@@ -166,15 +166,15 @@ SAGE_DATE = var("SAGE_DATE", version.dat
|
|
SAGE_VERSION_BANNER = var("SAGE_VERSION_BANNER", version.banner)
|
|
|
|
# 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(__file__)))
|
|
-SAGE_EXTCODE = var("SAGE_EXTCODE", join(SAGE_LIB, "sage", "ext_data"))
|
|
+SAGE_EXTCODE = var("SAGE_EXTCODE", join("/usr", "share", "sagemath", "etc"))
|
|
SAGE_VENV_SPKG_INST = var("SAGE_VENV_SPKG_INST", join(SAGE_VENV, "var", "lib", "sage", "installed"))
|
|
|
|
# prefix hierarchy where non-Python packages are installed
|
|
SAGE_LOCAL = var("SAGE_LOCAL", SAGE_VENV)
|
|
-SAGE_SHARE = var("SAGE_SHARE", join(SAGE_LOCAL, "share"))
|
|
-SAGE_DOC = var("SAGE_DOC", join(SAGE_SHARE, "doc", "sage"))
|
|
+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
|
|
@@ -202,16 +202,16 @@ 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-sage"))
|
|
-PPLPY_DOCS = var("PPLPY_DOCS", join(SAGE_SHARE, "doc", "pplpy"))
|
|
+PPLPY_DOCS = var("PPLPY_DOCS", join("/usr", "share", "doc", "python3-pplpy-devel"))
|
|
MAXIMA = var("MAXIMA", "maxima")
|
|
MAXIMA_FAS = var("MAXIMA_FAS")
|
|
KENZO_FAS = var("KENZO_FAS")
|
|
-SAGE_NAUTY_BINS_PREFIX = var("SAGE_NAUTY_BINS_PREFIX", "")
|
|
-RUBIKS_BINS_PREFIX = var("RUBIKS_BINS_PREFIX", "")
|
|
+SAGE_NAUTY_BINS_PREFIX = var("SAGE_NAUTY_BINS_PREFIX", "nauty-")
|
|
+RUBIKS_BINS_PREFIX = var("RUBIKS_BINS_PREFIX", "rubiks_")
|
|
FOURTITWO_HILBERT = var("FOURTITWO_HILBERT")
|
|
FOURTITWO_MARKOV = var("FOURTITWO_MARKOV")
|
|
FOURTITWO_GRAVER = var("FOURTITWO_GRAVER")
|