diff --git a/sagemath-libgap.patch b/sagemath-libgap.patch index 1ba2a10..8b66516 100644 --- a/sagemath-libgap.patch +++ b/sagemath-libgap.patch @@ -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 diff --git a/sagemath.spec b/sagemath.spec index 512afdd..d0c0132 100644 --- a/sagemath.spec +++ b/sagemath.spec @@ -21,7 +21,7 @@ # not functional due to missing jar dependencies %bcond_with sage3d -# use an workaround to match upstream sagemath patched sphinx +# use a workaround to match upstream sagemath patched sphinx %bcond_without sphinx_hack # use workaround to match upstream sagemath patched cython @@ -86,7 +86,7 @@ Name: sagemath Summary: A free open-source mathematics software system Version: 8.3 -Release: 2%{?dist} +Release: 3%{?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 @@ -367,6 +367,7 @@ Requires: gap-pkg-sonata Requires: gap-pkg-toric Requires: gfan Requires: gmp-ecm +Requires: hicolor-icon-theme Requires: jmol Requires: jsmol Requires: jsmath-fonts @@ -472,7 +473,6 @@ packages into a common Python-based interface. %package core Summary: Open Source Mathematics Software Requires: %{name}%{?_isa} = %{version}-%{release} -Obsoletes: %{name}-devel < 6.8-1 %if %{with bundled_ipython} Provides: bundled(ipython) = %(cut -d- -f2- <<< %{ipython_pkg}) %endif @@ -539,7 +539,6 @@ Includes two databases: %package data-etc Summary: Extcode for Sagemath Requires: %{name}-data = %{version}-%{release} -Obsoletes: %{name}-data-extcode < %{version} BuildArch: noarch %description data-etc @@ -678,7 +677,7 @@ Summary: Several programs for working with Rubik's cubes Requires: %{name}%{?_isa} = %{version}-%{release} %description rubiks -Several programs for working with Rubik's cubes, by three different people. +Several programs for working with Rubik's cubes, by three different people. In summary the three contributors are: Michael Reid (GPL) http://www.math.ucf.edu/~reid/Rubik/optimal_solver.html @@ -1428,9 +1427,8 @@ ln -sf %{SAGE_SHARE} $SAGE_ROOT/share ln -sf src $SAGE_ROOT/devel # Install menu and icons -pushd build/pkgs/sagenb/src/sagenb/data - install -p -m644 -D sage/images/icon128x128.png %{buildroot}%{_datadir}/pixmaps/%{name}.png -popd +install -p -m644 -D src/ext/notebook-ipython/logo.svg \ + %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/sagemath.svg mkdir -p %{buildroot}%{_datadir}/applications cat > %{buildroot}%{_datadir}/applications/%{name}.desktop << EOF [Desktop Entry] @@ -1582,7 +1580,7 @@ rm -fr $DOT_SAGE %dir %{SAGE_PYTHONPATH} # GPLv2+ %{_bindir}/sage -%{_datadir}/pixmaps/%{name}.png +%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg %{_datadir}/applications/%{name}.desktop %{SAGE_SPKG_INST} %if %{with bundled_thebe} @@ -1817,6 +1815,12 @@ rm -fr $DOT_SAGE ######################################################################## %changelog +* Tue Feb 19 2019 Jerry James - 8.3-3 +- Fix -libgap patch (bz 1672015) +- Install an SVG icon instead of a fixed size (128x128) icon +- Require hicolor-icon-theme since we install an icon +- Drop obsolete Obsoletes + * Sat Jan 19 2019 Jerry James - 8.3-2 - Add -buildroot patch and only build cython interfaces once - Drop LANGUAGES variable setting, now ignored by the sagemath build system