zyppe/sagemath
1
0
Fork 0
mirror of https://src.fedoraproject.org/rpms/sagemath.git synced 2025-04-22 19:55:54 -04:00
Code Issues Projects Releases Packages Wiki Activity

Minor changes to use same patches in OpenMandriva

Browse source
This commit is contained in:
pcpa 2014-02-19 12:40:51 -03:00
parent 2a721faf47
commit 7e4639192c
2 changed files with 18 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

14
sagemath-sagenb.patch
View file

@ -35,7 +35,7 @@ diff -up build/pkgs/sagenb/src/sagenb-0.10.8.2/sagenb/data/sage/html/notebook/ba
<script type="text/javascript" src="/java/jmol/appletweb/Jmol.js"></script> <script type="text/javascript" src="/java/jmol/appletweb/Jmol.js"></script>
<!-- This must stay in head --> <!-- This must stay in head -->
-<script>jmolInitialize("/java/jmol");jmolSetCallback("menuFile","/java/jmol/appletweb/SageMenu.mnu");</script> -<script>jmolInitialize("/java/jmol");jmolSetCallback("menuFile","/java/jmol/appletweb/SageMenu.mnu");</script>
+<script>jmolInitialize("/java/jmol", "JmolApplet.jar,vecmath.jar");</script> +<script>jmolInitialize("/java/jmol", "JmolApplet.jar,Jmol.jar,vecmath.jar");</script>
{% if JEDITABLE_TINYMCE and not worksheet.docbrowser() and not worksheet.is_published() %} {% if JEDITABLE_TINYMCE and not worksheet.docbrowser() and not worksheet.is_published() %}
<!-- TinyMCE and jEditable - in-place editing of text cells --> <!-- TinyMCE and jEditable - in-place editing of text cells -->
@ -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): def save_notebook(notebook):
print "Quitting all running worksheets..." 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']

5
sagemath.spec
View file

@ -664,6 +664,10 @@ sed -e 's|@@SAGE_ROOT@@|%{SAGE_ROOT}|' \
-e 's|@@SAGE_DOC@@|%{SAGE_DOC}|' \ -e 's|@@SAGE_DOC@@|%{SAGE_DOC}|' \
-i src/sage/env.py -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 # ensure proper/preferred libatlas is in linker path
perl -pi -e 's|^(extra_link_args = ).*|$1\["-L%{_libdir}/atlas"\]|;' src/sage/misc/cython.py 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 # Use symlinks and a minor patch to the notebook to not bundle jmol
%post notebook %post notebook
ln -sf %{_javadir}/JmolApplet.jar %{python_sitearch}/sagenb/data/jmol/ 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/ ln -sf %{_javadir}/vecmath.jar %{python_sitearch}/sagenb/data/jmol/
exit 0 exit 0