[libfplll] New upstream release. Separate binaries into a -tools subpackage. Modernize the spec file.

[Jerry James]

commit a04c8321fd55120e8aa4d1994f9c897fda7dd28a
Author: Jerry James <jamesjer at betterlinux.com>
Date:   Thu Sep 27 09:49:14 2012 -0600

    New upstream release.
    Separate binaries into a -tools subpackage.
    Modernize the spec file.

 .gitignore    |    2 +-
 libfplll.spec |   70 ++++++++++++++++++++++++++++++++------------------------
 sources       |    2 +-
 3 files changed, 42 insertions(+), 32 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 7ee34a5..a3ec704 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-libfplll-3.0.12.tar.gz
+/libfplll-4.0.1.tar.gz
diff --git a/libfplll.spec b/libfplll.spec
index 61e26d8..1f3b4ea 100644
--- a/libfplll.spec
+++ b/libfplll.spec
@@ -1,14 +1,12 @@
 Name:           libfplll
-Version:        3.0.12
-Release:        5%{?dist}.2
-Summary:        LLL-reduces euclidian lattices
+Version:        4.0.1
+Release:        1%{?dist}
+Summary:        LLL-reduces euclidean lattices
 Group:          System Environment/Libraries
 License:        LGPLv2+
-URL:            http://perso.ens-lyon.fr/damien.stehle/english.html#software
-Source0:        http://perso.ens-lyon.fr/damien.stehle/downloads/libfplll-%{version}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+URL:            http://perso.ens-lyon.fr/damien.stehle/fplll/
+Source0:        http://perso.ens-lyon.fr/damien.stehle/fplll/%{name}-%{version}.tar.gz
 
-BuildRequires:  gmp-devel
 BuildRequires:  mpfr-devel
 
 
@@ -21,69 +19,81 @@ estimated best sequence of variants in order to provide a guaranteed
 output as fast as possible. In the case of the wrapper, the
 succession of variants is oblivious to the user. It also includes
 a rigorous floating-point implementation of the Kannan-Fincke-Pohst
-algorithm that finds a shortest non-zero lattice vector.
+algorithm that finds a shortest non-zero lattice vector, and the BKZ
+reduction algorithm.
 
 
 %package        devel
 Summary:        Development files for %{name}
 Group:          Development/Libraries
-Requires:       %{name} = %{version}-%{release}
+Requires:       %{name}%{?_isa} = %{version}-%{release}
 
 %description    devel
 The %{name}-devel package contains libraries and header files for
 developing applications that use %{name}.
 
 
+%package        tools
+Summary:        Command line tools that use %{name}
+Group:          Applications/Engineering
+Requires:       %{name}%{?_isa} = %{version}-%{release}
+
+%description    tools
+The %{name}-tools package contains command-line tools that expose
+the functionality of %{name}.
+
+
 %prep
 %setup -q
 
 
 %build
-%configure --disable-static
+%configure --disable-static LDFLAGS="-Wl,--as-needed $RPM_LD_FLAGS"
+
+# Eliminate hardcoded rpaths, and workaround libtool moving all -Wl options
+# after the libraries to be linked
+sed -e 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' \
+    -e 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' \
+    -e 's|-nostdlib|-Wl,--as-needed &|' \
+    -i libtool
+
 make %{?_smp_mflags}
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
-mv $RPM_BUILD_ROOT%{_bindir}/generate \
-  $RPM_BUILD_ROOT%{_bindir}/fplll_generate
-mkdir -p $RPM_BUILD_ROOT%{_includedir}/fplll
-mv $RPM_BUILD_ROOT%{_includedir}/*.{h,cpp} \
-  $RPM_BUILD_ROOT%{_includedir}/fplll
+rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 
 
 %check
+export LD_LIBRARY_PATH=$PWD/src/.libs
 make check
 
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
 
 
 %files
-%defattr(-,root,root,-)
-%doc COPYING README NEWS
+%doc AUTHORS COPYING NEWS README.html
 %{_libdir}/*.so.*
-%{_bindir}/fplll
-%{_bindir}/fplll_micro
-%{_bindir}/fplll_verbose
-%{_bindir}/fplll_generate
-%{_bindir}/llldiff
 
 %files devel
-%defattr(-,root,root,-)
-%{_includedir}/fplll
+%{_includedir}/fplll.h
+%{_includedir}/fplll/
 %{_libdir}/*.so
 
+%files tools
+%{_bindir}/*
+
 
 %changelog
+* Thu Sep 27 2012 Jerry James <loganjerry at gmail.com> - 4.0.1-1
+- New upstream release
+- Separate binaries into a -tools subpackage
+- Modernize the spec file
+
 * Thu Jul 19 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.0.12-5.2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 
diff --git a/sources b/sources
index ad2f066..e152d82 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3b1cf0f3c4bcbe8b40da3d14c8029c58  libfplll-3.0.12.tar.gz
+a5cdb0cfe31e579783c32afff86c433d  libfplll-4.0.1.tar.gz