From 1f481c59b90b8a5ced4a04e83473bcf4ff14bf62 Mon Sep 17 00:00:00 2001
From: Jerry James <loganjerry@gmail.com>
Date: Aug 11 2018 04:14:03 +0000
Subject: New upstream release.  Drop all patches; all upstreamed.


---

diff --git a/eclib-iszero.patch b/eclib-iszero.patch
deleted file mode 100644
index 811c710..0000000
--- a/eclib-iszero.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- libsrc/eclib/points.h.orig	2016-07-20 05:33:48.000000000 -0600
-+++ libsrc/eclib/points.h	2016-10-20 14:34:29.093289919 -0600
-@@ -29,6 +29,8 @@
- 
- #include "curve.h"
- 
-+#undef iszero
-+
- //
- // class for  points on elliptic curves
- //
diff --git a/eclib-scalar.patch b/eclib-scalar.patch
deleted file mode 100644
index b1959a4..0000000
--- a/eclib-scalar.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- libsrc/eclib/smatrix_elim.h.orig	2017-03-30 06:32:34.000000000 -0600
-+++ libsrc/eclib/smatrix_elim.h	2017-07-24 15:58:23.915550390 -0600
-@@ -90,7 +90,7 @@ find( int X, int* ptr, int ub, int lb =
- // SCALAR_OPTION may be set to 1 or 2 by user
- 
- #if (SCALAR_OPTION==1)
--#define scalar int
-+typedef int scalar;
- #define vec vec_i
- #define mat mat_i
- #define subspace subspace_i
-@@ -99,7 +99,7 @@ find( int X, int* ptr, int ub, int lb =
- #define smat_elim smat_i_elim
- #define ssubspace ssubspace_i
- #else
--#define scalar long
-+typedef long scalar;
- #define vec vec_l
- #define mat mat_l
- #define subspace subspace_l
diff --git a/eclib-vec.patch b/eclib-vec.patch
deleted file mode 100644
index 90c5a48..0000000
--- a/eclib-vec.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- libsrc/symb.cc.orig	2017-12-19 10:31:41.000000000 -0700
-+++ libsrc/symb.cc	2018-06-11 11:13:57.068763280 -0600
-@@ -154,7 +154,8 @@ symbdata::symbdata(long n) :moddata(n),s
- //N.B. dlist include d=1 at 0 and d=mod at end, which we don't want here
-    for (ic=1; (ic<ndivs-1)&&(specials.count()<nsymb2); ic++)
-    { c=dlist[ic];
--     dstarts[ic]=start=specials.count();
-+     start=specials.count();
-+     dstarts.assign(ic,start);
-      for (id=1; (id<modulus-phi)&&(specials.count()<nsymb2); id++)  
-      { d = noninvlist[id];
-        if (::gcd(d,c)==1)
-@@ -184,7 +185,8 @@ long symbdata::index2(long c, long d) co
-        return   modulus-code(xmodmul(kc,d,modulus));
-     else
-     {
--     long start = dstarts[noninvdlist[-kc]];
-+     long indx = noninvdlist[-kc];
-+     long start = (indx < dstarts.size()) ? dstarts[indx] : 0;
-      symb s(c,d,this);
-      long ind = specials.index(s,start);
-      if(ind<0) 
diff --git a/eclib.spec b/eclib.spec
index bd29fa3..ab10ad6 100644
--- a/eclib.spec
+++ b/eclib.spec
@@ -1,8 +1,8 @@
 %global         with_allprogs 0
 
 Name:           eclib
-Version:        20171219
-Release:        3%{?dist}
+Version:        20180710
+Release:        1%{?dist}
 Summary:        Library for Computations on Elliptic Curves
 License:        GPLv2+
 URL:            http://homepages.warwick.ac.uk/~masgaj/mwrank/
@@ -16,12 +16,6 @@ BuildRequires:  libtool
 BuildRequires:  ntl-devel
 BuildRequires:  pari-devel
 
-# Workaround for the addition of an iszero macro to math.h
-Patch0:         %{name}-iszero.patch
-# Fix a name clash with boost
-Patch1:         %{name}-scalar.patch
-# Fix out of bounds vector accesses
-Patch2:         %{name}-vec.patch
 
 %description
 John Cremona's programs for enumerating and computing with elliptic
@@ -45,22 +39,22 @@ Development libraries and headers for %{name}.
 sed -i 's/^LIBS.*/& -lpthread/' tests/Makefile.am
 sed -i 's/^LIBS.*/& -lpthread/' progs/Makefile.am
 
+# FLINT_LEVEL 2 assumes that the C int type == half the width of a limb_t.
+# This is only true on 64 bit platforms.
+if [ %{__isa_bits} = "64" ]; then
+  sed -i '/FLINT_LEVEL/s/1/2/' configure.ac
+fi
+
 # autoconf is not run by upstream
 autoreconf -fi
 
 %build
+export CPPFLAGS="-I %{_includedir}/flint"
 %ifarch %{ix86}
 # Excess precision leads to test failures
 export CFLAGS="%{optflags} -ffloat-store"
 export CXXFLAGS="$CFLAGS"
 %endif
-# FLINT_LEVEL 2 assumes that the C int type == half the width of a limb_t.
-# This is only true on 64 bit platforms.
-if [ %{__isa_bits} = "64" ]; then
-  export CPPFLAGS="-I %{_includedir}/flint -DFLINT_LEVEL=2"
-else
-  export CPPFLAGS="-I %{_includedir}/flint"
-fi
 %configure \
         --disable-static \
         --enable-shared \
@@ -89,6 +83,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 rm $RPM_BUILD_ROOT%{_docdir}/%{name}/{g0n,howto,progs}.txt
 %endif
 
+# Version 20180710 neglects to install type.h
+cp -p libsrc/eclib/types.h $RPM_BUILD_ROOT%{_includedir}/%{name}
+
 
 %check
 make check LD_LIBRARY_PATH=$RPM_BUILD_ROOT%{_libdir}
@@ -116,6 +113,10 @@ make check LD_LIBRARY_PATH=$RPM_BUILD_ROOT%{_libdir}
 
 
 %changelog
+* Fri Aug 10 2018 Jerry James <loganjerry@gmail.com> - 20180710-1
+- New upstream release
+- Drop all patches; all upstreamed
+
 * Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 20171219-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
 
diff --git a/sources b/sources
index 6e35ecf..aa88ab3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (eclib-20171219.tar.gz) = e71d567c8cc62b7688623058341c394186d6440798d83ff93ca091bdf4e3ed5c21b7d69f953c52afcab32ad5d8bd8a49a4b62419ba7630c9f53fabb52a781d86
+SHA512 (eclib-20180710.tar.gz) = 1db2e2bf471b165fdf702ad7655cac6f78ae9b82669d32cf6f97001ccf5486212970ad529f15ff9e90d7c20a790a7f5c4b317b25a27b8ba31635b0cbbeefe2fe