Rebuild for libfplll 4.0.3, m4ri and m4rie 20130416, and ntl 6.0.0.

Drop sagemath-unpatched_ntl.patch now that Fedora's NTL is patched.
Add sagemath-ntl6.patch to adapt to NTL 6.

sagemath-unpatched_ntl.patch

@@ -1,60 +0,0 @@
-diff -up sage-5.8/spkg/build/sage-5.8/c_lib/include/ntl_wrap.h.orig sage-5.8/spkg/build/sage-5.8/c_lib/include/ntl_wrap.h
---- sage-5.8/spkg/build/sage-5.8/c_lib/include/ntl_wrap.h.orig	2013-01-25 21:54:01.313110341 -0200
-+++ sage-5.8/spkg/build/sage-5.8/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*);
- 
--EXTERN void setup_NTL_error_callback(void (*function)(const char*, void*), void* context);
--
- ////////  ZZ //////////
- 
- #ifndef __cplusplus
-diff -up sage-5.8/spkg/build/sage-5.8/c_lib/src/ntl_wrap.cpp.orig sage-5.8/spkg/build/sage-5.8/c_lib/src/ntl_wrap.cpp
---- sage-5.8/spkg/build/sage-5.8/c_lib/src/ntl_wrap.cpp.orig	2013-01-25 21:53:32.800109249 -0200
-+++ sage-5.8/spkg/build/sage-5.8/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;
- }
- 
--
--void setup_NTL_error_callback(void (*function)(const char*, void*), void* context)
--{
--    NTL::SetErrorCallbackFunction(function, context);
--}
--
--
- //////// ZZ //////////
- 
- /* Return value is only valid if the result should fit into an int.
-diff -up sage-5.8/spkg/build/sage-5.8/c_lib/src/stdsage.c.orig sage-5.8/spkg/build/sage-5.8/c_lib/src/stdsage.c
---- sage-5.8/spkg/build/sage-5.8/c_lib/src/stdsage.c.orig	2013-01-25 21:54:34.072111596 -0200
-+++ sage-5.8/spkg/build/sage-5.8/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);
- }
- 
--
--/*
--  This function gets called whenever NTL calls Error().
--  s is the error message generated by NTL.
--  We just copy the error message into a global buffer, and then abort() to run
--  the usual interrupt machinery.
-- */
--void global_NTL_error_callback(const char* s, void* context)
--{
--    set_sage_signal_handler_message(s);
--    abort();
--}
--
--
- /* This is called once during Sage startup. On some platforms like
-  * Cygwin, this is also called from init_csage_module(). */
- void init_csage() {
-     init_global_empty_tuple();
-     init_memory_functions();
-     setup_sage_signal_handler();
--    setup_NTL_error_callback(global_NTL_error_callback, NULL);
- }
- 
- /* This is called once for every single module that links in stdsage */

sagemath.spec

@@ -74,7 +74,7 @@ Name:		sagemath
 Group:		Applications/Engineering
 Summary:	A free open-source mathematics software system
 Version:	5.8
-Release:	8%{?dist}
+Release:	9%{?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
@@ -108,10 +108,8 @@ Patch1:		%{name}-gmp.patch
 # Set of patches to work with system wide packages
 Patch2:		%{name}-scripts.patch
 
-# Do not mandate a patched ntl. It was requested to ntl upstream to
+# Adapt to ntl 6.0.0.
-# provide an api to match what sagemath expects.
+Patch3:		%{name}-ntl6.patch
-# http://shoup.net/pipermail/ntl_shoup.net/2012-April/000033.html
-Patch3:		%{name}-unpatched_ntl.patch
 
 # remove call to not implemented sagemath "is_package_installed" interfaces
 # need to package coin-or solver in fedora
@@ -1388,6 +1386,11 @@ exit 0
 
 ########################################################################
 %changelog
+* Mon May  6 2013 Jerry James <loganjerry@gmail.com> - 5.8-9
+- Rebuild for libfplll 4.0.3, m4ri and m4rie 20130416, and ntl 6.0.0
+- Drop sagemath-unpatched_ntl.patch now that Fedora's NTL is patched
+- Add sagemath-ntl6.patch to adapt to NTL 6
+
 * Sat Apr 27 2013 pcpa <paulo.cesar.pereira.de.andrade@gmail.com> - 5.8-8
 - Add surf-geometry to path for proper Singular plotting
 - Add workaround to an rpm scriptlet problem (#877651#89)