diff --git a/sagemath-sagenb.patch b/sagemath-sagenb.patch index 435c01a..7785686 100644 --- a/sagemath-sagenb.patch +++ b/sagemath-sagenb.patch @@ -35,7 +35,7 @@ diff -up build/pkgs/sagenb/src/sagenb-0.10.8.2/sagenb/data/sage/html/notebook/ba - -+ ++ {% if JEDITABLE_TINYMCE and not worksheet.docbrowser() and not worksheet.is_published() %} @@ -113,3 +113,15 @@ diff -up build/pkgs/sagenb/src/sagenb-0.10.8.2/sagenb/notebook/run_notebook.py.o def save_notebook(notebook): print "Quitting all running worksheets..." +--- build/pkgs/sagenb/src/sagenb-0.10.8.2/sagenb/misc/misc.py.orig 2014-02-19 12:22:25.360997774 -0300 ++++ build/pkgs/sagenb/src/sagenb-0.10.8.2/sagenb/misc/misc.py 2014-02-19 12:26:01.260011849 -0300 +@@ -174,7 +174,8 @@ def pad_zeros(s, size=3): + + SAGENB_ROOT = os.path.split(resource_filename(__name__, ''))[0] + +-DATA = os.path.join(SAGENB_ROOT, 'data') ++from sage.misc.misc import SAGE_SRC ++DATA = os.path.join(SAGE_SRC, 'sagenb', 'data') + + if os.environ.has_key('DOT_SAGENB'): + DOT_SAGENB = os.environ['DOT_SAGENB'] diff --git a/sagemath.spec b/sagemath.spec index e7861eb..3d7d2f4 100644 --- a/sagemath.spec +++ b/sagemath.spec @@ -664,6 +664,10 @@ sed -e 's|@@SAGE_ROOT@@|%{SAGE_ROOT}|' \ -e 's|@@SAGE_DOC@@|%{SAGE_DOC}|' \ -i src/sage/env.py +sed -e "s|, 'flask-oldsessions>=0.10'||" \ + -e "s|'http://github.com/mitsuhiko/flask-oldsessions/tarball/master#egg=flask-oldsessions-0.10'||" \ + -i build/pkgs/sagenb/src/%{sagenb_pkg}/setup.py + #------------------------------------------------------------------------ # ensure proper/preferred libatlas is in linker path perl -pi -e 's|^(extra_link_args = ).*|$1\["-L%{_libdir}/atlas"\]|;' src/sage/misc/cython.py @@ -1126,6 +1130,7 @@ exit 0 # Use symlinks and a minor patch to the notebook to not bundle jmol %post notebook ln -sf %{_javadir}/JmolApplet.jar %{python_sitearch}/sagenb/data/jmol/ +ln -sf %{_javadir}/Jmol.jar %{python_sitearch}/sagenb/data/jmol/ ln -sf %{_javadir}/vecmath.jar %{python_sitearch}/sagenb/data/jmol/ exit 0