Fix -libgap patch (bz 1672015).

Also:
- Install an SVG icon instead of a fixed size (128x128) icon.
- Require hicolor-icon-theme since we install an icon.
- Drop obsolete Obsoletes.
This commit is contained in:
Jerry James 2019-02-19 18:38:26 -07:00
parent 981d65620a
commit e64d2fa863
2 changed files with 15 additions and 11 deletions

View file

@ -6,7 +6,7 @@ diff -up src/sage/env.py.orig src/sage/env.py
_add_variable_or_fallback('ELLCURVE_DATA_DIR',opj('$SAGE_SHARE','ellcurves'))
_add_variable_or_fallback('POLYTOPE_DATA_DIR',opj('$SAGE_SHARE','reflexive_polytopes'))
-_add_variable_or_fallback('GAP_ROOT_DIR', opj('$SAGE_LOCAL','gap','latest'))
+_add_variable_or_fallback('GAP_ROOT_DIR', opj('usr','lib','gap'))
+_add_variable_or_fallback('GAP_ROOT_DIR', opj('/usr','lib','gap'))
_add_variable_or_fallback('THEBE_DIR', opj('$SAGE_SHARE','thebe'))
# locate singular shared object
@ -18,7 +18,7 @@ diff -up src/sage/interfaces/gap.py.orig src/sage/interfaces/gap.py
WORKSPACE = gap_workspace_file()
-GAP_BINARY = os.path.join(SAGE_LOCAL, 'bin', 'gap')
+GAP_BINARY = os.path.join('usr', 'bin', 'gap')
+GAP_BINARY = os.path.join('/usr', 'bin', 'gap')
first_try = True