[eclib] Update to latest upstream release.
pcpa
pcpa at fedoraproject.org
Tue Jul 10 20:11:42 UTC 2012
commit c084ec6a84a6622b78da9e75d0cbb93fea1d3154
Author: pcpa <paulo.cesar.pereira.de.andrade at gmail.com>
Date: Tue Jul 10 17:10:50 2012 -0400
Update to latest upstream release.
This version is required by sagemath 5.2 beta.
.gitignore | 1 +
eclib-warning.patch | 238 ---------------------------------------------------
eclib.spec | 96 +++++++--------------
sources | 2 +-
4 files changed, 32 insertions(+), 305 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index ac6f0a0..9b1f38c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/eclib-20100711.spkg
+/eclib-20120428.spkg
diff --git a/eclib.spec b/eclib.spec
index 1a24627..3462a23 100644
--- a/eclib.spec
+++ b/eclib.spec
@@ -1,14 +1,12 @@
Name: eclib
-Version: 20100711
-Release: 5%{?dist}
+Version: 20120428
+Release: 1%{?dist}
Summary: Library for Computations on Elliptic Curves
Group: Development/Libraries
-License: GPLv2+
+License: GPLv3+
URL: http://www.warwick.ac.uk/~masgaj/
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,59 +30,27 @@ Development libraries and headers for %{name}.
%prep
%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
-
+# do not want rpath
+pushd src
+ rm -f ltmain.sh
+ libtoolize
+ autoreconf
+popd
%build
-# Parallel make breaks this build (so no %%{?_smp_mflags} for us).
-make -C src all so PICFLAG=-fPIC SO_OPTS="-fPIC -shared"
+pushd src
+ %configure \
+ --disable-static \
+ --enable-shared \
+ --disable-allprogs
+ make %{?_smpflags}
+popd
%install
-mkdir -p $RPM_BUILD_ROOT{%{_bindir},%{_libdir},%{_includedir}/%{name}}
-pushd src
- pushd lib
- for shlib in *.so; do
- install -p -m 755 $shlib $RPM_BUILD_ROOT%{_libdir}/$shlib.%{version}
- pushd $RPM_BUILD_ROOT%{_libdir}/
- ln -s $shlib.%{version} $shlib
- popd
- done
- popd
- for hdr in include/*.h; do
- install -p -m 644 $hdr $RPM_BUILD_ROOT%{_includedir}/%{name}/
- done
-popd
-install -m 755 src/qrank/mwrank $RPM_BUILD_ROOT%{_bindir}
+make DESTDIR=$RPM_BUILD_ROOT -C src install
+rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
+
%check
make -C src check LD_LIBRARY_PATH=$RPM_BUILD_ROOT%{_libdir}
@@ -97,27 +63,25 @@ make -C src check LD_LIBRARY_PATH=$RPM_BUILD_ROOT%{_libdir}
%files
+%doc src/AUTHORS
+%doc src/COPYING
+%doc src/NEWS
+%doc src/README
%doc SPKG.txt
-%doc src/qrank/mwrank.changes src/qrank/mwrank.doc src/qrank/mwrank.info
-%doc src/qrank/mwrank.options src/qrank/mwrank.readme
%{_bindir}/mwrank
-%{_libdir}/libg0nntl.so.*
-%{_libdir}/libcurvesntl.so.*
-%{_libdir}/libjcntl.so.*
-%{_libdir}/librankntl.so.*
+%{_libdir}/libjc.so.*
%files devel
-%doc src/g0n/documentation.txt
-%doc ChangeLog.procs ChangeLog.qcurves ChangeLog.qrank
%{_includedir}/%{name}
-%{_libdir}/libg0nntl.so
-%{_libdir}/libcurvesntl.so
-%{_libdir}/libjcntl.so
-%{_libdir}/librankntl.so
+%{_libdir}/libjc.so
%changelog
+* Tue Jul 10 2012 pcpa <paulo.cesar.pereira.de.andrade at gmail.com> - 20120428-1
+- Update to latest upstream release.
+- Rework package build that now uses autotools instead of hand made Makefiles.
+
* Wed Jul 5 2012 pcpa <paulo.cesar.pereira.de.andrade at gmail.com> - 20100711-5
- Install mwrank binary as it is required by sagemath.
- Install mwrank documentation.
diff --git a/sources b/sources
index a28dfcc..e9b647b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b507a78d2c469cf532e705d1d9470dec eclib-20100711.spkg
+6c162c0a3cd6664855f69db19818a265 eclib-20120428.spkg
More information about the scm-commits
mailing list