Rebuild for ntl 8.1.0.

Also:
- Future-proof the gap package names.

sagemath.spec

@@ -39,7 +39,7 @@ Name:		sagemath
 Group:		Applications/Engineering
 Summary:	A free open-source mathematics software system
 Version:	6.4.1
-Release:	1%{?dist}
+Release:	2%{?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
@@ -139,6 +139,9 @@ Patch21:	%{name}-cryptominisat.patch
 # https://bugzilla.redhat.com/show_bug.cgi?id=974769
 Patch22:	%{name}-sympy.patch
 
+# Fix a name clash with NTL
+Patch23:	%{name}-ntl.patch
+
 BuildRequires:	4ti2
 BuildRequires:	atlas-devel
 BuildRequires:	cddlib-tools
@@ -159,10 +162,10 @@ BuildRequires:	flint-devel >= 2.3
 BuildRequires:	gmp-ecm-devel
 BuildRequires:	gap
 BuildRequires:	GAPDoc
-BuildRequires:	gap-character-tables
 BuildRequires:	gap-libs
-BuildRequires:	gap-sonata
-BuildRequires:	gap-table-of-marks
+BuildRequires:	gap-pkg-ctbllib
+BuildRequires:	gap-pkg-sonata
+BuildRequires:	gap-pkg-tomlib
 BuildRequires:	gc-devel
 BuildRequires:	gd-devel
 BuildRequires:	gfan
@@ -227,10 +230,10 @@ Requires:	ecl
 Requires:	firefox
 Requires:	gap
 Requires:	GAPDoc
-Requires:	gap-character-tables
 Requires:	gap-libs
-Requires:	gap-sonata
-Requires:	gap-table-of-marks
+Requires:	gap-pkg-ctbllib
+Requires:	gap-pkg-sonata
+Requires:	gap-pkg-tomlib
 Requires:	genus2reduction
 Requires:	gfan
 Requires:	gmp-ecm
@@ -601,6 +604,7 @@ popd
 
 %patch21
 %patch22
+%patch23
 
 sed -e 's|@@SAGE_ROOT@@|%{SAGE_ROOT}|' \
     -e 's|@@SAGE_DOC@@|%{SAGE_DOC}|' \
@@ -1305,6 +1309,10 @@ exit 0
 
 ########################################################################
 %changelog
+* Thu Jan 15 2015 Jerry James <loganjerry@gmail.com> - 6.4.1-2
+- Rebuild for ntl 8.1.0
+- Future-proof the gap package names
+
 * Wed Nov 26 2014 pcpa <paulo.cesar.pereira.de.andrade@gmail.com> - 6.4.1-1
 - Update to sagemath 6.4.1 (#1095282)