diff --git a/.gitignore b/.gitignore index 5f0ff95..c4e25db 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -/ntl-6.1.0.tar.gz /ntl-6.2.1.tar.gz +/ntl-8.1.0.tar.gz diff --git a/ntl-sagemath.patch b/ntl-sagemath.patch index 9d90a16..6d5387a 100644 --- a/ntl-sagemath.patch +++ b/ntl-sagemath.patch @@ -1,9 +1,10 @@ ---- ./include/NTL/tools.h.orig 2014-08-26 11:51:43.000000000 -0600 -+++ ./include/NTL/tools.h 2014-09-18 20:00:00.000000000 -0600 -@@ -310,6 +310,12 @@ long CharToIntVal(long c); - char IntValToChar(long a); +--- ./include/NTL/tools.h.orig 2015-01-09 06:58:19.000000000 -0700 ++++ ./include/NTL/tools.h 2015-01-12 20:00:00.000000000 -0700 +@@ -406,7 +406,12 @@ void swap(WrappedPtr& x, Wrap + // Error Handling +- +/* + This function is not present in vanilla NTL. + See tools.c for documentation. @@ -11,10 +12,10 @@ +void SetErrorCallbackFunction(void (*func)(const char *s, void *context), + void *context); - void Error(const char *s); - ---- ./src/tools.c.orig 2014-08-26 11:51:42.000000000 -0600 -+++ ./src/tools.c 2014-09-18 20:00:00.000000000 -0600 + class ErrorObject : public NTL_SNS runtime_error { + public: +--- ./src/tools.c.orig 2015-01-09 06:58:19.000000000 -0700 ++++ ./src/tools.c 2015-01-12 20:00:00.000000000 -0700 @@ -17,9 +17,33 @@ NTL_START_IMPL NTL_THREAD_LOCAL void (*ErrorCallback)() = 0; @@ -41,7 +42,7 @@ + ErrorCallbackContext = context; +} - void Error(const char *s) + void TerminalError(const char *s) { + if (ErrorCallbackFunction != NULL) + ErrorCallbackFunction(s, ErrorCallbackContext); diff --git a/ntl.spec b/ntl.spec index fc7d282..11d2a72 100644 --- a/ntl.spec +++ b/ntl.spec @@ -11,7 +11,7 @@ Summary: High-performance algorithms for vectors, matrices, and polynomials Name: ntl -Version: 6.2.1 +Version: 8.1.0 Release: 1%{?dist} License: GPLv2+ @@ -140,7 +140,7 @@ done %files %doc README %license doc/copying.txt -%{_libdir}/libntl.so.5* +%{_libdir}/libntl.so.9* %files devel %doc doc/* @@ -154,6 +154,9 @@ done %changelog +* Thu Jan 15 2015 Jerry James - 8.1.0-1 +- ntl-8.1.0 + * Tue Oct 28 2014 Jerry James - 6.2.1-1 - ntl-6.2.1 - Fix license handling diff --git a/sources b/sources index 5c5a38e..b1c37ac 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -00b7e1cab9bf9b0eae2ad9beab4b0fc9 ntl-6.2.1.tar.gz +9f03248c3c94469f59c58755e87fab7e ntl-8.1.0.tar.gz