diff --git a/sagemath-qepcad.patch b/sagemath-qepcad.patch new file mode 100644 index 0000000..829fe9d --- /dev/null +++ b/sagemath-qepcad.patch @@ -0,0 +1,53 @@ +diff -up src/sage/interfaces/qepcad.py.orig src/sage/interfaces/qepcad.py +--- src/sage/interfaces/qepcad.py.orig 2015-07-19 15:07:33.423329719 -0300 ++++ src/sage/interfaces/qepcad.py 2015-07-19 15:07:50.294330365 -0300 +@@ -522,8 +522,8 @@ TESTS: + + Check the qepcad configuration file:: + +- sage: open('%s/default.qepcadrc'%SAGE_LOCAL).readlines()[-1] +- 'SINGULAR .../local/bin\n' ++ sage: open('/usr/share/qepcad/default.qepcadrc').readlines()[-1] ++ 'SINGULAR /usr/bin\n' + + AUTHORS: + +@@ -550,6 +550,8 @@ from sage.repl.preparse import implicit_ + + from expect import Expect, ExpectFunction, AsciiArtString + ++QEPCAD_LOCAL = "/usr/share/qepcad" ++ + def _qepcad_cmd(memcells=None): + r""" + Construct a QEPCAD command line. +@@ -560,17 +562,17 @@ def _qepcad_cmd(memcells=None): + + sage: from sage.interfaces.qepcad import _qepcad_cmd + sage: s = _qepcad_cmd() +- sage: s == 'env qe=%s qepcad '%SAGE_LOCAL ++ sage: s == 'env qe=/usr/share/qepcad qepcad ' + True + sage: s = _qepcad_cmd(memcells=8000000) +- sage: s == 'env qe=%s qepcad +N8000000'%SAGE_LOCAL ++ sage: s == 'env qe=/usr/share/qepcad qepcad +N8000000' + True + """ + if memcells is not None: + memcells_arg = '+N%s' % memcells + else: + memcells_arg = '' +- return "env qe=%s qepcad %s"%(SAGE_LOCAL, memcells_arg) ++ return "env qe=%s qepcad %s"%(QEPCAD_LOCAL, memcells_arg) + + _command_info_cache = None + +@@ -595,7 +597,7 @@ def _update_command_info(): + + cache = {} + +- with open('%s/bin/qepcad.help'%SAGE_LOCAL) as help: ++ with open('%s/bin/qepcad.help'%QEPCAD_LOCAL) as help: + assert(help.readline().strip() == '@') + + while True: diff --git a/sagemath.spec b/sagemath.spec index e6c8f60..5cf5bb2 100644 --- a/sagemath.spec +++ b/sagemath.spec @@ -42,7 +42,7 @@ Name: sagemath Group: Applications/Engineering Summary: A free open-source mathematics software system Version: 6.5 -Release: 6%{?dist} +Release: 7%{?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 @@ -154,6 +154,10 @@ Patch25: %{name}-ipython3.patch # Fix a changed interface in NTL 9.x Patch26: %{name}-ntl9.patch +# Correct unable to start QEPCAD within sage +# https://bugzilla.redhat.com/show_bug.cgi?id=1243590 +Patch27: %{name}-qepcad.patch + BuildRequires: 4ti2 BuildRequires: atlas-devel BuildRequires: cddlib-tools @@ -270,6 +274,7 @@ Requires: python-twisted Requires: python-twisted-mail Requires: python-twisted-web Requires: python-ZODB3 +Requires: qepcad-B Requires: R Requires: rpy Requires: %{name}-core @@ -636,6 +641,7 @@ popd %patch24 %patch25 %patch26 +%patch27 sed -e 's|@@SAGE_ROOT@@|%{SAGE_ROOT}|' \ -e 's|@@SAGE_DOC@@|%{SAGE_DOC}|' \ @@ -1362,6 +1368,9 @@ exit 0 ######################################################################## %changelog +* Sun Jul 19 2015 pcpa - 6.5-7 +- Correct unable to start QEPCAD within sage (#1243590) + * Fri Jun 19 2015 Fedora Release Engineering - 6.5-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild