[sagemath] Update to sagemath 5.10.
pcpa
pcpa at fedoraproject.org
Mon Aug 5 21:34:55 UTC 2013
commit 4c97a63e194b00b99d1bd8defad03f5e101c8347
Author: pcpa <paulo.cesar.pereira.de.andrade at gmail.com>
Date: Mon Aug 5 18:34:44 2013 -0300
Update to sagemath 5.10.
.gitignore | 1 +
sagemath-4ti2.patch | 6 +-
sagemath-cbc.patch | 94 ++----------------------------------------
sagemath-cremona.patch | 6 +-
sagemath-cryptominisat.patch | 8 ++--
sagemath-ecl-unicode.patch | 12 +++---
sagemath-extensions.patch | 8 ++--
sagemath-fes.patch | 8 ++--
sagemath-flask.patch | 32 ++++++++++++++
sagemath-fplll.patch | 14 +++---
sagemath-gap-hap.patch | 8 ++--
sagemath-gmp.patch | 4 +-
sagemath-jmol.patch | 6 +-
sagemath-libgap.patch | 6 +-
sagemath-libmpc.patch | 12 +++---
sagemath-lrcalc.patch | 8 ++--
sagemath-lrslib.patch | 6 +-
sagemath-m4rie.patch | 8 ++--
sagemath-maxima.patch | 16 ++++----
sagemath-maxima.system.patch | 6 +-
sagemath-nauty.patch | 13 +++---
sagemath-nolibgap.patch | 10 ++--
sagemath-nopari2.6.patch | 14 +++---
sagemath-ntl6.patch | 37 +++++++++--------
sagemath-pari.patch | 16 ++++----
sagemath-png.patch | 16 ++++----
sagemath-readonly.patch | 6 +-
sagemath-rh_bz_961372.patch | 8 ++--
sagemath-rpmbuild.patch | 74 +++++++++++++++-----------------
sagemath-sagedoc.patch | 36 ++++++++--------
sagemath-sagenb.patch | 30 +++++++-------
sagemath-scons.patch | 6 +-
sagemath-scripts.patch | 90 ++++++++++++++++++----------------------
sagemath-unpatched_ntl.patch | 18 ++++----
sagemath.spec | 38 ++++++++++++-----
sources | 2 +-
36 files changed, 318 insertions(+), 365 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 1590f75..e4b18c8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/sage-5.8.tar
/sage-5.9.tar
+/sage-5.10.tar
diff --git a/sagemath-4ti2.patch b/sagemath-4ti2.patch
index b3e95ab..7d0a5dd 100644
--- a/sagemath-4ti2.patch
+++ b/sagemath-4ti2.patch
@@ -1,6 +1,6 @@
-diff -up sage-5.9/spkg/build/sage-5.9/sage/sandpiles/sandpile.py.orig sage-5.9/spkg/build/sage-5.9/sage/sandpiles/sandpile.py
---- sage-5.9/spkg/build/sage-5.9/sage/sandpiles/sandpile.py.orig 2013-05-06 13:50:14.882749079 -0300
-+++ sage-5.9/spkg/build/sage-5.9/sage/sandpiles/sandpile.py 2013-05-06 13:50:34.526749831 -0300
+diff -up sage-5.10/spkg/build/sage-5.10/sage/sandpiles/sandpile.py.orig sage-5.10/spkg/build/sage-5.10/sage/sandpiles/sandpile.py
+--- sage-5.10/spkg/build/sage-5.10/sage/sandpiles/sandpile.py.orig 2013-05-06 13:50:14.882749079 -0300
++++ sage-5.10/spkg/build/sage-5.10/sage/sandpiles/sandpile.py 2013-05-06 13:50:34.526749831 -0300
@@ -24,8 +24,6 @@ packages. An alternative is to install
following variable to the correct path.
"""
diff --git a/sagemath-cbc.patch b/sagemath-cbc.patch
index 27b6357..af5dcef 100644
--- a/sagemath-cbc.patch
+++ b/sagemath-cbc.patch
@@ -1,7 +1,7 @@
-diff -up sage-5.9/spkg/build/sage-5.9/module_list.py.orig sage-5.9/spkg/build/sage-5.9/module_list.py
---- sage-5.9/spkg/build/sage-5.9/module_list.py.orig 2013-05-06 14:18:02.386812933 -0300
-+++ sage-5.9/spkg/build/sage-5.9/module_list.py 2013-05-06 14:18:07.352813123 -0300
-@@ -2021,7 +2021,7 @@ if (os.path.isfile(SAGE_INC + "/cplex.h"
+diff -up sage-5.10/spkg/build/sage-5.10/module_list.py.orig sage-5.10/spkg/build/sage-5.10/module_list.py
+--- sage-5.10/spkg/build/sage-5.10/module_list.py.orig 2013-07-29 20:05:39.844079175 -0300
++++ sage-5.10/spkg/build/sage-5.10/module_list.py 2013-07-29 20:05:59.925079944 -0300
+@@ -2007,7 +2007,7 @@ if (os.path.isfile(SAGE_INC + "/cplex.h"
libraries = ["csage", "stdc++", "cplex"])
)
@@ -10,89 +10,3 @@ diff -up sage-5.9/spkg/build/sage-5.9/module_list.py.orig sage-5.9/spkg/build/sa
ext_modules.append(
Extension("sage.numerical.backends.coin_backend",
["sage/numerical/backends/coin_backend.pyx"],
-diff -up sage-5.9/spkg/build/sage-5.9/sage/numerical/backends/coin_backend.pxd.orig sage-5.9/spkg/build/sage-5.9/sage/numerical/backends/coin_backend.pxd
---- sage-5.9/spkg/build/sage-5.9/sage/numerical/backends/coin_backend.pxd.orig 2013-05-06 14:18:23.609813746 -0300
-+++ sage-5.9/spkg/build/sage-5.9/sage/numerical/backends/coin_backend.pxd 2013-05-06 14:19:37.702816583 -0300
-@@ -22,23 +22,23 @@ from libcpp cimport bool
- cdef extern from *:
- ctypedef double* const_double_ptr "const double*"
-
--cdef extern from "../../local/include/coin/CbcStrategy.hpp":
-+cdef extern from "coin/CbcStrategy.hpp":
- cdef cppclass CbcStrategy:
- pass
- cdef cppclass CbcStrategyDefault(CbcStrategy):
- CbcStrategyDefault()
-
--cdef extern from "../../local/include/coin/CoinPackedVectorBase.hpp":
-+cdef extern from "coin/CoinPackedVectorBase.hpp":
- cdef cppclass CoinPackedVectorBase:
- pass
-
--cdef extern from "../../local/include/coin/CoinPackedVector.hpp":
-+cdef extern from "coin/CoinPackedVector.hpp":
- cdef cppclass CoinPackedVector(CoinPackedVectorBase):
- void insert(float, float)
- CoinPackedVector *new_CoinPackedVector "new CoinPackedVector" ()
- void del_CoinPackedVector "delete" (CoinPackedVector *)
-
--cdef extern from "../../local/include/coin/CoinShallowPackedVector.hpp":
-+cdef extern from "coin/CoinShallowPackedVector.hpp":
- cdef cppclass CoinShallowPackedVector:
- void insert(float, float)
- int * getIndices ()
-@@ -47,7 +47,7 @@ cdef extern from "../../local/include/co
- CoinShallowPackedVector *new_CoinShallowPackedVector "new CoinShallowPackedVector" ()
- void del_CoinShallowPackedVector "delete" (CoinShallowPackedVector *)
-
--cdef extern from "../../local/include/coin/CoinPackedMatrix.hpp":
-+cdef extern from "coin/CoinPackedMatrix.hpp":
- cdef cppclass CoinPackedMatrix:
- void setDimensions(int, int)
- void appendRow(CoinPackedVector)
-@@ -55,7 +55,7 @@ cdef extern from "../../local/include/co
- CoinPackedMatrix *new_CoinPackedMatrix "new CoinPackedMatrix" (bool, double, double)
- void del_CoinPackedMatrix "delete" (CoinPackedMatrix *)
-
--cdef extern from "../../local/include/coin/CoinMessageHandler.hpp":
-+cdef extern from "coin/CoinMessageHandler.hpp":
- cdef cppclass CoinMessageHandler:
- void setLogLevel (int)
- int LogLevel ()
-@@ -63,11 +63,11 @@ cdef extern from "../../local/include/co
- void del_CoinMessageHandler "delete" (CoinMessageHandler *)
-
-
--cdef extern from "../../local/include/coin/OsiSolverParameters.hpp":
-+cdef extern from "coin/OsiSolverParameters.hpp":
- cdef enum OsiIntParam:
- OsiMaxNumIteration = 0, OsiMaxNumIterationHotStart, OsiNameDiscipline, OsiLastIntParam
-
--cdef extern from "../../local/include/coin/OsiSolverInterface.hpp":
-+cdef extern from "coin/OsiSolverInterface.hpp":
-
- cdef cppclass OsiSolverInterface:
-
-@@ -130,7 +130,7 @@ cdef extern from "../../local/include/co
- # miscellaneous
- double getInfinity()
-
--cdef extern from "../../local/include/coin/CbcModel.hpp":
-+cdef extern from "coin/CbcModel.hpp":
- cdef cppclass CbcModel:
- # default constructor
- CbcModel()
-@@ -160,11 +160,11 @@ cdef extern from "../../local/include/co
- CbcModel *new_CbcModel "new CbcModel" ()
- void del_CbcModel "delete" (CbcModel *)
-
--cdef extern from "../../local/include/coin/ClpSimplex.hpp":
-+cdef extern from "coin/ClpSimplex.hpp":
- cdef cppclass ClpSimplex:
- void setNumberThreads(int)
-
--cdef extern from "../../local/include/coin/OsiClpSolverInterface.hpp":
-+cdef extern from "coin/OsiClpSolverInterface.hpp":
-
- cdef cppclass OsiClpSolverInterface(OsiSolverInterface):
-
diff --git a/sagemath-cremona.patch b/sagemath-cremona.patch
index 3b8f19d..5e9220e 100644
--- a/sagemath-cremona.patch
+++ b/sagemath-cremona.patch
@@ -1,6 +1,6 @@
-diff -up sage-5.9/spkg/build/sage-5.9/sage/databases/cremona.py.orig sage-5.9/spkg/build/sage-5.9/sage/databases/cremona.py
---- sage-5.9/spkg/build/sage-5.9/sage/databases/cremona.py.orig 2013-02-22 17:33:50.579875129 -0300
-+++ sage-5.9/spkg/build/sage-5.9/sage/databases/cremona.py 2013-02-22 17:34:05.051875683 -0300
+diff -up sage-5.10/spkg/build/sage-5.10/sage/databases/cremona.py.orig sage-5.10/spkg/build/sage-5.10/sage/databases/cremona.py
+--- sage-5.10/spkg/build/sage-5.10/sage/databases/cremona.py.orig 2013-02-22 17:33:50.579875129 -0300
++++ sage-5.10/spkg/build/sage-5.10/sage/databases/cremona.py 2013-02-22 17:34:05.051875683 -0300
@@ -889,14 +889,9 @@ class MiniCremonaDatabase(SQLDatabase):
if N < self.largest_conductor():
message = "There is no elliptic curve with label " + label \
diff --git a/sagemath-cryptominisat.patch b/sagemath-cryptominisat.patch
index 78f5c61..829ee6f 100644
--- a/sagemath-cryptominisat.patch
+++ b/sagemath-cryptominisat.patch
@@ -1,7 +1,7 @@
-diff -up sage-5.9/spkg/build/sage-5.9/module_list.py.orig sage-5.9/spkg/build/sage-5.9/module_list.py
---- sage-5.9/spkg/build/sage-5.9/module_list.py.orig 2013-05-06 16:47:00.734155214 -0300
-+++ sage-5.9/spkg/build/sage-5.9/module_list.py 2013-05-06 16:47:19.820155945 -0300
-@@ -2031,7 +2031,7 @@ if is_package_installed('cbc'):
+diff -up sage-5.10/spkg/build/sage-5.10/module_list.py.orig sage-5.10/spkg/build/sage-5.10/module_list.py
+--- sage-5.10/spkg/build/sage-5.10/module_list.py.orig 2013-07-29 20:09:16.498087472 -0300
++++ sage-5.10/spkg/build/sage-5.10/module_list.py 2013-07-29 20:09:30.624088013 -0300
+@@ -2017,7 +2017,7 @@ if 1:
)
diff --git a/sagemath-ecl-unicode.patch b/sagemath-ecl-unicode.patch
index 0d7d6b8..a7c8fc2 100644
--- a/sagemath-ecl-unicode.patch
+++ b/sagemath-ecl-unicode.patch
@@ -1,6 +1,6 @@
-diff -up sage-5.9/spkg/build/sage-5.9/sage/libs/ecl.pxd.orig sage-5.9/spkg/build/sage-5.9/sage/libs/ecl.pxd
---- sage-5.9/spkg/build/sage-5.9/sage/libs/ecl.pxd.orig 2013-03-19 16:11:17.358705144 -0300
-+++ sage-5.9/spkg/build/sage-5.9/sage/libs/ecl.pxd 2013-03-19 16:11:27.719705541 -0300
+diff -up sage-5.10/spkg/build/sage-5.10/sage/libs/ecl.pxd.orig sage-5.10/spkg/build/sage-5.10/sage/libs/ecl.pxd
+--- sage-5.10/spkg/build/sage-5.10/sage/libs/ecl.pxd.orig 2013-03-19 16:11:17.358705144 -0300
++++ sage-5.10/spkg/build/sage-5.10/sage/libs/ecl.pxd 2013-03-19 16:11:27.719705541 -0300
@@ -133,6 +133,7 @@ cdef extern from "ecl/ecl.h":
cl_object ecl_read_from_cstring_safe(char *s, cl_object err)
cl_object cl_write_to_string(cl_narg narg, cl_object o)
@@ -9,9 +9,9 @@ diff -up sage-5.9/spkg/build/sage-5.9/sage/libs/ecl.pxd.orig sage-5.9/spkg/build
# S-expr evaluation and function calls
-diff -up sage-5.9/spkg/build/sage-5.9/sage/libs/ecl.pyx.orig sage-5.9/spkg/build/sage-5.9/sage/libs/ecl.pyx
---- sage-5.9/spkg/build/sage-5.9/sage/libs/ecl.pyx.orig 2013-03-19 16:11:07.489704766 -0300
-+++ sage-5.9/spkg/build/sage-5.9/sage/libs/ecl.pyx 2013-03-19 16:11:27.719705541 -0300
+diff -up sage-5.10/spkg/build/sage-5.10/sage/libs/ecl.pyx.orig sage-5.10/spkg/build/sage-5.10/sage/libs/ecl.pyx
+--- sage-5.10/spkg/build/sage-5.10/sage/libs/ecl.pyx.orig 2013-03-19 16:11:07.489704766 -0300
++++ sage-5.10/spkg/build/sage-5.10/sage/libs/ecl.pyx 2013-03-19 16:11:27.719705541 -0300
@@ -238,17 +238,19 @@ cdef cl_object ecl_safe_eval(cl_object f
...
RuntimeError: ECL says: Console interrupt.
diff --git a/sagemath-extensions.patch b/sagemath-extensions.patch
index 13d446f..6ff4114 100644
--- a/sagemath-extensions.patch
+++ b/sagemath-extensions.patch
@@ -1,7 +1,7 @@
-diff -up sage-5.9/spkg/build/sage-5.9/module_list.py.orig sage-5.9/spkg/build/sage-5.9/module_list.py
---- sage-5.9/spkg/build/sage-5.9/module_list.py.orig 2013-05-06 12:26:26.802556536 -0300
-+++ sage-5.9/spkg/build/sage-5.9/module_list.py 2013-05-06 12:26:39.837557035 -0300
-@@ -1975,7 +1975,8 @@ ext_modules = [
+diff -up sage-5.10/spkg/build/sage-5.10/module_list.py.orig sage-5.10/spkg/build/sage-5.10/module_list.py
+--- sage-5.10/spkg/build/sage-5.10/module_list.py.orig 2013-07-29 19:41:05.473022716 -0300
++++ sage-5.10/spkg/build/sage-5.10/module_list.py 2013-07-29 19:41:22.814023380 -0300
+@@ -1961,7 +1961,8 @@ ext_modules = [
# These extensions are to be compiled only if the
# corresponding packages have been installed
diff --git a/sagemath-fes.patch b/sagemath-fes.patch
index e13644b..fc4f1a4 100644
--- a/sagemath-fes.patch
+++ b/sagemath-fes.patch
@@ -1,7 +1,7 @@
-diff -up sage-5.9/spkg/build/sage-5.9/module_list.py.orig sage-5.9/spkg/build/sage-5.9/module_list.py
---- sage-5.9/spkg/build/sage-5.9/module_list.py.orig 2013-03-19 18:13:55.457986912 -0300
-+++ sage-5.9/spkg/build/sage-5.9/module_list.py 2013-03-19 18:14:03.785987230 -0300
-@@ -1988,7 +1988,7 @@ ext_modules = [
+diff -up sage-5.10/spkg/build/sage-5.10/module_list.py.orig sage-5.10/spkg/build/sage-5.10/module_list.py
+--- sage-5.10/spkg/build/sage-5.10/module_list.py.orig 2013-07-29 20:07:59.033084505 -0300
++++ sage-5.10/spkg/build/sage-5.10/module_list.py 2013-07-29 20:08:09.815084918 -0300
+@@ -1966,7 +1966,7 @@ ext_modules = [
def is_package_installed(name):
return False
diff --git a/sagemath-flask.patch b/sagemath-flask.patch
new file mode 100644
index 0000000..14992a8
--- /dev/null
+++ b/sagemath-flask.patch
@@ -0,0 +1,32 @@
+diff -up sage-5.10/spkg/build/sagenb-0.10.4/src/sagenb/flask_version/base.py.orig sage-5.10/spkg/build/sagenb-0.10.4/src/sagenb/flask_version/base.py
+--- sage-5.10/spkg/build/sagenb-0.10.4/src/sagenb/flask_version/base.py.orig 2013-07-30 17:57:58.985060198 -0300
++++ sage-5.10/spkg/build/sagenb-0.10.4/src/sagenb/flask_version/base.py 2013-07-30 17:58:31.958061460 -0300
+@@ -55,28 +55,6 @@ class SageNBFlask(Flask):
+ endpoint='/static'+base_url,
+ view_func=partial(self.static_view_func, root_path))
+
+- def save_session(self, session, response):
+- """
+- This method needs to stay in sync with the version in Flask.
+- The only modification made to it is the ``httponly=False``
+- passed to ``save_cookie``.
+-
+- Saves the session if it needs updates. For the default
+- implementation, check :meth:`open_session`.
+-
+- :param session: the session to be saved (a
+- :class:`~werkzeug.contrib.securecookie.SecureCookie`
+- object)
+- :param response: an instance of :attr:`response_class`
+- """
+- expires = domain = None
+- if session.permanent:
+- expires = datetime.utcnow() + self.permanent_session_lifetime
+- if self.config['SERVER_NAME'] is not None:
+- domain = '.' + self.config['SERVER_NAME']
+- session.save_cookie(response, self.session_cookie_name,
+- expires=expires, httponly=False, domain=domain)
+-
+ def message(self, msg, cont='/', username=None, **kwds):
+ """Returns an error message to the user."""
+ template_dict = {'msg': msg, 'cont': cont, 'username': username}
diff --git a/sagemath-fplll.patch b/sagemath-fplll.patch
index c67be9b..70a32c2 100644
--- a/sagemath-fplll.patch
+++ b/sagemath-fplll.patch
@@ -1,7 +1,7 @@
-diff -up sage-5.9/spkg/build/sage-5.9/module_list.py.orig sage-5.9/spkg/build/sage-5.9/module_list.py
---- sage-5.9/spkg/build/sage-5.9/module_list.py.orig 2013-05-06 13:59:12.394769662 -0300
-+++ sage-5.9/spkg/build/sage-5.9/module_list.py 2013-05-06 13:59:23.359770082 -0300
-@@ -647,6 +647,7 @@ ext_modules = [
+diff -up sage-5.10/spkg/build/sage-5.10/module_list.py.orig sage-5.10/spkg/build/sage-5.10/module_list.py
+--- sage-5.10/spkg/build/sage-5.10/module_list.py.orig 2013-07-29 19:57:20.544060055 -0300
++++ sage-5.10/spkg/build/sage-5.10/module_list.py 2013-07-29 19:57:33.521060552 -0300
+@@ -638,6 +638,7 @@ ext_modules = [
libraries = ['gmp', 'mpfr', 'stdc++', 'fplll'],
language="c++",
include_dirs = [SAGE_INC + '/fplll'],
@@ -9,9 +9,9 @@ diff -up sage-5.9/spkg/build/sage-5.9/module_list.py.orig sage-5.9/spkg/build/sa
depends = [SAGE_INC + "/fplll/fplll.h"]),
Extension('sage.libs.linbox.linbox',
-diff -up sage-5.9/spkg/build/sage-5.9/sage/libs/fplll/fplll.pxi.orig sage-5.9/spkg/build/sage-5.9/sage/libs/fplll/fplll.pxi
---- sage-5.9/spkg/build/sage-5.9/sage/libs/fplll/fplll.pxi.orig 2013-05-06 13:59:47.144770993 -0300
-+++ sage-5.9/spkg/build/sage-5.9/sage/libs/fplll/fplll.pxi 2013-05-06 14:06:27.254786314 -0300
+diff -up sage-5.10/spkg/build/sage-5.10/sage/libs/fplll/fplll.pxi.orig sage-5.10/spkg/build/sage-5.10/sage/libs/fplll/fplll.pxi
+--- sage-5.10/spkg/build/sage-5.10/sage/libs/fplll/fplll.pxi.orig 2013-07-29 19:57:29.779060409 -0300
++++ sage-5.10/spkg/build/sage-5.10/sage/libs/fplll/fplll.pxi 2013-07-29 19:57:33.523060552 -0300
@@ -10,22 +10,22 @@ cdef extern from "fplll/fplll.h":
#
diff --git a/sagemath-gap-hap.patch b/sagemath-gap-hap.patch
index e19864f..bd104ce 100644
--- a/sagemath-gap-hap.patch
+++ b/sagemath-gap-hap.patch
@@ -1,6 +1,6 @@
-diff -up sage-5.9/spkg/build/sage-5.9/sage/groups/perm_gps/permgroup.py.orig sage-5.9/spkg/build/sage-5.9/sage/groups/perm_gps/permgroup.py
---- sage-5.9/spkg/build/sage-5.9/sage/groups/perm_gps/permgroup.py.orig 2013-03-19 16:22:36.592731155 -0300
-+++ sage-5.9/spkg/build/sage-5.9/sage/groups/perm_gps/permgroup.py 2013-03-19 16:22:58.320731987 -0300
+diff -up sage-5.10/spkg/build/sage-5.10/sage/groups/perm_gps/permgroup.py.orig sage-5.10/spkg/build/sage-5.10/sage/groups/perm_gps/permgroup.py
+--- sage-5.10/spkg/build/sage-5.10/sage/groups/perm_gps/permgroup.py.orig 2013-07-29 20:03:19.785073812 -0300
++++ sage-5.10/spkg/build/sage-5.10/sage/groups/perm_gps/permgroup.py 2013-07-29 20:03:29.426074181 -0300
@@ -180,8 +180,7 @@ def hap_decorator(f):
"""
@wraps(f)
@@ -11,7 +11,7 @@ diff -up sage-5.9/spkg/build/sage-5.9/sage/groups/perm_gps/permgroup.py.orig sag
load_hap()
from sage.rings.arith import is_prime
if not (p == 0 or is_prime(p)):
-@@ -3628,8 +3627,7 @@ class PermutationGroup_generic(group.Gro
+@@ -3730,8 +3729,7 @@ class PermutationGroup_generic(group.Gro
- David Joyner and Graham Ellis
"""
diff --git a/sagemath-gmp.patch b/sagemath-gmp.patch
index b50983b..8767f9c 100644
--- a/sagemath-gmp.patch
+++ b/sagemath-gmp.patch
@@ -1,5 +1,5 @@
---- sage-5.9/spkg/build/sage-5.9/c_lib/src/memory.c.orig 2012-07-10 11:46:54.516595967 -0400
-+++ sage-5.9/spkg/build/sage-5.9/c_lib/src/memory.c 2012-07-10 11:47:12.688596755 -0400
+--- sage-5.10/spkg/build/sage-5.10/c_lib/src/memory.c.orig 2012-07-10 11:46:54.516595967 -0400
++++ sage-5.10/spkg/build/sage-5.10/c_lib/src/memory.c 2012-07-10 11:47:12.688596755 -0400
@@ -17,7 +17,7 @@ AUTHORS:
* http://www.gnu.org/licenses/
****************************************************************************/
diff --git a/sagemath-jmol.patch b/sagemath-jmol.patch
index ff8b31d..c993d1a 100644
--- a/sagemath-jmol.patch
+++ b/sagemath-jmol.patch
@@ -1,6 +1,6 @@
-diff -up sage-5.9/spkg/build/sage-5.9/sage/interfaces/jmoldata.py.orig sage-5.9/spkg/build/sage-5.9/sage/interfaces/jmoldata.py
---- sage-5.9/spkg/build/sage-5.9/sage/interfaces/jmoldata.py.orig 2012-11-10 12:03:07.742817945 -0200
-+++ sage-5.9/spkg/build/sage-5.9/sage/interfaces/jmoldata.py 2012-11-10 12:03:34.499818970 -0200
+diff -up sage-5.10/spkg/build/sage-5.10/sage/interfaces/jmoldata.py.orig sage-5.10/spkg/build/sage-5.10/sage/interfaces/jmoldata.py
+--- sage-5.10/spkg/build/sage-5.10/sage/interfaces/jmoldata.py.orig 2012-11-10 12:03:07.742817945 -0200
++++ sage-5.10/spkg/build/sage-5.10/sage/interfaces/jmoldata.py 2012-11-10 12:03:34.499818970 -0200
@@ -86,7 +86,7 @@ class JmolData(SageObject):
sage_makedirs(jmolscratch)
scratchout = os.path.join(jmolscratch,"jmolout.txt")
diff --git a/sagemath-libgap.patch b/sagemath-libgap.patch
index f62685d..5a11e1a 100644
--- a/sagemath-libgap.patch
+++ b/sagemath-libgap.patch
@@ -1,6 +1,6 @@
-diff -up sage-5.9/spkg/build/sage-5.9/sage/libs/gap/util.pyx.orig sage-5.9/spkg/build/sage-5.9/sage/libs/gap/util.pyx
---- sage-5.9/spkg/build/sage-5.9/sage/libs/gap/util.pyx.orig 2013-05-06 14:24:03.160826749 -0300
-+++ sage-5.9/spkg/build/sage-5.9/sage/libs/gap/util.pyx 2013-05-06 14:25:25.806829913 -0300
+diff -up sage-5.10/spkg/build/sage-5.10/sage/libs/gap/util.pyx.orig sage-5.10/spkg/build/sage-5.10/sage/libs/gap/util.pyx
+--- sage-5.10/spkg/build/sage-5.10/sage/libs/gap/util.pyx.orig 2013-05-06 14:24:03.160826749 -0300
++++ sage-5.10/spkg/build/sage-5.10/sage/libs/gap/util.pyx 2013-05-06 14:25:25.806829913 -0300
@@ -155,18 +155,9 @@ def gap_root():
sage: from sage.libs.gap.util import gap_root
diff --git a/sagemath-libmpc.patch b/sagemath-libmpc.patch
index 9c1548d..4a61604 100644
--- a/sagemath-libmpc.patch
+++ b/sagemath-libmpc.patch
@@ -1,6 +1,6 @@
-diff -up sage-5.9/spkg/build/sage-5.9/c_lib/SConstruct.orig sage-5.9/spkg/build/sage-5.9/c_lib/SConstruct
---- sage-5.9/spkg/build/sage-5.9/c_lib/SConstruct.orig 2013-02-23 12:42:08.694809731 -0300
-+++ sage-5.9/spkg/build/sage-5.9/c_lib/SConstruct 2013-02-23 12:43:00.412811711 -0300
+diff -up sage-5.10/spkg/build/sage-5.10/c_lib/SConstruct.orig sage-5.10/spkg/build/sage-5.10/c_lib/SConstruct
+--- sage-5.10/spkg/build/sage-5.10/c_lib/SConstruct.orig 2013-02-23 12:42:08.694809731 -0300
++++ sage-5.10/spkg/build/sage-5.10/c_lib/SConstruct 2013-02-23 12:43:00.412811711 -0300
@@ -145,7 +145,7 @@ soname = libname + "." + major
shlink_flags += [ '-Wl,-Bsymbolic', '-Wl,-soname=%s' % soname ]
@@ -10,9 +10,9 @@ diff -up sage-5.9/spkg/build/sage-5.9/c_lib/SConstruct.orig sage-5.9/spkg/build/
LIBPATH=['@@libdir@@','@@libdir@@/python$PYV/config/'],
SHLIBSUFFIX=shlib_suffix,
SHLINKFLAGS=shlink_flags,
-diff -up sage-5.9/spkg/build/sage-5.9/c_lib/src/stdsage.c.orig sage-5.9/spkg/build/sage-5.9/c_lib/src/stdsage.c
---- sage-5.9/spkg/build/sage-5.9/c_lib/src/stdsage.c.orig 2013-02-23 12:42:18.286810098 -0300
-+++ sage-5.9/spkg/build/sage-5.9/c_lib/src/stdsage.c 2013-02-23 12:43:15.062812272 -0300
+diff -up sage-5.10/spkg/build/sage-5.10/c_lib/src/stdsage.c.orig sage-5.10/spkg/build/sage-5.10/c_lib/src/stdsage.c
+--- sage-5.10/spkg/build/sage-5.10/c_lib/src/stdsage.c.orig 2013-02-23 12:42:18.286810098 -0300
++++ sage-5.10/spkg/build/sage-5.10/c_lib/src/stdsage.c 2013-02-23 12:43:15.062812272 -0300
@@ -58,3 +58,49 @@ void init_csage_module() {
init_csage();
#endif
diff --git a/sagemath-lrcalc.patch b/sagemath-lrcalc.patch
index 0cd2a01..0de417c 100644
--- a/sagemath-lrcalc.patch
+++ b/sagemath-lrcalc.patch
@@ -1,7 +1,7 @@
-diff -up sage-5.9/spkg/build/sage-5.9/module_list.py.orig sage-5.9/spkg/build/sage-5.9/module_list.py
---- sage-5.9/spkg/build/sage-5.9/module_list.py.orig 2013-05-06 14:14:11.852804105 -0300
-+++ sage-5.9/spkg/build/sage-5.9/module_list.py 2013-05-06 14:14:20.940804453 -0300
-@@ -2056,7 +2056,7 @@ if UNAME[0] == "Darwin" and not UNAME[2]
+diff -up sage-5.10/spkg/build/sage-5.10/module_list.py.orig sage-5.10/spkg/build/sage-5.10/module_list.py
+--- sage-5.10/spkg/build/sage-5.10/module_list.py.orig 2013-07-29 20:04:06.006075582 -0300
++++ sage-5.10/spkg/build/sage-5.10/module_list.py 2013-07-29 20:04:18.016076042 -0300
+@@ -2042,7 +2042,7 @@ if UNAME[0] == "Darwin" and not UNAME[2]
)
diff --git a/sagemath-lrslib.patch b/sagemath-lrslib.patch
index 1321c07..715fac4 100644
--- a/sagemath-lrslib.patch
+++ b/sagemath-lrslib.patch
@@ -1,6 +1,6 @@
-diff -up sage-5.9/spkg/build/sage-5.9/sage/geometry/polyhedron/base.py.orig sage-5.9/spkg/build/sage-5.9/sage/geometry/polyhedron/base.py
---- sage-5.9/spkg/build/sage-5.9/sage/geometry/polyhedron/base.py.orig 2013-05-06 14:12:21.664799886 -0300
-+++ sage-5.9/spkg/build/sage-5.9/sage/geometry/polyhedron/base.py 2013-05-06 14:12:28.625800152 -0300
+diff -up sage-5.10/spkg/build/sage-5.10/sage/geometry/polyhedron/base.py.orig sage-5.10/spkg/build/sage-5.10/sage/geometry/polyhedron/base.py
+--- sage-5.10/spkg/build/sage-5.10/sage/geometry/polyhedron/base.py.orig 2013-05-06 14:12:21.664799886 -0300
++++ sage-5.10/spkg/build/sage-5.10/sage/geometry/polyhedron/base.py 2013-05-06 14:12:28.625800152 -0300
@@ -3281,11 +3281,6 @@ class Polyhedron_base(Element):
David Avis's lrs program.
diff --git a/sagemath-m4rie.patch b/sagemath-m4rie.patch
index e2ca4de..71a285a 100644
--- a/sagemath-m4rie.patch
+++ b/sagemath-m4rie.patch
@@ -1,5 +1,5 @@
---- sage-5.9/spkg/build/sage-5.9/sage/libs/m4rie.pxd.orig 2013-05-07 08:12:27.137652862 -0600
-+++ sage-5.9/spkg/build/sage-5.9/sage/libs/m4rie.pxd 2013-05-07 11:45:12.067923724 -0600
+--- sage-5.10/spkg/build/sage-5.10/sage/libs/m4rie.pxd.orig 2013-05-07 08:12:27.137652862 -0600
++++ sage-5.10/spkg/build/sage-5.10/sage/libs/m4rie.pxd 2013-05-07 11:45:12.067923724 -0600
@@ -52,9 +52,9 @@ cdef extern from "m4rie/m4rie.h":
void mzed_add_elem(mzed_t *a, const_size_t row, const_size_t col, const_int elem)
@@ -28,8 +28,8 @@
mzd_slice_t *mzd_slice_init(gf2e *ff, size_t m, size_t n)
---- sage-5.9/spkg/build/sage-5.9/sage/matrix/matrix_mod2e_dense.pyx.orig 2013-05-07 08:12:27.139652859 -0600
-+++ sage-5.9/spkg/build/sage-5.9/sage/matrix/matrix_mod2e_dense.pyx 2013-05-07 11:21:05.095668016 -0600
+--- sage-5.10/spkg/build/sage-5.10/sage/matrix/matrix_mod2e_dense.pyx.orig 2013-05-07 08:12:27.139652859 -0600
++++ sage-5.10/spkg/build/sage-5.10/sage/matrix/matrix_mod2e_dense.pyx 2013-05-07 11:21:05.095668016 -0600
@@ -561,9 +561,6 @@ cdef class Matrix_mod2e_dense(matrix_den
if self._ncols != right._nrows:
raise ArithmeticError("left ncols must match right nrows")
diff --git a/sagemath-maxima.patch b/sagemath-maxima.patch
index 95149d1..3918aa9 100644
--- a/sagemath-maxima.patch
+++ b/sagemath-maxima.patch
@@ -1,16 +1,16 @@
-diff -up sage-5.9/spkg/build/sage-5.9/sage/interfaces/maxima.py.orig sage-5.9/spkg/build/sage-5.9/sage/interfaces/maxima.py
---- sage-5.9/spkg/build/sage-5.9/sage/interfaces/maxima.py.orig 2012-08-04 13:21:54.100575138 -0400
-+++ sage-5.9/spkg/build/sage-5.9/sage/interfaces/maxima.py 2012-08-04 13:22:15.580575956 -0400
+diff -up sage-5.10/spkg/build/sage-5.10/sage/interfaces/maxima.py.orig sage-5.10/spkg/build/sage-5.10/sage/interfaces/maxima.py
+--- sage-5.10/spkg/build/sage-5.10/sage/interfaces/maxima.py.orig 2013-07-29 19:54:04.395052544 -0300
++++ sage-5.10/spkg/build/sage-5.10/sage/interfaces/maxima.py 2013-07-29 19:55:18.259055373 -0300
@@ -544,7 +544,7 @@ class Maxima(MaximaAbstract, Expect):
Expect.__init__(self,
name = 'maxima',
prompt = '\(\%i[0-9]+\)',
-- command = 'maxima-noreadline --userdir="%s" -p "%s"'%(SAGE_MAXIMA_DIR,STARTUP),
+- command = 'maxima --userdir="%s" -p "%s"'%(SAGE_MAXIMA_DIR,STARTUP),
+ command = 'maxima --disable-readline --userdir="%s" -p "%s"'%(SAGE_MAXIMA_DIR,STARTUP),
maxread = 10000,
script_subdirectory = script_subdirectory,
restart_on_ctrlc = False,
-@@ -588,7 +588,8 @@ class Maxima(MaximaAbstract, Expect):
+@@ -591,7 +591,8 @@ class Maxima(MaximaAbstract, Expect):
# Remove limit on the max heapsize (since otherwise it defaults
# to 256MB with ECL).
@@ -20,9 +20,9 @@ diff -up sage-5.9/spkg/build/sage-5.9/sage/interfaces/maxima.py.orig sage-5.9/sp
self._eval_line('0;')
def __reduce__(self):
-diff -up sage-5.9/spkg/build/sage_scripts-5.7/sage-maxima.lisp.orig sage-5.9/spkg/build/sage_scripts-5.7/sage-maxima.lisp
---- sage-5.9/spkg/build/sage_scripts-5.9/sage-maxima.lisp.orig 2012-08-04 13:22:07.842575668 -0400
-+++ sage-5.9/spkg/build/sage_scripts-5.9/sage-maxima.lisp 2012-08-04 13:22:15.580575956 -0400
+diff -up sage-5.10/spkg/build/sage_scripts-5.10/sage-maxima.lisp.orig sage-5.10/spkg/build/sage_scripts-5.10/sage-maxima.lisp
+--- sage-5.10/spkg/build/sage_scripts-5.10/sage-maxima.lisp.orig 2013-07-29 19:54:04.402052544 -0300
++++ sage-5.10/spkg/build/sage_scripts-5.10/sage-maxima.lisp 2013-07-29 19:55:33.867055970 -0300
@@ -3,4 +3,8 @@
;(setf *general-display-prefix* "<sage-display>")
diff --git a/sagemath-maxima.system.patch b/sagemath-maxima.system.patch
index d804bea..62683db 100644
--- a/sagemath-maxima.system.patch
+++ b/sagemath-maxima.system.patch
@@ -1,6 +1,6 @@
-diff -up sage-5.9/spkg/build/sage-5.9/sage/interfaces/maxima_lib.py.orig sage-5.9/spkg/build/sage-5.9/sage/interfaces/maxima_lib.py
---- sage-5.9/spkg/build/sage-5.9/sage/interfaces/maxima_lib.py.orig 2012-12-29 15:42:54.811218546 -0200
-+++ sage-5.9/spkg/build/sage-5.9/sage/interfaces/maxima_lib.py 2012-12-29 15:43:06.739219003 -0200
+diff -up sage-5.10/spkg/build/sage-5.10/sage/interfaces/maxima_lib.py.orig sage-5.10/spkg/build/sage-5.10/sage/interfaces/maxima_lib.py
+--- sage-5.10/spkg/build/sage-5.10/sage/interfaces/maxima_lib.py.orig 2012-12-29 15:42:54.811218546 -0200
++++ sage-5.10/spkg/build/sage-5.10/sage/interfaces/maxima_lib.py 2012-12-29 15:43:06.739219003 -0200
@@ -77,7 +77,7 @@ from maxima_abstract import (MaximaAbstr
## We begin here by initializing Maxima in library mode
## i.e. loading it into ECL
diff --git a/sagemath-nauty.patch b/sagemath-nauty.patch
index e9db3d5..f47d3e8 100644
--- a/sagemath-nauty.patch
+++ b/sagemath-nauty.patch
@@ -1,13 +1,12 @@
-diff -up sage-5.9/spkg/build/sage-5.9/sage/graphs/graph_generators.py.orig sage-5.9/spkg/build/sage-5.9/sage/graphs/graph_generators.py
---- sage-5.9/spkg/build/sage-5.9/sage/graphs/graph_generators.py.orig 2013-05-06 14:13:14.875801924 -0300
-+++ sage-5.9/spkg/build/sage-5.9/sage/graphs/graph_generators.py 2013-05-06 14:13:24.820802304 -0300
-@@ -772,8 +772,7 @@ class GraphGenerators():
+diff -up sage-5.10/spkg/build/sage-5.10/sage/graphs/graph_generators.py.orig sage-5.10/spkg/build/sage-5.10/sage/graphs/graph_generators.py
+--- sage-5.10/spkg/build/sage-5.10/sage/graphs/graph_generators.py.orig 2013-07-29 20:02:33.894072055 -0300
++++ sage-5.10/spkg/build/sage-5.10/sage/graphs/graph_generators.py 2013-07-29 20:02:42.421072381 -0300
+@@ -774,7 +774,7 @@ class GraphGenerators():
"""
import subprocess
from sage.misc.package import is_package_installed
- if not is_package_installed("nauty"):
-- raise TypeError, "the optional nauty package is not installed"
-+ raise TypeError, "the optional nauty package is not installed"
++ if 1:
+ raise TypeError("the optional nauty package is not installed")
sp = subprocess.Popen("nauty-geng {0}".format(options), shell=True,
stdin=subprocess.PIPE, stdout=subprocess.PIPE,
- stderr=subprocess.PIPE, close_fds=True)
diff --git a/sagemath-nolibgap.patch b/sagemath-nolibgap.patch
index d6b87b2..9a69650 100644
--- a/sagemath-nolibgap.patch
+++ b/sagemath-nolibgap.patch
@@ -1,7 +1,7 @@
-diff -up sage-5.9/spkg/build/sage-5.9/module_list.py.orig sage-5.9/spkg/build/sage-5.9/module_list.py
---- sage-5.9/spkg/build/sage-5.9/module_list.py.orig 2013-05-06 14:26:48.178833068 -0300
-+++ sage-5.9/spkg/build/sage-5.9/module_list.py 2013-05-06 14:28:09.378836177 -0300
-@@ -485,8 +485,8 @@ ext_modules = [
+diff -up sage-5.10/spkg/build/sage-5.10/module_list.py.orig sage-5.10/spkg/build/sage-5.10/module_list.py
+--- sage-5.10/spkg/build/sage-5.10/module_list.py.orig 2013-07-29 20:07:17.633082920 -0300
++++ sage-5.10/spkg/build/sage-5.10/module_list.py 2013-07-29 20:07:28.577083339 -0300
+@@ -487,8 +487,8 @@ ext_modules = [
Extension('sage.groups.old',
sources = ['sage/groups/old.pyx']),
@@ -12,7 +12,7 @@ diff -up sage-5.9/spkg/build/sage-5.9/module_list.py.orig sage-5.9/spkg/build/sa
Extension('sage.groups.perm_gps.permgroup_element',
sources = ['sage/groups/perm_gps/permgroup_element.pyx']),
-@@ -780,25 +780,25 @@ ext_modules = [
+@@ -771,25 +771,25 @@ ext_modules = [
##
################################
diff --git a/sagemath-nopari2.6.patch b/sagemath-nopari2.6.patch
index 3001eec..6b45cc8 100644
--- a/sagemath-nopari2.6.patch
+++ b/sagemath-nopari2.6.patch
@@ -1,6 +1,6 @@
-diff -up sage-5.9/spkg/build/sage-5.9/sage/libs/pari/decl.pxi.orig sage-5.9/spkg/build/sage-5.9/sage/libs/pari/decl.pxi
---- sage-5.9/spkg/build/sage-5.9/sage/libs/pari/decl.pxi.orig 2013-03-19 17:20:25.960864009 -0300
-+++ sage-5.9/spkg/build/sage-5.9/sage/libs/pari/decl.pxi 2013-03-19 17:20:33.246864288 -0300
+diff -up sage-5.10/spkg/build/sage-5.10/sage/libs/pari/decl.pxi.orig sage-5.10/spkg/build/sage-5.10/sage/libs/pari/decl.pxi
+--- sage-5.10/spkg/build/sage-5.10/sage/libs/pari/decl.pxi.orig 2013-07-29 20:08:46.678086330 -0300
++++ sage-5.10/spkg/build/sage-5.10/sage/libs/pari/decl.pxi 2013-07-29 20:08:56.965086724 -0300
@@ -595,7 +595,6 @@ cdef extern from 'pari/pari.h':
GEN polredabs0(GEN x, long flag)
GEN polredabs2(GEN x)
@@ -9,10 +9,10 @@ diff -up sage-5.9/spkg/build/sage-5.9/sage/libs/pari/decl.pxi.orig sage-5.9/spkg
GEN qflll0(GEN x, long flag)
GEN qflllgram0(GEN x, long flag)
GEN smallpolred(GEN x)
-diff -up sage-5.9/spkg/build/sage-5.9/sage/libs/pari/gen.pyx.orig sage-5.9/spkg/build/sage-5.9/sage/libs/pari/gen.pyx
---- sage-5.9/spkg/build/sage-5.9/sage/libs/pari/gen.pyx.orig 2013-03-19 17:20:55.992865159 -0300
-+++ sage-5.9/spkg/build/sage-5.9/sage/libs/pari/gen.pyx 2013-03-19 17:21:02.118865393 -0300
-@@ -8011,10 +8011,6 @@ cdef class gen(sage.structure.element.Ri
+diff -up sage-5.10/spkg/build/sage-5.10/sage/libs/pari/gen.pyx.orig sage-5.10/spkg/build/sage-5.10/sage/libs/pari/gen.pyx
+--- sage-5.10/spkg/build/sage-5.10/sage/libs/pari/gen.pyx.orig 2013-07-29 20:08:37.060085961 -0300
++++ sage-5.10/spkg/build/sage-5.10/sage/libs/pari/gen.pyx 2013-07-29 20:08:56.971086724 -0300
+@@ -8029,10 +8029,6 @@ cdef class gen(sage.structure.element.Ri
sig_on()
return self.new_gen(polredabs0(self.g, flag))
diff --git a/sagemath-ntl6.patch b/sagemath-ntl6.patch
index 1f3344e..130b71d 100644
--- a/sagemath-ntl6.patch
+++ b/sagemath-ntl6.patch
@@ -1,5 +1,6 @@
---- sage-5.9/spkg/build/sage-5.9/c_lib/include/ntl_wrap.h.orig 2010-06-28 10:37:05.000000000 -0600
-+++ sage-5.9/spkg/build/sage-5.9/c_lib/include/ntl_wrap.h 2013-05-03 15:42:32.931073654 -0600
+diff -up sage-5.10/spkg/build/sage-5.10/c_lib/include/ntl_wrap.h.orig sage-5.10/spkg/build/sage-5.10/c_lib/include/ntl_wrap.h
+--- sage-5.10/spkg/build/sage-5.10/c_lib/include/ntl_wrap.h.orig 2013-07-29 19:40:07.189020485 -0300
++++ sage-5.10/spkg/build/sage-5.10/c_lib/include/ntl_wrap.h 2013-07-29 19:40:11.831020662 -0300
@@ -40,91 +40,92 @@ EXTERN void setup_NTL_error_callback(voi
//////// ZZ //////////
@@ -450,8 +451,9 @@
-EXTERN void mat_GF2_setitem(struct mat_GF2* x, int i, int j, const struct GF2* z);
+EXTERN void mat_GF2_setitem(mat_GF2* x, int i, int j, const GF2* z);
---- sage-5.9/spkg/build/sage-5.9/c_lib/src/ntl_wrap.cpp.orig 2013-01-21 14:18:15.000000000 -0700
-+++ sage-5.9/spkg/build/sage-5.9/c_lib/src/ntl_wrap.cpp 2013-05-03 16:05:09.640847922 -0600
+diff -up sage-5.10/spkg/build/sage-5.10/c_lib/src/ntl_wrap.cpp.orig sage-5.10/spkg/build/sage-5.10/c_lib/src/ntl_wrap.cpp
+--- sage-5.10/spkg/build/sage-5.10/c_lib/src/ntl_wrap.cpp.orig 2013-07-29 19:40:07.197020485 -0300
++++ sage-5.10/spkg/build/sage-5.10/c_lib/src/ntl_wrap.cpp 2013-07-29 19:40:11.834020662 -0300
@@ -29,7 +29,7 @@ int ZZ_to_int(const ZZ* x)
/* Returns a *new* ZZ object.
@@ -1348,9 +1350,10 @@
{
//int j;
cpn.restore();
---- sage-5.9/spkg/build/sage-5.9/sage/libs/ntl/decl.pxi.orig 2010-06-28 10:37:01.000000000 -0600
-+++ sage-5.9/spkg/build/sage-5.9/sage/libs/ntl/decl.pxi 2013-05-07 09:38:36.134950663 -0600
-@@ -23,7 +23,7 @@ from sage.libs.ntl.ntl_ZZ_pEX_decl cimpo
+diff -up sage-5.10/spkg/build/sage-5.10/sage/libs/ntl/decl.pxi.orig sage-5.10/spkg/build/sage-5.10/sage/libs/ntl/decl.pxi
+--- sage-5.10/spkg/build/sage-5.10/sage/libs/ntl/decl.pxi.orig 2013-07-29 19:39:08.246018227 -0300
++++ sage-5.10/spkg/build/sage-5.10/sage/libs/ntl/decl.pxi 2013-07-29 19:40:11.836020662 -0300
+@@ -22,7 +22,7 @@ from sage.libs.ntl.ntl_ZZ_pEX_decl cimpo
cdef extern from "ntl_wrap.h":
#### mat_ZZ_c
@@ -1359,7 +1362,7 @@
pass
# Some boiler-plate
-@@ -93,7 +93,7 @@ cdef extern from "ntl_wrap.h":
+@@ -92,7 +92,7 @@ cdef extern from "ntl_wrap.h":
cdef long mat_ZZ_G_BKZ_RR_U "G_BKZ_RR"(mat_ZZ_c B, mat_ZZ_c U, double delta, long BlockSize, long prune, int check, long verbose)
#### GF2_c
@@ -1368,7 +1371,7 @@
pass
GF2_c* GF2_new "New<GF2>"()
-@@ -119,7 +119,7 @@ cdef extern from "ntl_wrap.h":
+@@ -118,7 +118,7 @@ cdef extern from "ntl_wrap.h":
#### GF2X_c
@@ -1377,7 +1380,7 @@
pass
long *GF2XHexOutput_c "(&GF2X::HexOutput)" # work-around for Cython bug
-@@ -176,7 +176,7 @@ cdef extern from "ntl_wrap.h":
+@@ -175,7 +175,7 @@ cdef extern from "ntl_wrap.h":
void GF2X_BuildIrred "BuildIrred" (GF2X_c f, long n)
#### GF2XModulus_c
@@ -1386,7 +1389,7 @@
pass
GF2X_c GF2XModulus_GF2X "GF2X" (GF2XModulus_c m)
-@@ -185,7 +185,7 @@ cdef extern from "ntl_wrap.h":
+@@ -184,7 +184,7 @@ cdef extern from "ntl_wrap.h":
#### GF2EContext_c
@@ -1395,7 +1398,7 @@
void (*restore)()
GF2EContext_c* GF2EContext_new "New<GF2EContext>"()
-@@ -196,7 +196,7 @@ cdef extern from "ntl_wrap.h":
+@@ -195,7 +195,7 @@ cdef extern from "ntl_wrap.h":
void GF2EContext_delete "Delete<GF2EContext>"(GF2EContext_c *mem)
#### GF2E_c
@@ -1404,7 +1407,7 @@
pass
void GF2E_init "GF2E::init"(GF2X_c x)
-@@ -231,7 +231,7 @@ cdef extern from "ntl_wrap.h":
+@@ -230,7 +230,7 @@ cdef extern from "ntl_wrap.h":
GF2_c GF2E_trace "trace"(GF2E_c x)
#### GF2EX_c
@@ -1413,7 +1416,7 @@
pass
GF2EX_c* GF2EX_new "New<GF2EX>"()
-@@ -250,7 +250,7 @@ cdef extern from "ntl_wrap.h":
+@@ -249,7 +249,7 @@ cdef extern from "ntl_wrap.h":
int GF2EX_IsZero "IsZero"(GF2EX_c x)
#### vec_GF2E_c
@@ -1422,7 +1425,7 @@
pass
vec_GF2E_c* vec_GF2E_new "New<vec_GF2E>"()
-@@ -261,7 +261,7 @@ cdef extern from "ntl_wrap.h":
+@@ -260,7 +260,7 @@ cdef extern from "ntl_wrap.h":
object vec_GF2E_to_PyString "_to_PyString<vec_GF2E>"(vec_GF2E_c *x)
#### mat_GF2E_c
@@ -1431,7 +1434,7 @@
void (*SetDims)(long nrows, long ncols)
long (*NumRows)()
long (*NumCols)()
-@@ -300,7 +300,7 @@ cdef extern from "ntl_wrap.h":
+@@ -299,7 +299,7 @@ cdef extern from "ntl_wrap.h":
void mat_GF2E_conv_vec_GF2E(mat_GF2E_c out, vec_GF2E_c inp)
#### vec_GF2_c
@@ -1440,7 +1443,7 @@
pass
vec_GF2_c* vec_GF2_new "New<vec_GF2>"()
-@@ -312,7 +312,7 @@ cdef extern from "ntl_wrap.h":
+@@ -311,7 +311,7 @@ cdef extern from "ntl_wrap.h":
#### mat_GF2_c
diff --git a/sagemath-pari.patch b/sagemath-pari.patch
index 3d9d54b..bb38b96 100644
--- a/sagemath-pari.patch
+++ b/sagemath-pari.patch
@@ -1,6 +1,6 @@
-diff -up sage-5.9/spkg/build/sage-5.9/sage/interfaces/gp.py.orig sage-5.9/spkg/build/sage-5.9/sage/interfaces/gp.py
---- sage-5.9/spkg/build/sage-5.9/sage/interfaces/gp.py.orig 2013-03-28 16:19:35.000000000 -0300
-+++ sage-5.9/spkg/build/sage-5.9/sage/interfaces/gp.py 2013-05-06 17:34:56.021265319 -0300
+diff -up sage-5.10/spkg/build/sage-5.10/sage/interfaces/gp.py.orig sage-5.10/spkg/build/sage-5.10/sage/interfaces/gp.py
+--- sage-5.10/spkg/build/sage-5.10/sage/interfaces/gp.py.orig 2013-07-29 19:56:27.093058008 -0300
++++ sage-5.10/spkg/build/sage-5.10/sage/interfaces/gp.py 2013-07-29 19:56:38.015058427 -0300
@@ -977,11 +977,11 @@ def is_GpElement(x):
"""
return isinstance(x, GpElement)
@@ -16,10 +16,10 @@ diff -up sage-5.9/spkg/build/sage-5.9/sage/interfaces/gp.py.orig sage-5.9/spkg/b
# An instance
gp = Gp(logfile=os.path.join(DOT_SAGE,'gp-expect.log')) # useful for debugging!
-diff -up sage-5.9/spkg/build/sage-5.9/sage/libs/pari/gen.pyx.orig sage-5.9/spkg/build/sage-5.9/sage/libs/pari/gen.pyx
---- sage-5.9/spkg/build/sage-5.9/sage/libs/pari/gen.pyx.orig 2013-05-06 17:34:09.952263554 -0300
-+++ sage-5.9/spkg/build/sage-5.9/sage/libs/pari/gen.pyx 2013-05-06 17:34:24.826264124 -0300
-@@ -182,6 +182,10 @@ include '../../ext/stdsage.pxi'
+diff -up sage-5.10/spkg/build/sage-5.10/sage/libs/pari/gen.pyx.orig sage-5.10/spkg/build/sage-5.10/sage/libs/pari/gen.pyx
+--- sage-5.10/spkg/build/sage-5.10/sage/libs/pari/gen.pyx.orig 2013-07-29 19:56:11.479057411 -0300
++++ sage-5.10/spkg/build/sage-5.10/sage/libs/pari/gen.pyx 2013-07-29 19:56:38.025058427 -0300
+@@ -183,6 +183,10 @@ include 'sage/ext/python.pxi'
cdef extern from "mpz_pylong.h":
cdef int mpz_set_pylong(mpz_t dst, src) except -1
@@ -30,7 +30,7 @@ diff -up sage-5.9/spkg/build/sage-5.9/sage/libs/pari/gen.pyx.orig sage-5.9/spkg/
# Make sure we don't use mpz_t_offset before initializing it by
# putting in a value that's likely to provoke a segmentation fault,
# rather than silently corrupting memory.
-@@ -9218,7 +9222,12 @@ cdef class PariInstance(sage.structure.p
+@@ -9240,7 +9244,12 @@ cdef class PariInstance(sage.structure.p
# The size here doesn't really matter, because we will allocate
# our own stack anyway. We ask PARI not to set up signal handlers.
diff --git a/sagemath-png.patch b/sagemath-png.patch
index df45518..0d24608 100644
--- a/sagemath-png.patch
+++ b/sagemath-png.patch
@@ -1,25 +1,25 @@
-diff -up sage-5.9/spkg/build/sage-5.9/module_list.py.orig sage-5.9/spkg/build/sage-5.9/module_list.py
---- sage-5.9/spkg/build/sage-5.9/module_list.py.orig 2013-05-06 13:47:27.554742671 -0300
-+++ sage-5.9/spkg/build/sage-5.9/module_list.py 2013-05-06 13:47:44.223743310 -0300
-@@ -1023,7 +1023,7 @@ ext_modules = [
+diff -up sage-5.10/spkg/build/sage-5.10/module_list.py.orig sage-5.10/spkg/build/sage-5.10/module_list.py
+--- sage-5.10/spkg/build/sage-5.10/module_list.py.orig 2013-07-29 19:52:06.543048031 -0300
++++ sage-5.10/spkg/build/sage-5.10/module_list.py 2013-07-29 19:52:26.005048776 -0300
+@@ -1014,7 +1014,7 @@ ext_modules = [
Extension('sage.matrix.matrix_mod2_dense',
sources = ['sage/matrix/matrix_mod2_dense.pyx'],
- libraries = ['gmp','m4ri', 'gd', 'png12', 'z'],
+ libraries = ['gmp','m4ri', 'gd', 'png', 'z'],
- extra_compile_args = ['-std=c99'] + m4ri_extra_compile_args,
+ extra_compile_args = m4ri_extra_compile_args,
depends = [SAGE_INC + "/png.h", SAGE_INC + "/m4ri/m4ri.h"]),
-@@ -1285,7 +1285,7 @@ ext_modules = [
+@@ -1273,7 +1273,7 @@ ext_modules = [
Extension('sage.modules.vector_mod2_dense',
sources = ['sage/modules/vector_mod2_dense.pyx'],
- libraries = ['gmp','m4ri', 'png12', 'gd'],
+ libraries = ['gmp','m4ri', 'png', 'gd'],
- extra_compile_args = ['-std=c99'] + m4ri_extra_compile_args,
+ extra_compile_args = m4ri_extra_compile_args,
depends = [SAGE_INC + "/png.h", SAGE_INC + "/m4ri/m4ri.h"]),
-@@ -1760,7 +1760,7 @@ ext_modules = [
+@@ -1748,7 +1748,7 @@ ext_modules = [
Extension('sage.rings.polynomial.pbori',
sources = ['sage/rings/polynomial/pbori.pyx'],
libraries=['polybori-' + polybori_major_version,
diff --git a/sagemath-readonly.patch b/sagemath-readonly.patch
index 0a6b3e3..29a3477 100644
--- a/sagemath-readonly.patch
+++ b/sagemath-readonly.patch
@@ -1,6 +1,6 @@
-diff -up sage-5.9/spkg/build/sage-5.9/sage/all.py.orig sage-5.9/spkg/build/sage-5.9/sage/all.py
---- sage-5.9/spkg/build/sage-5.9/sage/all.py.orig 2013-05-06 13:45:07.053737291 -0300
-+++ sage-5.9/spkg/build/sage-5.9/sage/all.py 2013-05-06 13:45:35.317738373 -0300
+diff -up sage-5.10/spkg/build/sage-5.10/sage/all.py.orig sage-5.10/spkg/build/sage-5.10/sage/all.py
+--- sage-5.10/spkg/build/sage-5.10/sage/all.py.orig 2013-05-06 13:45:07.053737291 -0300
++++ sage-5.10/spkg/build/sage-5.10/sage/all.py 2013-05-06 13:45:35.317738373 -0300
@@ -307,11 +307,11 @@ def _write_started_file():
Check that the file exists when Sage is running::
diff --git a/sagemath-rh_bz_961372.patch b/sagemath-rh_bz_961372.patch
index 6bd7238..301d426 100644
--- a/sagemath-rh_bz_961372.patch
+++ b/sagemath-rh_bz_961372.patch
@@ -1,7 +1,7 @@
-diff -up sage-5.9/spkg/build/sage-5.9/sage/ext/cdefs.pxi.orig sage-5.9/spkg/build/sage-5.9/sage/ext/cdefs.pxi
---- sage-5.9/spkg/build/sage-5.9/sage/ext/cdefs.pxi.orig 2013-04-25 10:00:51.000000000 -0300
-+++ sage-5.9/spkg/build/sage-5.9/sage/ext/cdefs.pxi 2013-05-11 11:30:58.472438774 -0300
-@@ -7,6 +7,9 @@ include "python.pxi"
+diff -up sage-5.10/spkg/build/sage-5.10/sage/ext/cdefs.pxi.orig sage-5.10/spkg/build/sage-5.10/sage/ext/cdefs.pxi
+--- sage-5.10/spkg/build/sage-5.10/sage/ext/cdefs.pxi.orig 2013-07-29 20:12:52.183095731 -0300
++++ sage-5.10/spkg/build/sage-5.10/sage/ext/cdefs.pxi 2013-07-29 20:13:06.111096264 -0300
+@@ -5,6 +5,9 @@
from libc.stdio cimport *
from libc.string cimport strlen, strcpy, memset, memcpy
diff --git a/sagemath-rpmbuild.patch b/sagemath-rpmbuild.patch
index 245790d..a0a75b1 100644
--- a/sagemath-rpmbuild.patch
+++ b/sagemath-rpmbuild.patch
@@ -1,6 +1,22 @@
-diff -up sage-5.9/spkg/build/sage-5.9/module_list.py.orig sage-5.9/spkg/build/sage-5.9/module_list.py
---- sage-5.9/spkg/build/sage-5.9/module_list.py.orig 2013-05-06 16:21:08.750095783 -0300
-+++ sage-5.9/spkg/build/sage-5.9/module_list.py 2013-05-06 16:22:01.411097799 -0300
+diff -up sage-5.10/spkg/build/conway_polynomials-0.4.p0/spkg-install.orig sage-5.10/spkg/build/conway_polynomials-0.4.p0/spkg-install
+--- sage-5.10/spkg/build/conway_polynomials-0.4.p0/spkg-install.orig 2013-07-29 19:43:09.049027449 -0300
++++ sage-5.10/spkg/build/conway_polynomials-0.4.p0/spkg-install 2013-07-29 19:43:39.434028612 -0300
+@@ -2,9 +2,10 @@
+
+ import os
+ from sage.all import save
+-from sage.misc.misc import SAGE_SHARE
++if 'SAGE_SHARE' not in os.environ:
++ raise RuntimeError("SAGE_SHARE undefined, maybe run `sage -sh`?")
+
+-install_root = os.path.join(SAGE_SHARE, 'conway_polynomials')
++install_root = os.path.join(os.environ['SAGE_SHARE'], 'conway_polynomials')
+
+ def create_db():
+ db = {}
+diff -up sage-5.10/spkg/build/sage-5.10/module_list.py.orig sage-5.10/spkg/build/sage-5.10/module_list.py
+--- sage-5.10/spkg/build/sage-5.10/module_list.py.orig 2013-07-29 19:43:09.023027448 -0300
++++ sage-5.10/spkg/build/sage-5.10/module_list.py 2013-07-29 19:44:52.051031393 -0300
@@ -5,7 +5,7 @@ from distutils.core import setup
from distutils.extension import Extension
from sage.env import *
@@ -22,7 +38,7 @@ diff -up sage-5.9/spkg/build/sage-5.9/module_list.py.orig sage-5.9/spkg/build/sa
-numpy_depends = [SAGE_LOCAL + '/lib/python/site-packages/numpy/core/include/numpy/_numpyconfig.h']
+numpy_depends = [get_python_lib(1) + '/numpy/core/include/numpy/_numpyconfig.h']
- flint_depends = [SAGE_INC + '/FLINT/flint.h']
+ flint_depends = [SAGE_INC + '/flint/flint.h']
singular_depends = [SAGE_INC + '/libsingular.h', SAGE_INC + '/givaro/givconfig.h']
@@ -71,7 +72,7 @@ givaro_extra_compile_args =['-D__STDC_LI
### PolyBoRi settings
@@ -33,7 +49,7 @@ diff -up sage-5.9/spkg/build/sage-5.9/module_list.py.orig sage-5.9/spkg/build/sa
polybori_major_version = '0.8'
-@@ -662,7 +663,7 @@ ext_modules = [
+@@ -653,7 +654,7 @@ ext_modules = [
sources = ['sage/libs/lcalc/lcalc_Lfunction.pyx'],
libraries = ['m', 'ntl', 'mpfr', 'gmp', 'gmpxx',
'Lfunction', 'stdc++'],
@@ -42,21 +58,9 @@ diff -up sage-5.9/spkg/build/sage-5.9/module_list.py.orig sage-5.9/spkg/build/sa
extra_compile_args=["-O3", "-ffast-math"],
language = 'c++'),
-diff -up sage-5.9/spkg/build/sage-5.9/sage/numerical/backends/glpk_backend.pxd.orig sage-5.9/spkg/build/sage-5.9/sage/numerical/backends/glpk_backend.pxd
---- sage-5.9/spkg/build/sage-5.9/sage/numerical/backends/glpk_backend.pxd.orig 2013-05-06 16:21:08.763095783 -0300
-+++ sage-5.9/spkg/build/sage-5.9/sage/numerical/backends/glpk_backend.pxd 2013-05-06 16:21:12.815095939 -0300
-@@ -16,7 +16,7 @@ cdef extern from *:
- cdef extern from "float.h":
- cdef double DBL_MAX
-
--cdef extern from "../../../local/include/glpk.h":
-+cdef extern from "glpk.h":
- ctypedef struct c_glp_prob "glp_prob":
- pass
- ctypedef struct c_glp_iocp "glp_iocp":
-diff -up sage-5.9/spkg/build/sage-5.9/setup.py.orig sage-5.9/spkg/build/sage-5.9/setup.py
---- sage-5.9/spkg/build/sage-5.9/setup.py.orig 2013-05-06 16:21:08.770095784 -0300
-+++ sage-5.9/spkg/build/sage-5.9/setup.py 2013-05-06 16:21:12.817095939 -0300
+diff -up sage-5.10/spkg/build/sage-5.10/setup.py.orig sage-5.10/spkg/build/sage-5.10/setup.py
+--- sage-5.10/spkg/build/sage-5.10/setup.py.orig 2013-07-29 19:43:09.041027448 -0300
++++ sage-5.10/spkg/build/sage-5.10/setup.py 2013-07-29 19:48:14.195039134 -0300
@@ -38,21 +38,11 @@ except KeyError:
SAGE_INC = os.path.join(SAGE_LOCAL,'include')
@@ -78,10 +82,19 @@ diff -up sage-5.9/spkg/build/sage-5.9/setup.py.orig sage-5.9/spkg/build/sage-5.9
include_dirs = [SAGE_INC,
- os.path.join(SAGE_INC, 'csage'),
+ 'c_lib/include',
+ SAGE_SRC,
os.path.join(SAGE_SRC, 'sage', 'ext')]
- # search for dependencies only
-@@ -170,11 +160,11 @@ for m in ext_modules:
+@@ -77,7 +67,7 @@ if DEVEL:
+ # compiler flag -Og is used. See also
+ # * http://trac.sagemath.org/sage_trac/ticket/14460
+ # * http://gcc.gnu.org/bugzilla/show_bug.cgi?id=56982
+-if subprocess.call("""$CC --version | grep -i 'gcc.* 4[.][89]' >/dev/null """, shell=True) == 0:
++if subprocess.call("""gcc --version | grep -i 'gcc.* 4[.][89]' >/dev/null """, shell=True) == 0:
+ extra_compile_args.append('-fno-tree-dominator-opts')
+
+ # Generate interpreters
+@@ -171,11 +161,11 @@ for m in ext_modules:
# FIMXE: Do NOT link the following libraries to each and
# every module (regardless of the language btw.):
@@ -95,20 +108,3 @@ diff -up sage-5.9/spkg/build/sage-5.9/setup.py.orig sage-5.9/spkg/build/sage-5.9
-diff -up sage-5.9/spkg/build/conway_polynomials-0.4.p0/spkg-install.orig sage-5.9/spkg/build/conway_polynomials-0.4.p0/spkg-install
---- sage-5.9/spkg/build/conway_polynomials-0.4.p0/spkg-install.orig 2013-05-06 17:47:06.493293291 -0300
-+++ sage-5.9/spkg/build/conway_polynomials-0.4.p0/spkg-install 2013-05-06 17:48:27.883296408 -0300
-@@ -2,9 +2,11 @@
-
- import os
- from sage.all import save
--from sage.misc.misc import SAGE_SHARE
-
--install_root = os.path.join(SAGE_SHARE, 'conway_polynomials')
-+if 'SAGE_SHARE' not in os.environ:
-+ raise RuntimeError("SAGE_SHARE undefined, maybe run `sage -sh`?")
-+
-+install_root = os.path.join(os.environ['SAGE_SHARE'], 'conway_polynomials')
-
- def create_db():
- db = {}
diff --git a/sagemath-sagedoc.patch b/sagemath-sagedoc.patch
index da8b615..88a27d4 100644
--- a/sagemath-sagedoc.patch
+++ b/sagemath-sagedoc.patch
@@ -1,6 +1,6 @@
-diff -up sage-5.9/spkg/build/sage-5.9/doc/common/builder.py.orig sage-5.9/spkg/build/sage-5.9/doc/common/builder.py
---- sage-5.9/spkg/build/sage-5.9/doc/common/builder.py.orig 2013-05-07 18:11:12.277264082 -0300
-+++ sage-5.9/spkg/build/sage-5.9/doc/common/builder.py 2013-05-07 18:11:15.785264216 -0300
+diff -up sage-5.10/spkg/build/sage-5.10/doc/common/builder.py.orig sage-5.10/spkg/build/sage-5.10/doc/common/builder.py
+--- sage-5.10/spkg/build/sage-5.10/doc/common/builder.py.orig 2013-07-29 19:49:41.413042474 -0300
++++ sage-5.10/spkg/build/sage-5.10/doc/common/builder.py 2013-07-29 19:49:53.076042920 -0300
@@ -32,7 +32,7 @@ from sage.env import SAGE_DOC, SAGE_SRC
# SAGE_DOC, LANGUAGES, SPHINXOPTS, PAPER, OMIT,
# PAPEROPTS, ALLSPHINXOPTS, NUM_THREADS, WEBSITESPHINXOPTS
@@ -10,9 +10,9 @@ diff -up sage-5.9/spkg/build/sage-5.9/doc/common/builder.py.orig sage-5.9/spkg/b
##########################################
-diff -up sage-5.9/spkg/build/sage-5.9/doc/common/conf.py.orig sage-5.9/spkg/build/sage-5.9/doc/common/conf.py
---- sage-5.9/spkg/build/sage-5.9/doc/common/conf.py.orig 2013-05-07 18:11:12.286264082 -0300
-+++ sage-5.9/spkg/build/sage-5.9/doc/common/conf.py 2013-05-07 18:11:15.788264216 -0300
+diff -up sage-5.10/spkg/build/sage-5.10/doc/common/conf.py.orig sage-5.10/spkg/build/sage-5.10/doc/common/conf.py
+--- sage-5.10/spkg/build/sage-5.10/doc/common/conf.py.orig 2013-07-29 19:49:41.420042474 -0300
++++ sage-5.10/spkg/build/sage-5.10/doc/common/conf.py 2013-07-29 19:49:53.077042920 -0300
@@ -1,5 +1,5 @@
import sys, os, sphinx
-from sage.env import SAGE_DOC
@@ -30,9 +30,9 @@ diff -up sage-5.9/spkg/build/sage-5.9/doc/common/conf.py.orig sage-5.9/spkg/buil
mathjax_relative = os.path.join('sagenb','data','mathjax')
# It would be really nice if sphinx would copy the entire mathjax directory,
-diff -up sage-5.9/spkg/build/sage-5.9/sage/doctest/control.py.orig sage-5.9/spkg/build/sage-5.9/sage/doctest/control.py
---- sage-5.9/spkg/build/sage-5.9/sage/doctest/control.py.orig 2013-05-07 18:11:29.325264735 -0300
-+++ sage-5.9/spkg/build/sage-5.9/sage/doctest/control.py 2013-05-07 18:12:09.794266284 -0300
+diff -up sage-5.10/spkg/build/sage-5.10/sage/doctest/control.py.orig sage-5.10/spkg/build/sage-5.10/sage/doctest/control.py
+--- sage-5.10/spkg/build/sage-5.10/sage/doctest/control.py.orig 2013-07-29 19:48:53.706040647 -0300
++++ sage-5.10/spkg/build/sage-5.10/sage/doctest/control.py 2013-07-29 19:49:53.079042920 -0300
@@ -88,7 +88,6 @@ class DocTestDefaults(SageObject):
self.valgrind = False
self.massif = False
@@ -41,7 +41,7 @@ diff -up sage-5.9/spkg/build/sage-5.9/sage/doctest/control.py.orig sage-5.9/spkg
self.failed = False
self.new = False
self.show_skipped = False
-@@ -161,7 +160,7 @@ class DocTestController(SageObject):
+@@ -213,7 +212,7 @@ class DocTestController(SageObject):
if options.gdb or options.debug:
# Interactive debuggers: "infinite" timeout
options.timeout = 0
@@ -50,7 +50,7 @@ diff -up sage-5.9/spkg/build/sage-5.9/sage/doctest/control.py.orig sage-5.9/spkg
# Non-interactive debuggers: 48 hours
options.timeout = int(os.getenv('SAGE_TIMEOUT_VALGRIND', 48 * 60 * 60))
elif options.long:
-@@ -766,13 +765,8 @@ class DocTestController(SageObject):
+@@ -809,13 +808,8 @@ class DocTestController(SageObject):
elif opt.cachegrind:
toolname = "cachegrind"
flags = os.getenv("SAGE_CACHEGRIND_FLAGS", "")
@@ -64,7 +64,7 @@ diff -up sage-5.9/spkg/build/sage-5.9/sage/doctest/control.py.orig sage-5.9/spkg
if "%s" in flags:
flags %= toolname + ".%p" # replace %s with toolname
cmd += flags + sage_cmd
-@@ -832,10 +826,10 @@ class DocTestController(SageObject):
+@@ -875,10 +869,10 @@ class DocTestController(SageObject):
0
"""
opt = self.options
@@ -77,9 +77,9 @@ diff -up sage-5.9/spkg/build/sage-5.9/sage/doctest/control.py.orig sage-5.9/spkg
return 2
return self.run_val_gdb()
else:
-diff -up sage-5.9/spkg/build/sage-5.9/sage/interfaces/singular.py.orig sage-5.9/spkg/build/sage-5.9/sage/interfaces/singular.py
---- sage-5.9/spkg/build/sage-5.9/sage/interfaces/singular.py.orig 2013-05-07 18:11:12.296264082 -0300
-+++ sage-5.9/spkg/build/sage-5.9/sage/interfaces/singular.py 2013-05-07 18:11:15.792264216 -0300
+diff -up sage-5.10/spkg/build/sage-5.10/sage/interfaces/singular.py.orig sage-5.10/spkg/build/sage-5.10/sage/interfaces/singular.py
+--- sage-5.10/spkg/build/sage-5.10/sage/interfaces/singular.py.orig 2013-07-29 19:49:41.443042475 -0300
++++ sage-5.10/spkg/build/sage-5.10/sage/interfaces/singular.py 2013-07-29 19:49:53.081042920 -0300
@@ -2149,7 +2149,7 @@ def generate_docstring_dictionary():
nodes.clear()
node_names.clear()
@@ -89,9 +89,9 @@ diff -up sage-5.9/spkg/build/sage-5.9/sage/interfaces/singular.py.orig sage-5.9/
new_node = re.compile("File: singular\.hlp, Node: ([^,]*),.*")
new_lookup = re.compile("\* ([^:]*):*([^.]*)\..*")
-diff -up sage-5.9/spkg/build/sage-5.9/sage/misc/latex_macros.py.orig sage-5.9/spkg/build/sage-5.9/sage/misc/latex_macros.py
---- sage-5.9/spkg/build/sage-5.9/sage/misc/latex_macros.py.orig 2013-05-07 18:11:12.303264083 -0300
-+++ sage-5.9/spkg/build/sage-5.9/sage/misc/latex_macros.py 2013-05-07 18:11:15.793264216 -0300
+diff -up sage-5.10/spkg/build/sage-5.10/sage/misc/latex_macros.py.orig sage-5.10/spkg/build/sage-5.10/sage/misc/latex_macros.py
+--- sage-5.10/spkg/build/sage-5.10/sage/misc/latex_macros.py.orig 2013-07-29 19:49:41.450042475 -0300
++++ sage-5.10/spkg/build/sage-5.10/sage/misc/latex_macros.py 2013-07-29 19:49:53.082042920 -0300
@@ -142,7 +142,7 @@ def convert_latex_macro_to_mathjax(macro
return name + ': ["' + defn + '",' + str(num_args) + ']'
diff --git a/sagemath-sagenb.patch b/sagemath-sagenb.patch
index d9eec3f..3763273 100644
--- a/sagemath-sagenb.patch
+++ b/sagemath-sagenb.patch
@@ -1,6 +1,6 @@
-diff -up sage-5.9/spkg/build/sagenb-0.10.4/src/sagenb/flask_version/base.py.orig sage-5.9/spkg/build/sagenb-0.10.4/src/sagenb/flask_version/base.py
---- sage-5.9/spkg/build/sagenb-0.10.4/src/sagenb/flask_version/base.py.orig 2012-10-20 11:29:36.315150735 -0300
-+++ sage-5.9/spkg/build/sagenb-0.10.4/src/sagenb/flask_version/base.py 2012-10-20 11:29:56.569151510 -0300
+diff -up sage-5.10/spkg/build/sagenb-0.10.4/src/sagenb/flask_version/base.py.orig sage-5.10/spkg/build/sagenb-0.10.4/src/sagenb/flask_version/base.py
+--- sage-5.10/spkg/build/sagenb-0.10.4/src/sagenb/flask_version/base.py.orig 2012-10-20 11:29:36.315150735 -0300
++++ sage-5.10/spkg/build/sagenb-0.10.4/src/sagenb/flask_version/base.py 2012-10-20 11:29:56.569151510 -0300
@@ -27,7 +27,7 @@ class SageNBFlask(Flask):
self.add_static_path('/javascript', DATA)
self.add_static_path('/static', DATA)
@@ -10,9 +10,9 @@ diff -up sage-5.9/spkg/build/sagenb-0.10.4/src/sagenb/flask_version/base.py.orig
import mimetypes
mimetypes.add_type('text/plain','.jmol')
-diff -up sage-5.9/spkg/build/sagenb-0.10.4/src/sagenb/sagenb/data/sage/html/notebook/base.html.orig sage-5.9/spkg/build/sagenb-0.10.4/src/sagenb/sagenb/data/sage/html/notebook/base.html
---- sage-5.9/spkg/build/sagenb-0.10.4/src/sagenb/sagenb/data/sage/html/notebook/base.html.orig 2012-10-20 11:31:17.315154602 -0300
-+++ sage-5.9/spkg/build/sagenb-0.10.4/src/sagenb/sagenb/data/sage/html/notebook/base.html 2012-10-20 11:31:41.764155539 -0300
+diff -up sage-5.10/spkg/build/sagenb-0.10.4/src/sagenb/sagenb/data/sage/html/notebook/base.html.orig sage-5.10/spkg/build/sagenb-0.10.4/src/sagenb/sagenb/data/sage/html/notebook/base.html
+--- sage-5.10/spkg/build/sagenb-0.10.4/src/sagenb/sagenb/data/sage/html/notebook/base.html.orig 2012-10-20 11:31:17.315154602 -0300
++++ sage-5.10/spkg/build/sagenb-0.10.4/src/sagenb/sagenb/data/sage/html/notebook/base.html 2012-10-20 11:31:41.764155539 -0300
@@ -69,7 +69,7 @@ INPUT:
<!-- Jmol - embedded 3D graphics -->
<script type="text/javascript" src="/java/jmol/appletweb/Jmol.js"></script>
@@ -22,9 +22,9 @@ diff -up sage-5.9/spkg/build/sagenb-0.10.4/src/sagenb/sagenb/data/sage/html/note
{% if JEDITABLE_TINYMCE and not worksheet.docbrowser() and not worksheet.is_published() %}
<!-- TinyMCE and jEditable - in-place editing of text cells -->
-diff -up sage-5.9/spkg/build/sagenb-0.10.4/src/sagenb/sagenb/notebook/cell.py.orig sage-5.9/spkg/build/sagenb-0.10.4/src/sagenb/sagenb/notebook/cell.py
---- sage-5.9/spkg/build/sagenb-0.10.4/src/sagenb/sagenb/notebook/cell.py.orig 2012-10-20 11:33:00.483158553 -0300
-+++ sage-5.9/spkg/build/sagenb-0.10.4/src/sagenb/sagenb/notebook/cell.py 2012-10-20 11:33:17.700159212 -0300
+diff -up sage-5.10/spkg/build/sagenb-0.10.4/src/sagenb/sagenb/notebook/cell.py.orig sage-5.10/spkg/build/sagenb-0.10.4/src/sagenb/sagenb/notebook/cell.py
+--- sage-5.10/spkg/build/sagenb-0.10.4/src/sagenb/sagenb/notebook/cell.py.orig 2012-10-20 11:33:00.483158553 -0300
++++ sage-5.10/spkg/build/sagenb-0.10.4/src/sagenb/sagenb/notebook/cell.py 2012-10-20 11:33:17.700159212 -0300
@@ -2367,7 +2367,7 @@ class Cell(Cell_generic):
jmol_script = jmol_file.read()
jmol_file.close()
@@ -34,9 +34,9 @@ diff -up sage-5.9/spkg/build/sagenb-0.10.4/src/sagenb/sagenb/notebook/cell.py.or
jmol_file = open(jmol_name, 'w')
jmol_file.write(jmol_script)
-diff -up sage-5.9/spkg/build/sagenb-0.10.4/src/sagenb/sagenb/notebook/run_notebook.py.orig sage-5.9/spkg/build/sagenb-0.10.4/src/sagenb/sagenb/notebook/run_notebook.py
---- sage-5.9/spkg/build/sagenb-0.10.4/src/sagenb/sagenb/notebook/run_notebook.py.orig 2012-10-20 11:31:55.106156049 -0300
-+++ sage-5.9/spkg/build/sagenb-0.10.4/src/sagenb/sagenb/notebook/run_notebook.py 2012-10-20 11:32:51.460158207 -0300
+diff -up sage-5.10/spkg/build/sagenb-0.10.4/src/sagenb/sagenb/notebook/run_notebook.py.orig sage-5.10/spkg/build/sagenb-0.10.4/src/sagenb/sagenb/notebook/run_notebook.py
+--- sage-5.10/spkg/build/sagenb-0.10.4/src/sagenb/sagenb/notebook/run_notebook.py.orig 2012-10-20 11:31:55.106156049 -0300
++++ sage-5.10/spkg/build/sagenb-0.10.4/src/sagenb/sagenb/notebook/run_notebook.py 2012-10-20 11:32:51.460158207 -0300
@@ -46,15 +46,14 @@ sagenb.notebook.misc.DIR = %(cwd)r #We s
# Flask #
#########
@@ -57,9 +57,9 @@ diff -up sage-5.9/spkg/build/sagenb-0.10.4/src/sagenb/sagenb/notebook/run_notebo
def save_notebook(notebook):
print "Quitting all running worksheets..."
-diff -up sage-5.9/spkg/build/sagenb-0.10.4/src/sagenb/sagenb/data/sage/js/jmol_lib.js.orig sage-5.9/spkg/build/sagenb-0.10.4/src/sagenb/sagenb/data/sage/js/jmol_lib.js
---- sage-5.9/spkg/build/sagenb-0.10.4/src/sagenb/sagenb/data/sage/js/jmol_lib.js.orig 2012-11-14 22:46:56.488853512 -0200
-+++ sage-5.9/spkg/build/sagenb-0.10.4/src/sagenb/sagenb/data/sage/js/jmol_lib.js 2012-11-14 22:49:02.772858348 -0200
+diff -up sage-5.10/spkg/build/sagenb-0.10.4/src/sagenb/sagenb/data/sage/js/jmol_lib.js.orig sage-5.10/spkg/build/sagenb-0.10.4/src/sagenb/sagenb/data/sage/js/jmol_lib.js
+--- sage-5.10/spkg/build/sagenb-0.10.4/src/sagenb/sagenb/data/sage/js/jmol_lib.js.orig 2012-11-14 22:46:56.488853512 -0200
++++ sage-5.10/spkg/build/sagenb-0.10.4/src/sagenb/sagenb/data/sage/js/jmol_lib.js 2012-11-14 22:49:02.772858348 -0200
@@ -256,9 +256,6 @@ function makeCntrlPanels(url, n, functio
panelHTML +='<button title="Move to own window" onClick="javascript:void(jmol_popup(\''+n+'\'))">Move to own window</button> arbitrarily resizable.<hr/>';
//static image to save
diff --git a/sagemath-scons.patch b/sagemath-scons.patch
index 05efd17..07eb3f2 100644
--- a/sagemath-scons.patch
+++ b/sagemath-scons.patch
@@ -1,6 +1,6 @@
-diff -up sage-5.9/spkg/build/sage-5.9/c_lib/SConstruct.orig sage-5.9/spkg/build/sage-5.9/c_lib/SConstruct
---- sage-5.9/spkg/build/sage-5.9/c_lib/SConstruct.orig 2013-02-23 12:55:48.382841120 -0300
-+++ sage-5.9/spkg/build/sage-5.9/c_lib/SConstruct 2013-02-23 12:56:25.037842523 -0300
+diff -up sage-5.10/spkg/build/sage-5.10/c_lib/SConstruct.orig sage-5.10/spkg/build/sage-5.10/c_lib/SConstruct
+--- sage-5.10/spkg/build/sage-5.10/c_lib/SConstruct.orig 2013-02-23 12:55:48.382841120 -0300
++++ sage-5.10/spkg/build/sage-5.10/c_lib/SConstruct 2013-02-23 12:56:25.037842523 -0300
@@ -126,18 +126,31 @@ env['PYV']=platform.python_version().rsp
# The SCons convenience function Split is the only strange thing
# to python programmers. It just makes a list by splitting on
diff --git a/sagemath-scripts.patch b/sagemath-scripts.patch
index b3ba932..f2241ec 100644
--- a/sagemath-scripts.patch
+++ b/sagemath-scripts.patch
@@ -1,6 +1,6 @@
-diff -up sage-5.9/spkg/bin/sage.orig sage-5.9/spkg/bin/sage
---- sage-5.9/spkg/bin/sage.orig 2013-05-06 12:05:34.567508584 -0300
-+++ sage-5.9/spkg/bin/sage 2013-05-06 12:21:04.123544180 -0300
+diff -up sage-5.10/spkg/bin/sage.orig sage-5.10/spkg/bin/sage
+--- sage-5.10/spkg/bin/sage.orig 2013-07-29 19:28:12.913993132 -0300
++++ sage-5.10/spkg/bin/sage 2013-07-29 19:37:54.835015416 -0300
@@ -11,17 +11,14 @@ usage() {
echo " file.<sage|py|spyx> -- run given .sage, .py or .spyx files"
echo " -advanced -- list all command line options"
@@ -19,9 +19,9 @@ diff -up sage-5.9/spkg/bin/sage.orig sage-5.9/spkg/bin/sage
echo " -python [...] -- run the Python interpreter"
echo " -R [...] -- run Sage's R with given arguments"
echo " -singular [...] -- run Sage's singular with given arguments"
-@@ -36,10 +33,6 @@ usage() {
- echo " --verbose - print debugging output during the test"
+@@ -37,10 +34,6 @@ usage() {
echo " --optional - controls which optional tests are run"
+ echo " --sagenb - test all sagenb files"
echo " --help - show all testing options"
- echo " -upgrade [url] -- download, build and install standard packages from"
- echo " given url. If url not given, automatically selects a"
@@ -30,7 +30,7 @@ diff -up sage-5.9/spkg/bin/sage.orig sage-5.9/spkg/bin/sage
echo " -v, -version -- print the Sage version"
exit 0
}
-@@ -63,14 +56,14 @@ usage_advanced() {
+@@ -64,14 +57,14 @@ usage_advanced() {
echo " -root -- print the Sage root directory"
echo " -gthread, -qthread, -q4thread, -wthread, -pylab"
echo " -- pass the option through to ipython"
@@ -47,7 +47,7 @@ diff -up sage-5.9/spkg/bin/sage.orig sage-5.9/spkg/bin/sage
echo " -inotebook [...] -- start the *insecure* Sage notebook"
echo " -n, -notebook [...] -- start the Sage notebook (options are the same"
echo " as for the notebook command in Sage)"
-@@ -85,16 +78,11 @@ usage_advanced() {
+@@ -86,16 +79,10 @@ usage_advanced() {
echo " -gap [...] -- run Sage's Gap with given arguments"
echo " -gdb -- run Sage under the control of gdb"
echo " -gp [...] -- run Sage's PARI/GP calculator with given arguments"
@@ -56,7 +56,7 @@ diff -up sage-5.9/spkg/bin/sage.orig sage-5.9/spkg/bin/sage
echo " Sage), passing additional options to IPython"
- echo " -kash [...] -- run Sage's Kash with given arguments"
- test -x "$SAGE_LOCAL/bin/kash" || \
- echo " (not installed currently, run sage -i kash)"
+- echo " (not installed currently, run sage -i kash)"
echo " -lisp [...] -- run Lisp interpreter included with Sage"
echo " -M2 [...] -- run Sage's Macaulay2 with given arguments"
- test -x "$SAGE_LOCAL/bin/M2" || \
@@ -64,7 +64,7 @@ diff -up sage-5.9/spkg/bin/sage.orig sage-5.9/spkg/bin/sage
echo " -maxima [...] -- run Sage's Maxima with given arguments"
echo " -mwrank [...] -- run Sage's mwrank with given arguments"
echo " -python [...] -- run the Python interpreter"
-@@ -108,73 +96,6 @@ usage_advanced() {
+@@ -109,74 +96,6 @@ usage_advanced() {
echo
#### 1.......................26..................................................78
#### |.....................--.|...................................................|
@@ -126,6 +126,7 @@ diff -up sage-5.9/spkg/bin/sage.orig sage-5.9/spkg/bin/sage
- echo " --initial - only show the first failure per block"
- echo " --debug - drop into PDB after an unexpected error"
- echo " --failed - only test files that failed last test"
+- echo " --sagenb - test all sagenb files"
- echo " --help - show all testing options"
- echo " -tp <N> [...] -- like -t above, but tests in parallel using N threads"
- echo " with 0 interpreted as a sensible default"
@@ -138,7 +139,7 @@ diff -up sage-5.9/spkg/bin/sage.orig sage-5.9/spkg/bin/sage
echo "Documentation:"
echo " -coverage <files> -- give info about doctest coverage of files"
echo " -coverageall -- give summary info about doctest coverage of all"
-@@ -197,20 +118,6 @@ usage_advanced() {
+@@ -199,19 +118,6 @@ usage_advanced() {
echo
#### 1.......................26..................................................78
#### |.....................--.|...................................................|
@@ -146,7 +147,6 @@ diff -up sage-5.9/spkg/bin/sage.orig sage-5.9/spkg/bin/sage
- echo " -bdist VER -- build a binary distribution of Sage"
- echo " -combinat [...] -- run sage-combinat patch management script"
- echo " -crap sage-ver.tar -- detect suspicious garbage in sage source tarball"
-- echo " -merge -- run Sage's automatic merge and test script"
- echo " -pkg <dir> -- create Sage package dir.spkg from a given directory"
- echo " -pkg_nc <dir> -- as -pkg, but do not compress the package"
- echo " -rsyncdist VER -- build an rsyncable source distribution of Sage (you"
@@ -159,7 +159,7 @@ diff -up sage-5.9/spkg/bin/sage.orig sage-5.9/spkg/bin/sage
echo "Valgrind memory debugging:"
echo " -cachegrind -- run Sage using Valgrind's cachegrind tool. The log"
echo " files are named sage-cachegrind.PID can be found in"
-@@ -224,9 +131,6 @@ usage_advanced() {
+@@ -225,9 +131,6 @@ usage_advanced() {
echo " -memcheck -- run Sage using Valgrind's memcheck tool. The log"
echo " files are named sage-memcheck.PID can be found in"
echo " $DOT_SAGE"
@@ -169,7 +169,7 @@ diff -up sage-5.9/spkg/bin/sage.orig sage-5.9/spkg/bin/sage
echo " -valgrind -- this is an alias for -memcheck"
echo
echo "You can also use -- before a long option, e.g., 'sage --optional'."
-@@ -246,15 +150,6 @@ if [ "$1" = '--nodotsage' ]; then
+@@ -247,15 +150,6 @@ if [ "$1" = '--nodotsage' ]; then
exit $status
fi
@@ -185,11 +185,8 @@ diff -up sage-5.9/spkg/bin/sage.orig sage-5.9/spkg/bin/sage
if [ $# -gt 0 ]; then
if [ "$1" = '-h' -o "$1" = '-?' -o "$1" = '-help' -o "$1" = '--help' ]; then
usage
-@@ -264,28 +159,13 @@ if [ $# -gt 0 ]; then
- fi
- fi
+@@ -268,25 +162,11 @@ fi
--
# Prepare for running Sage, either interactively or non-interactively.
sage_setup() {
- # Check that we're not in a source tarball which hasn't been built yet (#13561).
@@ -214,11 +211,10 @@ diff -up sage-5.9/spkg/bin/sage.orig sage-5.9/spkg/bin/sage
if [ ! -d "$IPYTHONDIR" ]; then
# make sure that $DOT_SAGE exists so that ipython will happily
# create its config directories there. If DOT_SAGE doesn't
-@@ -295,21 +175,6 @@ sage_setup() {
- sage-cleaner &>/dev/null &
+@@ -297,20 +177,6 @@ sage_setup() {
}
--
+
-# Check to see if the whole Sage install tree has moved. If so,
-# change various hardcoded paths. Skip this if we don't have write
-# access to $SAGE_LOCAL (e.g. when running as a different user) or
@@ -236,7 +232,7 @@ diff -up sage-5.9/spkg/bin/sage.orig sage-5.9/spkg/bin/sage
# Start an interactive Sage session, this function never returns.
interactive_sage() {
sage_setup
-@@ -348,12 +213,6 @@ if [ "$1" = '-root' -o "$1" = '--root'
+@@ -349,12 +215,6 @@ if [ "$1" = '-root' -o "$1" = '--root'
exit 0
fi
@@ -249,7 +245,7 @@ diff -up sage-5.9/spkg/bin/sage.orig sage-5.9/spkg/bin/sage
#####################################################################
# Run Sage's versions of the standard Algebra/Geometry etc. software
#####################################################################
-@@ -363,74 +222,59 @@ if [ "$1" = '-axiom' -o "$1" = '--axiom'
+@@ -364,74 +224,59 @@ if [ "$1" = '-axiom' -o "$1" = '--axiom'
exec axiom "$@"
fi
@@ -335,7 +331,7 @@ diff -up sage-5.9/spkg/bin/sage.orig sage-5.9/spkg/bin/sage
fi
if [ "$1" = '-python' -o "$1" = '--python' ]; then
-@@ -440,7 +284,7 @@ fi
+@@ -441,12 +286,12 @@ fi
if [ "$1" = '-R' -o "$1" = '--R' ]; then
shift
@@ -344,7 +340,13 @@ diff -up sage-5.9/spkg/bin/sage.orig sage-5.9/spkg/bin/sage
fi
if [ "$1" = '-ipython' -o "$1" = '--ipython' ]; then
-@@ -566,33 +410,6 @@ EOF
+ shift
+- exec "$SAGE_LOCAL/bin/ipython" "$@"
++ exec ipython "$@"
+ fi
+
+ if [ "$1" = '-sh' -o "$1" = '--sh' ]; then
+@@ -567,28 +412,6 @@ EOF
exit $status
fi
@@ -356,11 +358,6 @@ diff -up sage-5.9/spkg/bin/sage.orig sage-5.9/spkg/bin/sage
- exec "$SAGE_LOCAL/bin/hg" "$@"
-fi
-
--if [ "$1" = '-merge' -o "$1" = '--merge' ]; then
-- shift
-- exec sage-apply-ticket "$@"
--fi
--
-#####################################################################
-# Test coverage of a module?
-#####################################################################
@@ -378,7 +375,7 @@ diff -up sage-5.9/spkg/bin/sage.orig sage-5.9/spkg/bin/sage
#####################################################################
# File conversion
#####################################################################
-@@ -608,36 +425,15 @@ if [ "$1" = '-rst2sws' -o "$1" = '--rst2
+@@ -604,36 +427,15 @@ if [ "$1" = '-rst2sws' -o "$1" = '--rst2
fi
#####################################################################
@@ -415,7 +412,7 @@ diff -up sage-5.9/spkg/bin/sage.orig sage-5.9/spkg/bin/sage
if [ "$1" = "-inotebook" -o "$1" = '--inotebook' ]; then
shift
sage-cleaner &>/dev/null &
-@@ -656,86 +452,14 @@ if [ "$1" = '-grepdoc' -o "$1" = "--grep
+@@ -652,86 +454,14 @@ if [ "$1" = '-grepdoc' -o "$1" = "--grep
exit 0
fi
@@ -504,7 +501,7 @@ diff -up sage-5.9/spkg/bin/sage.orig sage-5.9/spkg/bin/sage
shift
exec sage-runtests -p "$@"
else
-@@ -744,16 +468,6 @@ if [ "$1" = '-t' -o "$1" = '-bt' -o "$1"
+@@ -740,10 +470,7 @@ if [ "$1" = '-t' -o "$1" = '-bt' -o "$1"
fi
fi
@@ -512,16 +509,11 @@ diff -up sage-5.9/spkg/bin/sage.orig sage-5.9/spkg/bin/sage
- if [ "$1" = '-btnew' ]; then
- build_sage
- fi
-- shift
-- SAGE_BANNER="no"
-- sage_setup
-- exec sage-runtests --new "$@"
--fi
--
- if [ "$1" = '-testall' -o "$1" = "--testall" ]; then
++if [ "$1" = '-tnew' ]; then
shift
SAGE_BANNER="no"
-@@ -761,12 +475,6 @@ if [ "$1" = '-testall' -o "$1" = "--test
+ sage_setup
+@@ -757,12 +484,6 @@ if [ "$1" = '-testall' -o "$1" = "--test
exec sage-runtests -a "$@"
fi
@@ -534,7 +526,7 @@ diff -up sage-5.9/spkg/bin/sage.orig sage-5.9/spkg/bin/sage
if [ "$1" = '-c' ]; then
shift
SAGE_BANNER="no"
-@@ -775,166 +483,6 @@ if [ "$1" = '-c' ]; then
+@@ -771,166 +492,6 @@ if [ "$1" = '-c' ]; then
exec sage-eval "$@"
fi
@@ -695,13 +687,13 @@ diff -up sage-5.9/spkg/bin/sage.orig sage-5.9/spkg/bin/sage
-
-if [ "$1" = "-docbuild" -o "$1" = "--docbuild" ]; then
- shift
-- exec python "$SAGE_ROOT/devel/sage/doc/common/builder.py" "$@"
+- exec python "$SAGE_DOC/common/builder.py" "$@"
-fi
-
if [ "$1" = '-gdb' -o "$1" = "--gdb" ]; then
shift
sage_setup
-@@ -983,12 +531,6 @@ if [ "$1" = '-callgrind' -o "$1" = "--ca
+@@ -979,12 +540,6 @@ if [ "$1" = '-callgrind' -o "$1" = "--ca
exec sage-callgrind "$@"
fi
@@ -714,9 +706,9 @@ diff -up sage-5.9/spkg/bin/sage.orig sage-5.9/spkg/bin/sage
if [ "$1" = '-startuptime' -o "$1" = '--startuptime' ]; then
exec sage-startuptime.py "$@"
fi
-diff -up sage-5.9/spkg/build/sage_scripts-5.9/sage-runtests.orig sage-5.9/spkg/build/sage_scripts-5.9/sage-runtests
---- sage-5.9/spkg/build/sage_scripts-5.9/sage-runtests.orig 2013-05-06 12:10:00.030518749 -0300
-+++ sage-5.9/spkg/build/sage_scripts-5.9/sage-runtests 2013-05-06 12:22:51.300548284 -0300
+diff -up sage-5.10/spkg/build/sage_scripts-5.10/sage-runtests.orig sage-5.10/spkg/build/sage_scripts-5.10/sage-runtests
+--- sage-5.10/spkg/build/sage_scripts-5.10/sage-runtests.orig 2013-07-29 19:28:12.926993133 -0300
++++ sage-5.10/spkg/build/sage_scripts-5.10/sage-runtests 2013-07-29 19:29:16.809995579 -0300
@@ -54,10 +54,6 @@ if __name__ == "__main__":
help="run doctests using Valgrind's cachegrind tool. The log "
"files are named sage-cachegrind.PID and can be found in " +
@@ -728,9 +720,9 @@ diff -up sage-5.9/spkg/build/sage_scripts-5.9/sage-runtests.orig sage-5.9/spkg/b
parser.add_option("-f", "--failed", action="store_true", default=False,
help="doctest only those files that failed in the previous run")
-diff -up sage-5.9/spkg/build/sage_scripts-5.9/sage-valgrind.orig sage-5.9/spkg/build/sage_scripts-5.9/sage-valgrind
---- sage-5.9/spkg/build/sage_scripts-5.9/sage-valgrind.orig 2013-05-06 12:05:34.644508587 -0300
-+++ sage-5.9/spkg/build/sage_scripts-5.9/sage-valgrind 2013-05-06 12:22:03.076546437 -0300
+diff -up sage-5.10/spkg/build/sage_scripts-5.10/sage-valgrind.orig sage-5.10/spkg/build/sage_scripts-5.10/sage-valgrind
+--- sage-5.10/spkg/build/sage_scripts-5.10/sage-valgrind.orig 2013-07-29 19:28:12.939993133 -0300
++++ sage-5.10/spkg/build/sage_scripts-5.10/sage-valgrind 2013-07-29 19:28:42.761994275 -0300
@@ -11,7 +11,7 @@ fi
LOG="$DOT_SAGE"/valgrind/sage-memcheck.%p
echo "Log file is $LOG"
diff --git a/sagemath-unpatched_ntl.patch b/sagemath-unpatched_ntl.patch
index 54c39de..0880a5d 100644
--- a/sagemath-unpatched_ntl.patch
+++ b/sagemath-unpatched_ntl.patch
@@ -1,6 +1,6 @@
-diff -up sage-5.9/spkg/build/sage-5.9/c_lib/include/ntl_wrap.h.orig sage-5.9/spkg/build/sage-5.9/c_lib/include/ntl_wrap.h
---- sage-5.9/spkg/build/sage-5.9/c_lib/include/ntl_wrap.h.orig 2013-01-25 21:54:01.313110341 -0200
-+++ sage-5.9/spkg/build/sage-5.9/c_lib/include/ntl_wrap.h 2013-01-25 21:54:13.153110794 -0200
+diff -up sage-5.10/spkg/build/sage-5.10/c_lib/include/ntl_wrap.h.orig sage-5.10/spkg/build/sage-5.10/c_lib/include/ntl_wrap.h
+--- sage-5.10/spkg/build/sage-5.10/c_lib/include/ntl_wrap.h.orig 2013-01-25 21:54:01.313110341 -0200
++++ sage-5.10/spkg/build/sage-5.10/c_lib/include/ntl_wrap.h 2013-01-25 21:54:13.153110794 -0200
@@ -35,8 +35,6 @@ using namespace NTL;
EXTERN void del_charstar(char*);
@@ -10,9 +10,9 @@ diff -up sage-5.9/spkg/build/sage-5.9/c_lib/include/ntl_wrap.h.orig sage-5.9/spk
//////// ZZ //////////
#ifndef __cplusplus
-diff -up sage-5.9/spkg/build/sage-5.9/c_lib/src/ntl_wrap.cpp.orig sage-5.9/spkg/build/sage-5.9/c_lib/src/ntl_wrap.cpp
---- sage-5.9/spkg/build/sage-5.9/c_lib/src/ntl_wrap.cpp.orig 2013-01-25 21:53:32.800109249 -0200
-+++ sage-5.9/spkg/build/sage-5.9/c_lib/src/ntl_wrap.cpp 2013-01-25 21:53:49.625109893 -0200
+diff -up sage-5.10/spkg/build/sage-5.10/c_lib/src/ntl_wrap.cpp.orig sage-5.10/spkg/build/sage-5.10/c_lib/src/ntl_wrap.cpp
+--- sage-5.10/spkg/build/sage-5.10/c_lib/src/ntl_wrap.cpp.orig 2013-01-25 21:53:32.800109249 -0200
++++ sage-5.10/spkg/build/sage-5.10/c_lib/src/ntl_wrap.cpp 2013-01-25 21:53:49.625109893 -0200
@@ -11,13 +11,6 @@ void del_charstar(char* a) {
delete[] a;
}
@@ -27,9 +27,9 @@ diff -up sage-5.9/spkg/build/sage-5.9/c_lib/src/ntl_wrap.cpp.orig sage-5.9/spkg/
//////// ZZ //////////
/* Return value is only valid if the result should fit into an int.
-diff -up sage-5.9/spkg/build/sage-5.9/c_lib/src/stdsage.c.orig sage-5.9/spkg/build/sage-5.9/c_lib/src/stdsage.c
---- sage-5.9/spkg/build/sage-5.9/c_lib/src/stdsage.c.orig 2013-01-25 21:54:34.072111596 -0200
-+++ sage-5.9/spkg/build/sage-5.9/c_lib/src/stdsage.c 2013-01-25 21:54:49.832112199 -0200
+diff -up sage-5.10/spkg/build/sage-5.10/c_lib/src/stdsage.c.orig sage-5.10/spkg/build/sage-5.10/c_lib/src/stdsage.c
+--- sage-5.10/spkg/build/sage-5.10/c_lib/src/stdsage.c.orig 2013-01-25 21:54:34.072111596 -0200
++++ sage-5.10/spkg/build/sage-5.10/c_lib/src/stdsage.c 2013-01-25 21:54:49.832112199 -0200
@@ -29,27 +29,12 @@ void init_global_empty_tuple(void) {
global_empty_tuple = PyTuple_New(0);
}
diff --git a/sagemath.spec b/sagemath.spec
index e3bd162..0919f92 100644
--- a/sagemath.spec
+++ b/sagemath.spec
@@ -55,7 +55,7 @@
%global flintqs_pkg flintqs-20070817.p8
%global graphs_pkg graphs-20120404.p4
%global pexpect_pkg pexpect-2.0.p5
-%global polytopes_db_pkg polytopes_db-20100210.p2
+%global polytopes_db_pkg polytopes_db-20120220
%global rubiks_pkg rubiks-20070912.p18
%global sagenb_pkg sagenb-0.10.4
%global sagetex_pkg sagetex-2.3.4
@@ -65,7 +65,7 @@
%global SAGE_ROOT %{_libdir}/sagemath
%global SAGE_LOCAL %{SAGE_ROOT}/local
%global SAGE_SRC %{SAGE_ROOT}/src
-%global SAGE_DOC %{_docdir}/%{name}-%{version}
+%global SAGE_DOC %{_docdir}/%{name}
%global SAGE_SHARE %{_datadir}/sagemath
%global SAGE_EXTCODE %{SAGE_SHARE}/ext
%global SAGE_PYTHONPATH %{SAGE_ROOT}/site-packages
@@ -73,8 +73,8 @@
Name: sagemath
Group: Applications/Engineering
Summary: A free open-source mathematics software system
-Version: 5.9
-Release: 9%{?dist}
+Version: 5.10
+Release: 1%{?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
@@ -219,6 +219,10 @@ Patch33: %{name}-m4rie.patch
# https://bugzilla.redhat.com/show_bug.cgi?id=961372
Patch34: %{name}-rh_bz_961372.patch
+# Required if running python-flask-0.10.1
+# sagemath expects python-flask-0.9
+Patch35: %{name}-flask.patch
+
BuildRequires: 4ti2
BuildRequires: atlas-devel
BuildRequires: cddlib-tools
@@ -237,7 +241,7 @@ BuildRequires: factory-devel
%if %{have_fes}
BuildRequires: fes-devel
%endif
-BuildRequires: flint-devel
+BuildRequires: flint-devel >= 2.3
BuildRequires: gmp-ecm-devel
BuildRequires: gap
BuildRequires: GAPDoc
@@ -362,6 +366,9 @@ Requires: tachyon
Requires: texlive
Requires: vecmath
+# Missing build requires on armv7hl
+ExclusiveArch: %{ix86} x86_64
+
%description
Sage is a free open-source mathematics software system licensed
under the GPL. It combines the power of many existing open-source
@@ -702,6 +709,9 @@ popd
%if 0%{?fedora} >= 19
%patch32 -p1
+%endif
+
+%if 0%{?fedora} == 19
%patch33 -p1
%endif
@@ -709,6 +719,10 @@ popd
%patch34 -p1
%endif
+%if 0%{?fedora} >= 20
+%patch35 -p1
+%endif
+
#------------------------------------------------------------------------
# ensure proper/preferred libatlas is in linker path
pushd spkg/build/sage-%{version}
@@ -718,8 +732,7 @@ pushd spkg/build/sage-%{version}
popd
# remove bundled jar files before build
-rm spkg/build/extcode-%{version}/notebook/java/3d/lib/sage3d.jar \
- spkg/build/%{sagenb_pkg}/src/sagenb/sagenb/data/sage3d/lib/sage3d.jar
+rm spkg/build/%{sagenb_pkg}/src/sagenb/sagenb/data/sage3d/lib/sage3d.jar
# remove binary egg
rm -r spkg/build/%{sagenb_pkg}/src/sagenb/sagenb.egg-info
@@ -1129,8 +1142,8 @@ ln -sf %{SAGE_SHARE} $SAGE_ROOT/share
ln -sf src $SAGE_ROOT/devel
# Install menu and icons
-pushd spkg/build/extcode-%{version}
- install -p -m644 -D notebook/images/icon32x32.png %{buildroot}%{_datadir}/pixmaps/%{name}.png
+pushd spkg/build/%{sagenb_pkg}/src/sagenb/sagenb/data
+ install -p -m644 -D sage/images/icon32x32.png %{buildroot}%{_datadir}/pixmaps/%{name}.png
popd
mkdir -p %{buildroot}%{_datadir}/applications
cat > %{buildroot}%{_datadir}/applications/%{name}.desktop << EOF
@@ -1268,6 +1281,7 @@ exit 0
#------------------------------------------------------------------------
%files data
%dir %{SAGE_SHARE}
+%dir %{SAGE_EXTCODE}
%{SAGE_EXTCODE}/sage
#------------------------------------------------------------------------
@@ -1284,7 +1298,6 @@ exit 0
#------------------------------------------------------------------------
%files data-extcode
# GPLv2+
-%dir %{SAGE_EXTCODE}
%{SAGE_EXTCODE}/gap
%{SAGE_EXTCODE}/images
%{SAGE_EXTCODE}/magma
@@ -1435,7 +1448,10 @@ exit 0
########################################################################
%changelog
-* Sun Aug 04 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5.9-9
+* Mon Aug 5 2013 pcpa <paulo.cesar.pereira.de.andrade at gmail.com> - 5.10-1
+- Update to sagemath 5.10.
+
+* Sun Aug 04 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org>
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
* Wed Jul 3 2013 Jerry James <loganjerry at gmail.com> - 5.9-8
diff --git a/sources b/sources
index 4fbd706..14b318a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-708520904f2d42039c714ac72a631948 sage-5.9.tar
+bfca3afc9030e63c7e7200287ee0135e sage-5.10.tar
More information about the scm-commits
mailing list