diff --git a/sagemath.spec b/sagemath.spec index 47096fb..b9237e3 100644 --- a/sagemath.spec +++ b/sagemath.spec @@ -11,6 +11,9 @@ %bcond_without bundled_widgetsnbextension %bcond_without install_hack +# jmol has been retired from Fedora; set this if it ever comes back +%bcond_with jmol + # for faster full rpm test builds %ifarch %{ix86} x86_64 %bcond_without docs @@ -91,7 +94,7 @@ Name: sagemath Summary: A free open-source mathematics software system Version: 9.0 -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 @@ -267,10 +270,12 @@ BuildRequires: gmp-ecm-devel BuildRequires: gsl-devel BuildRequires: ImageMagick BuildRequires: iml-devel +%if %{with jmol} BuildRequires: jmol -BuildRequires: jsmath-fonts # To have a proper link BuildRequires: jsmol +%endif +BuildRequires: jsmath-fonts BuildRequires: L-function-devel BuildRequires: lapack-devel BuildRequires: latte-integrale @@ -439,9 +444,11 @@ Requires: gap-pkg-toric Requires: gap-pkg-utils Requires: gfan Requires: gmp-ecm +%if %{with jmol} Requires: jmol -Requires: jsmath-fonts Requires: jsmol +%endif +Requires: jsmath-fonts Requires: latte-integrale Requires: lrslib-utils Requires: mathjax @@ -1168,7 +1175,9 @@ pushd src/bin mkdir -p $SAGE_LOCAL/bin cp -fa sage-* $SAGE_LOCAL/bin pushd $SAGE_LOCAL/bin +%if %{with jmol} ln -sf %{_bindir}/jmol jmol +%endif ln -sf %{_bindir}/python3 sage.bin ln -sf %{_bindir}/python3 python ln -sf %{_bindir}/gp sage_pari @@ -1619,7 +1628,9 @@ rm -fr %{SAGE_LOCAL}/var/lib/sage/installed/database_cremona_ellcurve-%{cremona_ %{SAGE_LOCAL}/bin/QuadraticSieve %{SAGE_LOCAL}/bin/ecm %{SAGE_LOCAL}/bin/gap +%if %{with jmol} %{SAGE_LOCAL}/bin/jmol +%endif %if %{with bundled_ipython} %{SAGE_LOCAL}/bin/ip* %endif @@ -1814,6 +1825,9 @@ rm -fr %{SAGE_LOCAL}/var/lib/sage/installed/database_cremona_ellcurve-%{cremona_ ######################################################################## %changelog +* Mon Apr 27 2020 Jerry James - 9.0-3 +- Build without jmol/jsmol support due to retirement of jmol from Fedora + * Fri Mar 13 2020 Jerry James - 9.0-2 - Rebuild for gap 4.11.0 - Update libgap interface for gap 4.11.0