From 66a657072e9a9d3d8db5c91a518414545c55804d Mon Sep 17 00:00:00 2001
From: Jerry James <loganjerry@gmail.com>
Date: May 23 2011 20:15:24 +0000
Subject: New upstream version.

Drop unnecessary elements of the spec file (BuildRoot, %clean script, etc.)
Convert previous patches into sed expressions.
Add compiler warning elimination patch.
Eliminate unused direct shared library dependencies.
Fix the FSF's address to make rpmlint shut up.
Add documentation to -devel.

---

diff --git a/.gitignore b/.gitignore
index b374f99..ac6f0a0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/eclib-20080310.p10.spkg
+/eclib-20100711.spkg
diff --git a/eclib-20080310.p7-add-soname.diff b/eclib-20080310.p7-add-soname.diff
deleted file mode 100644
index 99b6d9c..0000000
--- a/eclib-20080310.p7-add-soname.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/Makefile.dynamic.orig	2009-03-18 19:59:33.000000000 -0700
-+++ src/Makefile.dynamic	2009-03-18 20:21:12.000000000 -0700
-@@ -13,7 +13,7 @@
- 	cp $(DY_LIBNAME) $(LIBDIR)/
- 
- $(SO_LIBNAME): $(A_LIBNAME)
--	$(CXX) $(SO_OPTS)  $(A_LIBNAME) $(OBJS) -o $(SO_LIBNAME) $(NTLLFLAGS) $(LIBFLAGS)
-+	$(CXX) $(SO_OPTS)  $(A_LIBNAME) $(OBJS) -o $(SO_LIBNAME) $(NTLLFLAGS) $(LIBFLAGS) -Wl,-soname,$(SO_LIBNAME).__SO_VERSION__
- install_$(SO_LIBNAME), install_so: $(SO_LIBNAME)
- 	cp $(SO_LIBNAME) $(LIBDIR)/
- 
diff --git a/eclib-20080310.p7-use-fedora-optflags.diff b/eclib-20080310.p7-use-fedora-optflags.diff
deleted file mode 100644
index 731bcc9..0000000
--- a/eclib-20080310.p7-use-fedora-optflags.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nur eclib-20080310.p7-orig/src/Makefile eclib-20080310.p7/src/Makefile
---- eclib-20080310.p7-orig/src/Makefile 2008-09-24 16:17:14.000000000 +0200
-+++ eclib-20080310.p7/src/Makefile  2009-03-22 14:10:54.000000000 +0100
-@@ -5,7 +5,7 @@
- CXX      ?= g++ -g
- # PICFLAG -- set to -fPIC to also have the option to build shared libraries (position independent code)
- # This is only needed on linux.
--OPTFLAG  ?=  $(PICFLAG) -g -O2 -DNEW_OP_ORDER -DUSE_PARI_FACTORING
-+OPTFLAG  ?=  $(PICFLAG) $(RPM_OPT_FLAGS) -DNEW_OP_ORDER -DUSE_PARI_FACTORING
- 
- # default settings
- PARI_PREFIX ?= /usr/local
diff --git a/eclib-20080310.p7.spkg b/eclib-20080310.p7.spkg
deleted file mode 100644
index 018d188..0000000
Binary files a/eclib-20080310.p7.spkg and /dev/null differ
diff --git a/eclib-warning.patch b/eclib-warning.patch
new file mode 100644
index 0000000..4d0b1d4
--- /dev/null
+++ b/eclib-warning.patch
@@ -0,0 +1,238 @@
+--- ./src/g0n/pcprocs.cc.orig	2010-01-25 05:14:19.000000000 -0700
++++ ./src/g0n/pcprocs.cc	2011-05-23 13:22:51.860355287 -0600
+@@ -34,7 +34,7 @@
+ 
+ void ratapprox(bigfloat x, long& a, long& b)
+ {
+-  long c, x0, x1, x2, y0, y1, y2;
++  long c, x0, x1, x2 = 0L, y0, y1, y2 = 0L;
+   bigfloat xx, diff;
+   bigfloat eps = to_bigfloat(1.0e-6);
+   xx = x; x0 = 0; x1 = 1; y0 = 1; y1 = 0;
+--- ./src/g0n/nfcount.cc.orig	2010-01-25 05:14:19.000000000 -0700
++++ ./src/g0n/nfcount.cc	2011-05-23 13:22:51.861355399 -0600
+@@ -33,7 +33,7 @@
+   else
+     nf_file = string(nf_dir);
+   char* filename=new char[20];
+-  sprintf(filename,"%s/%c%d",nf_file.c_str(),c,n);
++  sprintf(filename,"%s/%c%ld",nf_file.c_str(),c,n);
+   return filename;
+ }
+ 
+--- ./src/g0n/periods.cc.orig	2010-01-25 05:14:19.000000000 -0700
++++ ./src/g0n/periods.cc	2011-05-23 13:29:36.321459927 -0600
+@@ -742,7 +742,6 @@
+ // Cannot just use trans_to_curve() as we need to fixc6...
+ // which DOES use n and i
+ {
+-  long n = modulus;  // NOT redundant, used in fixc6
+   long fac = sqfac;
+   long fac6=(odd(fac)?fac:2*fac);
+ //  if(fac>1) cout<<"factor = "<<fac<<endl;
+--- ./src/g0n/checkap.cc.orig	2010-01-25 05:14:19.000000000 -0700
++++ ./src/g0n/checkap.cc	2011-05-23 13:22:51.862355510 -0600
+@@ -36,7 +36,7 @@
+   else
+     nf_file = string(nf_dir);
+   char* filename=new char[20];
+-  sprintf(filename,"%s/%c%d",nf_file.c_str(),c,n);
++  sprintf(filename,"%s/%c%ld",nf_file.c_str(),c,n);
+   return filename;
+ }
+ 
+--- ./src/g0n/oldforms.cc.orig	2010-01-25 05:14:19.000000000 -0700
++++ ./src/g0n/oldforms.cc	2011-05-23 13:22:51.863355620 -0600
+@@ -72,7 +72,7 @@
+ 	}
+       if(verbose>1) cout << "Computing W multiplicities." << "\n";
+       long m = n/d;
+-      long k=0, xmult, mult, j, beta, q; 
++      long k=0, xmult, mult, j, beta; 
+       vector<long> betalist; // =new long[N->npdivs];
+       vector<long>::const_iterator qj=(N->plist).begin();
+       while(qj!=(N->plist).end())
+--- ./src/g0n/newforms.cc.orig	2010-07-11 13:57:06.000000000 -0600
++++ ./src/g0n/newforms.cc	2011-05-23 13:28:20.993049229 -0600
+@@ -165,7 +165,7 @@
+ // Hecke eigenvalues
+ 
+ newform::newform(const vec& vplus, const vec& vminus, const vector<long>& ap, newforms* nfs,long ind)
+-   :nf(nfs), sign(nfs->sign), bplus(vplus),bminus(vminus),aplist(ap),index(ind) 
++   :nf(nfs), sign(nfs->sign), bplus(vplus),bminus(vminus),index(ind),aplist(ap)
+ {
+   int verbose=(nf->verbose);
+   if(verbose) 
+@@ -193,7 +193,7 @@
+   aqlist.resize(nf->npdivs);
+   vector<long>::iterator api=aplist.begin(), pi=nf->plist.begin();
+   vector<long>::iterator aqi=aqlist.begin();
+-  primevar pr;   long q, i, j;
++  primevar pr;   long q, i;
+   while((api!=aplist.end())&&(aqi!=aqlist.end()))
+     {
+       q=pr.value(); pr++;
+@@ -287,10 +287,8 @@
+         coordsminus[i]=dotmodp(nf->h1->coord_vecs[i],bminus,92681);
+     }
+   long denomplus, denomminus; 
+-  if(sign!=+1) 
+-    denomminus=vecgcd(coordsminus);
+-  if(sign!=-1) 
+-    denomplus=vecgcd(coordsplus);
++  denomminus=(sign==+1) ? 0L : vecgcd(coordsminus);
++  denomplus =(sign==-1) ? 0L : vecgcd(coordsplus);
+   if(verbose)
+     { 
+       if(sign!=-1) 
+@@ -445,7 +443,7 @@
+ 
+ void newform::add_more_ap(int nap)
+ {
+-  if(aplist.size()>=nap) return;
++  if (nap < 0 || aplist.size() >= (size_t)nap) return;
+   int verbose=(nf->verbose);
+   long piv, p, ap;
+   // Do not make the espace right away, as it is possible that the
+@@ -454,7 +452,7 @@
+   int have_espace=0;
+ 
+   primevar pr(nap,aplist.size()+1);
+-  while(aplist.size()<nap)
++  while(aplist.size()<(size_t)nap)
+     {
+       p=pr;
+       if(::div(p,nf->modulus))
+@@ -677,7 +675,7 @@
+ 
+ void newforms::display_modular_symbol_map(void) const
+ {
+- long i,j,k,m;
++ long i,j,k;
+  rational rplus, rminus;
+  for(i=0; i<h1->nsymb; i++)
+    {
+@@ -760,7 +758,8 @@
+ 
+ void newforms::output_to_file(int binflag) const
+ {
+-  long i,j;
++  long i;
++  size_t j;
+   char* name;
+   if(binflag) 
+     name = nf_filename(modulus,'x');
+@@ -889,7 +888,6 @@
+     }
+   delete[] name;
+ 
+-  short temp_short;
+   int temp_int;
+   datafile.read((char*)&temp_int,sizeof(int));   // = number of newforms
+   n1ds=temp_int;
+@@ -1000,9 +998,8 @@
+   // j1ds counts through the newforms as they are found
+   basisflag=0; j1ds=0;
+   vector< vector<long> > eigs(ncurves);
+-  int i,j;
+ 
+-  for(i=0; i<ncurves; i++) 
++  for(int i=0; i<ncurves; i++) 
+     eigs[i]=eiglist(Clist[i],nap);
+   n1ds=0; nflist.resize(0);
+   splitspace.recover(eigs);  // NB newforms::use() determines what is
+@@ -1063,15 +1060,16 @@
+   vector<long> * aq = new vector<long>[n1ds];
+   for(i=0; i<n1ds; i++) aq[i].resize(npdivs);
+   primevar pr; long q, k, a;
+-  for(k=0, j=0; j<plist.size(); j++)
++  size_t s;
++  for(k=0, s=0; s<plist.size(); s++)
+     {
+-      q = plist[j];
++      q = plist[s];
+       int q2divN = ::div(q*q,modulus);
+       while((long)pr!=q) {pr++; k++;}
+       for(i=0; i<n1ds; i++)
+ 	{
+ 	  a = ap[i][k];
+-	  aq[i][j] = a;
++	  aq[i][s] = a;
+ 	  ap[i][k] = (q2divN? 0: -a);
+ 	}
+     }
+@@ -1164,7 +1162,7 @@
+   // j1ds counts through the newforms as they are found
+   basisflag=1; j1ds=0;
+   vector< vector<long> > eigs(n1ds);
+-  int i,j;
++  int i;
+ 
+   for(i=0; i<n1ds; i++) eigs[i]=eiglist(nflist[i]);
+   if(verbose>1) 
+@@ -1226,7 +1224,7 @@
+   vec bas, imagej;
+   long fac;
+   long p2=(p-1)>>1; // (p-1)/2
+-  long sl, sg, x1, x2, x3, y1, y2, y3, a, b, c, q, r;
++  long sg, a, b, c, q, r;
+   long u1,u2,u3;
+   long ind;
+   
+@@ -1370,7 +1368,7 @@
+   else
+     nf_file = string(nf_dir);
+   char* filename=new char[20];
+-  sprintf(filename,"%s/%c%d",nf_file.c_str(),c,n);
++  sprintf(filename,"%s/%c%ld",nf_file.c_str(),c,n);
+   return filename;
+ }
+ 
+--- ./src/qcurves/egr.cc.orig	2010-01-25 05:14:19.000000000 -0700
++++ ./src/qcurves/egr.cc	2011-05-23 13:22:51.866355953 -0600
+@@ -212,11 +212,12 @@
+   bigint d2 = b2+12*x0;
+   bigint d;  sqrt_mod_p_power(d,d2,p,N2);
+   bigint alpha1 = (d-a1);
+-  if(odd(alpha1))
++  if(odd(alpha1)) {
+     if(p==2) 
+       cout<<"Problem in ComponentGroups::ImageInComponentGroup_Im(): "
+ 	  <<"quadratic has no roots\n";  
+     else alpha1+=pN; // saves inverting 2 mod pN
++  }
+   alpha1/=2;
+   bigint alpha2 = (-a1-alpha1);
+ #ifdef DEBUG_EGR_EXTRA
+--- ./src/qrank/descent.cc.orig	2010-02-04 03:37:25.000000000 -0700
++++ ./src/qrank/descent.cc	2011-05-23 13:22:51.867356064 -0600
+@@ -115,7 +115,7 @@
+     }
+   else
+     {
+-      if(verbose)
++      if(verbose) {
+ 	if(two_torsion_exists)
+ 	  {
+ 	    cout << "\nUsed descent via 2-isogeny with isogenous curve E' = "<<(Curve)(getEprime())<<endl;
+@@ -124,10 +124,11 @@
+ 	  {
+ 	    cout << "\nUsed full 2-descent via multiplication-by-2 map"<<endl;
+ 	  }
++      }
+       if(certain) 
+ 	{
+ 	  cout << "Rank = " << rank << endl;
+-	  if (verbose)
++	  if (verbose) {
+ 	    if(two_torsion_exists)
+ 	      {
+ 		cout << "Rank of S^2(E)  = "<< getselmer() << endl;
+@@ -139,6 +140,7 @@
+ 	      {
+ 		cout << "Rank of S^2(E)  = "<< getselmer() << endl<<endl;
+ 	      }
++	  }
+ 	}
+       else 
+ 	{
diff --git a/eclib.spec b/eclib.spec
index 6f13ae2..58daa46 100644
--- a/eclib.spec
+++ b/eclib.spec
@@ -1,18 +1,15 @@
 Name:           eclib
-Version:        20080310
-Release:        10.p10%{?dist}
-Summary:        A Library for Doing Computations on Elliptic Curves
-Group:          Applications/Engineering
+Version:        20100711
+Release:        1%{?dist}
+Summary:        Library for Computations on Elliptic Curves
+Group:          Development/Libraries
 License:        GPLv2+
 URL:            http://www.warwick.ac.uk/~masgaj/
-Source0:        http://sagemath.org/packages/standard/eclib-%{version}.p10.spkg
-# Add sonames to the built shared libraries
-Patch0:         eclib-20080310.p7-add-soname.diff
-# Adds Fedora optflags to build process without breaking -Defines
-Patch1:         eclib-20080310.p7-use-fedora-optflags.diff
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires:  gmp-devel
+Source0:        http://sagemath.org/packages/standard/eclib-%{version}.spkg
+# This patch fixes some compiler warnings that indicate possibly incorrect
+# runtime behavior.
+Patch0:         eclib-warning.patch
+
 BuildRequires:  ntl-devel
 BuildRequires:  pari-devel
 
@@ -32,37 +29,46 @@ Requires:       %{name} = %{version}-%{release}
 Development libraries and headers for %{name}.
 
 
-%package        static
-Summary:        Static Libraries for %{name}
-Group:          Development/Libraries
-Requires:       %{name}-devel = %{version}-%{release}
-
-
-%description    static
-Static libraries for %{name}.
-
-
 %prep
-%setup -q -n %{name}-%{version}.p10
-sed -i -e 's|^install_lib:.*$|install_lib: $(HEADERS) lib|' \
-  src/qrank/Makefile
-%patch0 -p0
-sed -i -e 's|__SO_VERSION__|%{version}|' \
-  src/Makefile.dynamic
-%patch1 -p1
+%setup -q
+%patch0
+
+# Add an soname, and don't link both the static archive and all of its
+# constituent object files into the shared library.
+sed -e "s|\$(SO_OPTS)  \$(A_LIBNAME)|\$(SO_OPTS)|" \
+    -e "s|\$(LIBFLAGS)|\$(LIBFLAGS) -Wl,-soname,\$(SO_LIBNAME).%{version}|" \
+    -i src/Makefile.dynamic
+
+# Use RPM_OPT_FLAGS
+sed -i "s|-g -O2|${RPM_OPT_FLAGS}|" src/Makefile
+
+# Eliminate unused direct shared library dependencies
+sed -i -e "s/ -lgmp//" src/procs/Makefile
+sed -i -e "s/ -lpari//g" -e "s/ -lgmp//" \
+  src/g0n/Makefile src/qcurves/Makefile src/qrank/Makefile
+
+# Fix the FSF's address
+for f in `find . -name \*.h -o -name \*.cc`; do
+  sed -i.orig \
+    -e 's/59 Temple Place, Suite 330, Boston, MA 02111-1307/51 Franklin Street, Suite 500, Boston, MA 02110-1335/' \
+    -e 's/59 Temple Place - Suite 330, Boston, MA 02111-1307/51 Franklin Street, Suite 500, Boston, MA 02110-1335/' \
+    $f
+  touch -r $f.orig $f
+  rm -f $f.orig
+done
+
+# Prepare the -devel documentation
+cp -p src/procs/ChangeLog ChangeLog.procs
+cp -p src/qcurves/ChangeLog ChangeLog.qcurves
+cp -p src/qrank/ChangeLog ChangeLog.qrank
 
 
 %build
-export PICFLAG=-fPIC
-pushd src
-  # Parallel make breaks this build (so no %{?_smp_mflags} for us).
-  make
-  make so
-popd
+# Parallel make breaks this build (so no %%{?_smp_mflags} for us).
+make -C src all so PICFLAG=-fPIC SO_OPTS="-fPIC -shared"
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT{%{_libdir},%{_includedir}/%{name}}
 pushd src
   pushd lib
@@ -72,9 +78,6 @@ pushd src
         ln -s $shlib.%{version} $shlib
       popd
     done
-#   for stlib in *.a; do
-#     install -p -m 644 $stlib $RPM_BUILD_ROOT%{_libdir}/
-#   done
   popd
   for hdr in include/*.h; do
     install -p -m 644 $hdr $RPM_BUILD_ROOT%{_includedir}/%{name}/
@@ -83,9 +86,7 @@ popd
 
 
 %check
-cd src
-export LD_LIBRARY_PATH=$RPM_BUILD_ROOT%{_libdir}/
-make check
+make -C src check LD_LIBRARY_PATH=$RPM_BUILD_ROOT%{_libdir}
 
 
 %post -p /sbin/ldconfig
@@ -94,12 +95,7 @@ make check
 %postun -p /sbin/ldconfig
 
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
 %files
-%defattr(-,root,root,-)
 %doc SPKG.txt
 %{_libdir}/libg0nntl.so.*
 %{_libdir}/libcurvesntl.so.*
@@ -108,7 +104,8 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %files devel
-%defattr(-,root,root,-)
+%doc src/g0n/documentation.txt
+%doc ChangeLog.procs ChangeLog.qcurves ChangeLog.qrank
 %{_includedir}/%{name}
 %{_libdir}/libg0nntl.so
 %{_libdir}/libcurvesntl.so
@@ -116,15 +113,16 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/librankntl.so
 
 
-#%%files static
-#%%defattr(-,root,root,-)
-#%%{_libdir}/libg0nntl.a
-#%%{_libdir}/libcurvesntl.a
-#%%{_libdir}/libjcntl.a
-#%%{_libdir}/librankntl.a
-
-
 %changelog
+* Mon May 23 2011 Jerry James <loganjerry@gmail.com> - 20100711-1
+- New upstream version
+- Drop unnecessary elements of the spec file (BuildRoot, clean script, etc.)
+- Convert previous patches into sed expressions
+- Add compiler warning elimination patch
+- Eliminate unused direct shared library dependencies
+- Fix the FSF's address to make rpmlint shut up
+- Add documentation to -devel
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 20080310-10.p10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
diff --git a/sources b/sources
index 39da28b..a28dfcc 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-16d0c3222929777cfbe805c23c7f6f2d  eclib-20080310.p10.spkg
+b507a78d2c469cf532e705d1d9470dec  eclib-20100711.spkg