From 3dc6dbb3c175a499aa615e7c8c996baaaf1b91f9 Mon Sep 17 00:00:00 2001
From: Jerry James <loganjerry@gmail.com>
Date: Fri, 10 Aug 2018 22:26:23 -0600
Subject: [PATCH] Rebuild for arb 2.14.0, eclib 20180710, ntl 11.2.1, and pari
 2.11.0. Drop unneeded genus2reduction dependency; pari is used instead now.

---
 sagemath-eclib.patch | 22 ++++++++++++++++++++++
 sagemath.spec        | 12 +++++++++---
 2 files changed, 31 insertions(+), 3 deletions(-)
 create mode 100644 sagemath-eclib.patch

diff --git a/sagemath-eclib.patch b/sagemath-eclib.patch
new file mode 100644
index 0000000..f0dca1e
--- /dev/null
+++ b/sagemath-eclib.patch
@@ -0,0 +1,22 @@
+--- src/sage/libs/eclib/wrap.cpp.orig	2018-05-05 16:21:24.000000000 -0600
++++ src/sage/libs/eclib/wrap.cpp	2018-08-09 21:57:02.055392569 -0600
+@@ -133,8 +133,8 @@ char* Curvedata_isogeny_class(struct Cur
+ 
+ 
+ int mw_process(struct Curvedata* curve, struct mw* m,
+-                      const struct bigint* x, const struct bigint* y,
+-                      const struct bigint* z, int sat)
++                      const bigint* x, const bigint* y,
++                      const bigint* z, int sat)
+ {
+   Point P(*curve, *x, *y, *z);
+   if (!P.isvalid())
+@@ -188,7 +188,7 @@ int mw_rank(struct mw* m)
+ }
+ 
+ /* Returns index and unsat long array, which user must deallocate */
+-int mw_saturate(struct mw* m, struct bigint* index, char** unsat,
++int mw_saturate(struct mw* m, bigint* index, char** unsat,
+                        long sat_bd, int odd_primes_only)
+ {
+   vector<long> v;
diff --git a/sagemath.spec b/sagemath.spec
index e3e9cc0..901bf82 100644
--- a/sagemath.spec
+++ b/sagemath.spec
@@ -80,7 +80,7 @@
 Name:		sagemath
 Summary:	A free open-source mathematics software system
 Version:	8.2
-Release:	3%{?dist}
+Release:	4%{?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
@@ -186,6 +186,9 @@ Patch26:	%{name}-atlas.patch
 # Adapt to recent versions of the flask packages
 Patch27:	%{name}-flask.patch
 
+# Adapt to recent versions of eclib
+Patch28:	%{name}-eclib.patch
+
 BuildRequires:	4ti2
 BuildRequires:	arb-devel
 BuildRequires:	atlas-devel
@@ -216,7 +219,6 @@ BuildRequires:	gap-pkg-toric
 BuildRequires:	gc-devel
 BuildRequires:	gcc-c++
 BuildRequires:	gd-devel
-BuildRequires:	genus2reduction
 BuildRequires:	gfan
 BuildRequires:	giac-devel
 BuildRequires:	glpk-devel
@@ -346,7 +348,6 @@ Requires:	gap-pkg-guava
 Requires:	gap-pkg-hapcryst
 Requires:	gap-pkg-sonata
 Requires:	gap-pkg-toric
-Requires:	genus2reduction
 Requires:	gfan
 Requires:	gmp-ecm
 Requires:	jmol
@@ -847,6 +848,7 @@ popd
 %patch25
 %patch26
 %patch27
+%patch28
 
 sed -e 's|@@SAGE_ROOT@@|%{SAGE_ROOT}|' \
     -e 's|@@SAGE_DOC@@|%{SAGE_DOC}|' \
@@ -1809,6 +1811,10 @@ exit 0
 
 ########################################################################
 %changelog
+* Fri Aug 10 2018 Jerry James <loganjerry@gmail.com> - 8.2-4
+- Rebuild for arb 2.14.0, eclib 20180710, ntl 11.2.1, and pari 2.11.0
+- Drop unneeded genus2reduction dependency; pari is used instead now
+
 * Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 8.2-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild