diff --git a/sagemath.spec b/sagemath.spec index c521ba1..4265de0 100644 --- a/sagemath.spec +++ b/sagemath.spec @@ -39,7 +39,7 @@ Name: sagemath Group: Applications/Engineering Summary: A free open-source mathematics software system Version: 6.4.1 -Release: 3%{?dist} +Release: 4%{?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 @@ -173,6 +173,8 @@ BuildRequires: glpk-devel BuildRequires: gnutls-devel BuildRequires: gsl-devel BuildRequires: iml-devel +# To have a proper link +BuildRequires: jsmol BuildRequires: L-function-devel BuildRequires: libfac-devel BuildRequires: libfplll-devel @@ -220,6 +222,8 @@ BuildRequires: sympow BuildRequires: sympy BuildRequires: symmetrica-devel BuildRequires: texlive +# For _jsdir macro +BuildRequires: web-assets-devel BuildRequires: zn_poly-devel Requires: 4ti2 @@ -238,6 +242,7 @@ Requires: genus2reduction Requires: gfan Requires: gmp-ecm Requires: jmol +Requires: jsmol Requires: jsmath-fonts Requires: lrslib-utils Requires: maxima-gui @@ -741,17 +746,8 @@ popd pushd build/pkgs/sagenb/src/%{sagenb_pkg} rm -f %{buildroot}%{python_sitearch}/sagenb/data/sage3d/sage3d python setup.py install --root=%{buildroot} --install-purelib=%{python_sitearch} - - # jmol - ### FIXME waiting on https://bugzilla.redhat.com/show_bug.cgi?id=1108060 - # To get it to work you need to get the sagemath jmol spkg or an - # upstream sagemath install, example: - # cp -fr ~/sage-6.4.1-x86_64-Linux/local/share/jmol /usr/share/sagemath - # cp -fr ~/sage-6.4.1-x86_64-Linux/local/share/jsmol /usr/share/sagemath - - mkdir -p $SAGE_SHARE/jmol - mkdir -p $SAGE_SHARE/jsmol/ - + # jsmol + ln -sf %{_jsdir}/jsmol $SAGE_SHARE/jsmol # sage3d rm -f %{buildroot}%{_bindir}/sage3d %if %{with_sage3d} @@ -1236,8 +1232,7 @@ exit 0 # ASL 2.0 %{python_sitearch}/sagenb/data/highlight # LGPLv2+ -%{SAGE_SHARE}/jmol/ -%{SAGE_SHARE}/jsmol/ +%{SAGE_SHARE}/jsmol # (MIT or GPLv2) and (MIT and BSD and GPL) %{python_sitearch}/sagenb/data/jquery # (MIT or GPLv2) and (MIT and BSD and GPL) @@ -1309,6 +1304,9 @@ exit 0 ######################################################################## %changelog +* Sat Feb 7 2015 pcpa - 6.4.1-4 +- Rebuild with a functional jsmol interface (#1190356) + * Mon Feb 2 2015 Jerry James - 6.4.1-3 - Rebuild for ntl 8.1.2