[gmp-ecm] Fix elimination of hardcoded rpaths. Mark -devel and -static as LGPLv3+ as well.

[Jerry James]

commit d8bfc4e534bd23c997a2f3da0e14c1e0e920e01f
Author: Jerry James <loganjerry at gmail.com>
Date:   Mon Mar 19 13:59:12 2012 -0600

    Fix elimination of hardcoded rpaths.
    Mark -devel and -static as LGPLv3+ as well.

 gmp-ecm.spec |   27 ++++++++++++++++++++-------
 1 files changed, 20 insertions(+), 7 deletions(-)
---
diff --git a/gmp-ecm.spec b/gmp-ecm.spec
index fe14060..159f6f5 100644
--- a/gmp-ecm.spec
+++ b/gmp-ecm.spec
@@ -1,6 +1,6 @@
 Name:           gmp-ecm
 Version:        6.4.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Elliptic Curve Method for Integer Factorization
 Group:          Applications/Engineering
 License:        GPLv3+
@@ -23,6 +23,7 @@ integers (with GMP for arbitrary precision integers).
 %package        devel
 Summary:        Files useful for %{name} development
 Group:          Development/Libraries
+License:        LGPLv3+
 Requires:       %{name}-libs%{?_isa} = %{version}-%{release}
 Requires:       gmp-devel%{?_isa}
 
@@ -33,7 +34,7 @@ The libraries and header files for using %{name} for development.
 
 %package        libs
 Summary:        Elliptic Curve Method library
-Group:          Development/Libraries
+Group:          System Environment/Libraries
 License:        LGPLv3+
 
 
@@ -44,6 +45,7 @@ The %{name} library.
 %package        static
 Summary:        Files used for static linking with %{name}
 Group:          Development/Libraries
+License:        LGPLv3+
 Requires:       %{name}-devel%{?_isa} = %{version}-%{release}
 
 
@@ -69,11 +71,8 @@ for badfile in `grep -FRl 'Fifth Floor'`; do
   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
+# Workaround bz 759376
+sed -i 's/func_apped/func_append/' ltmain.sh
 
 
 %build
@@ -86,6 +85,11 @@ FLGS="--enable-shared --enable-openmp --disable-gmp-cflags"
   CFLAGS="$RPM_OPT_FLAGS -std=gnu99 -march=pentium4 -Wa,--noexecstack" \
   LDFLAGS="$RPM_LD_FLAGS -Wl,-z,noexecstack -lgmp -lgomp"
 
+# Eliminate hardcoded rpaths
+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' \
+    -i libtool
+
 rm -f ecm-params.h
 ln -s ecm-params.h.pentium4 ecm-params.h
 make %{?_smp_mflags}
@@ -102,6 +106,11 @@ ln -s ecm-params.h.default ecm-params.h
   CFLAGS="$RPM_OPT_FLAGS -std=gnu99 -Wa,--noexecstack" \
   LDFLAGS="$RPM_LD_FLAGS -Wl,-z,noexecstack -lgmp -lgomp"
 
+# Eliminate hardcoded rpaths
+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' \
+    -i libtool
+
 make --eval='.SECONDARY:' %{?_smp_mflags}
 
 
@@ -159,6 +168,10 @@ make check
 
 
 %changelog
+* Mon Mar 19 2012 Jerry James <loganjerry at gmail.com> - 6.4.1-2
+- Fix elimination of hardcoded rpaths
+- Mark -devel and -static as LGPLv3+ as well
+
 * 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