[gmp-ecm] New upstream release. Split library and binaries into separate packages for licensing reasons. Disab
Jerry James
jjames at fedoraproject.org
Mon Mar 19 17:05:23 UTC 2012
commit 95e0a79b4e2214d44aa55bb6c40814edf073efdf
Author: Jerry James <loganjerry at gmail.com>
Date: Mon Mar 19 11:04:59 2012 -0600
New upstream release.
Split library and binaries into separate packages for licensing reasons.
Disable broken shellcmd feature.
.gitignore | 2 +-
gmp-ecm.spec | 78 ++++++++++++++++++++++++++++++++++-----------------------
sources | 2 +-
3 files changed, 48 insertions(+), 34 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 98721df..c3ec7e2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/ecm-6.4.tar.gz
+/ecm-6.4.1.tar.gz
diff --git a/gmp-ecm.spec b/gmp-ecm.spec
index fb4b084..07892bd 100644
--- a/gmp-ecm.spec
+++ b/gmp-ecm.spec
@@ -1,11 +1,11 @@
Name: gmp-ecm
-Version: 6.4
+Version: 6.4.1
Release: 1%{?dist}
Summary: Elliptic Curve Method for Integer Factorization
Group: Applications/Engineering
-License: LGPLv2+ and GPLv2+
-URL: http://gforge.inria.fr/projects/ecm/
-Source0: http://gforge.inria.fr/frs/download.php/30052/ecm-%{version}.tar.gz
+License: GPLv3+
+URL: https://gforge.inria.fr/projects/ecm/
+Source0: https://gforge.inria.fr/frs/download.php/30410/ecm-%{version}.tar.gz
BuildRequires: docbook-style-xsl
BuildRequires: gmp-devel
@@ -13,6 +13,7 @@ BuildRequires: gsl-devel
BuildRequires: libxslt
BuildRequires: m4
+Requires: %{name}-libs%{?_isa} = %{version}-%{release}
%description
Programs and libraries employing elliptic curve method for factoring
@@ -22,7 +23,7 @@ integers (with GMP for arbitrary precision integers).
%package devel
Summary: Files useful for %{name} development
Group: Development/Libraries
-Requires: %{name}%{?_isa} = %{version}-%{release}
+Requires: %{name}-libs%{?_isa} = %{version}-%{release}
Requires: gmp-devel%{?_isa}
@@ -30,6 +31,16 @@ Requires: gmp-devel%{?_isa}
The libraries and header files for using %{name} for development.
+%package libs
+Summary: Elliptic Curve Method library
+Group: Development/Libraries
+License: LGPLv3+
+
+
+%description libs
+The %{name} library.
+
+
%package static
Summary: Files used for static linking with %{name}
Group: Development/Libraries
@@ -51,30 +62,29 @@ for badfile in ChangeLog README AUTHORS ; do
done
# Fix the FSF's address
-for badfile in auxi.c b1_ainc.c candi.c ecm-impl.h ecm-ecm.h eval.c main.c \
- resume.c trial.c; do
+for badfile in `grep -FRl 'Fifth Floor'`; do
sed -e 's/Fifth Floor/Suite 500/' -e 's/02111-1307/02110-1335/' \
-i.orig $badfile
touch -r $badfile.orig $badfile
rm -f $badfile.orig
done
+# Workaround bz 759376 amd eliminate hardcoded rpaths
+sed -e "s/func_apped/func_append/" \
+ -e 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' \
+ -e 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' \
+ -i ltmain.sh
+
%build
-FLGS="--enable-shared --enable-openmp --enable-shellcmd --disable-assert"
+FLGS="--enable-shared --enable-openmp --enable-asm-redc --disable-gmp-cflags"
# Build an SSE2-enabled version for 32-bit x86
%ifarch %ix86
%configure ${FLGS} --build=pentium4-pc-linux-gnu --host=pentium4-pc-linux-gnu \
- --disable-static --enable-sse2 --enable-asm-redc \
- CFLAGS="$RPM_OPT_FLAGS -march=pentium4 -Wa,--noexecstack" \
- LDFLAGS="-Wl,-z,noexecstack -lgmp -lgomp"
-
-# Workaround bz 759376 amd eliminate hardcoded rpaths
-sed -e "s/func_apped/func_append/" \
- -e 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' \
- -e 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' \
- -i libtool
+ --disable-static --enable-sse2 \
+ CFLAGS="$RPM_OPT_FLAGS -std=gnu99 -march=pentium4 -Wa,--noexecstack" \
+ LDFLAGS="$RPM_LD_FLAGS -Wl,-z,noexecstack -lgmp -lgomp"
rm -f ecm-params.h
ln -s ecm-params.h.pentium4 ecm-params.h
@@ -88,14 +98,9 @@ ln -s ecm-params.h.default ecm-params.h
# Build a non-SSE2 version (x86_64 loses out; the assembly code containing
# SSE2 instructions is 32-bit only).
-%configure ${FLGS} --disable-sse2 CFLAGS="$RPM_OPT_FLAGS -Wa,--noexecstack" \
- LDFLAGS="-Wl,-z,noexecstack -lgmp -lgomp"
-
-# Workaround bz 759376 amd eliminate hardcoded rpaths
-sed -e "s/func_apped/func_append/" \
- -e 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' \
- -e 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' \
- -i libtool
+%configure ${FLGS} --disable-sse2 \
+ CFLAGS="$RPM_OPT_FLAGS -std=gnu99 -Wa,--noexecstack" \
+ LDFLAGS="$RPM_LD_FLAGS -Wl,-z,noexecstack -lgmp -lgomp"
make --eval='.SECONDARY:' %{?_smp_mflags}
@@ -123,20 +128,16 @@ export LD_LIBRARY_PATH=`pwd`/.libs
make check
-%post -p /sbin/ldconfig
+%post libs -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
+%postun libs -p /sbin/ldconfig
%files
-%doc README COPYING COPYING.LIB AUTHORS ChangeLog NEWS TODO
+%doc COPYING README
%{_bindir}/%{name}
%{_mandir}/man1/%{name}.1*
-%{_libdir}/libecm.so.*
-%ifarch %ix86
-%{_libdir}/sse2/libecm.so.*
-%endif
%files devel
@@ -145,11 +146,24 @@ make check
%{_libdir}/libecm.so
+%files libs
+%doc COPYING.LIB AUTHORS ChangeLog NEWS TODO
+%{_libdir}/libecm.so.*
+%ifarch %ix86
+%{_libdir}/sse2/libecm.so.*
+%endif
+
+
%files static
%{_libdir}/libecm.a
%changelog
+* Mon Mar 19 2012 Jerry James <loganjerry at gmail.com> - 6.4.1-1
+- New upstream release
+- Split library and binaries into separate packages for licensing reasons
+- Disable broken shellcmd feature
+
* Mon Jan 23 2012 Jerry James <loganjerry at gmail.com> - 6.4-1
- New upstream release
diff --git a/sources b/sources
index dfca6a6..57a7a77 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c7e973462df3d1e3e0a7d9ba3130f57c ecm-6.4.tar.gz
+1a9e0d8b6bb23a3c05ed307f1fe80404 ecm-6.4.1.tar.gz
More information about the scm-commits
mailing list