[L-function] - Build with $RPM_OPT_FLAGS and %%{_smp_mflags} (regression in -5). - Build with $RPM_LD_FLAGS.

[pcpa]

commit 7d949b53e01a3aac15c29aefd6ed0794387bb593
Author: Ville Skyttä <ville.skytta at iki.fi>
Date:   Tue Jul 10 19:15:59 2012 +0300

    - Build with $RPM_OPT_FLAGS and %%{_smp_mflags} (regression in -5). - Build with $RPM_LD_FLAGS.

 L-function.spec |   13 +++++++++----
 1 files changed, 9 insertions(+), 4 deletions(-)
---
diff --git a/L-function.spec b/L-function.spec
index a3e2ff8..b582216 100644
--- a/L-function.spec
+++ b/L-function.spec
@@ -1,6 +1,6 @@
 Name:		L-function
 Version:	1.23
-Release:	5%{?dist}
+Release:	6%{?dist}
 Summary:	C++ L-function class library and command line interface
 Group:		Applications/Engineering
 License:	GPLv2+
@@ -38,11 +38,11 @@ rm -f src/.*{DS_Store,.swp}
 
 # Make it actually link with the generated library
 sed -e 's|/lib/|/%{_lib}/|g' \
- -e 's|^[^#]*LDFLAGS2.*LDFLAGS1.*$|LDFLAGS2 = $(LDFLAGS1)|' \
+ -e "s|^[^#]*LDFLAGS2.*LDFLAGS1.*\$|LDFLAGS2 = \$(LDFLAGS1) $RPM_LD_FLAGS|" \
  -e 's|libLfunction.so|libLfunction.so.%{version}|g' \
  -e 's|\($(CC).*cc\) libLfunction.so.%{version}|\1 -L. -lLfunction|g' \
  -e 's|-Xlinker -rpath .*||;' \
- -e "s|\(DYN_OPTION=shared\)|\1 -Wl,-soname=libLfunction.so.%{version} -lgomp|" \
+ -e "s|\(DYN_OPTION=shared\)|\1 -Wl,-soname=libLfunction.so.%{version} -lgomp $RPM_LD_FLAGS|" \
  -e 's|#\(OPENMP_FLAG = -fopenmp\)|\1|' \
  -i src/Makefile
 sed -i -e 's/\r//' src/example_programs/example.cc
@@ -53,7 +53,8 @@ rm -f src/libLfunction.a
 pushd src
     # Create link before library is created
     ln -sf libLfunction.so.%{version} libLfunction.so
-    make							\
+    make %{?_smp_mflags}					\
+	EXTRA="$RPM_OPT_FLAGS"					\
 	PARI_DEFINE="-DINCLUDE_PARI"				\
 	LOCATION_PARI_H="%{_includedir}/pari"			\
 	LOCATION_PARI_LIBRARY="%{_libdir}"			\
@@ -103,6 +104,10 @@ popd
 %{_libdir}/libLfunction.so
 
 %changelog
+* Tue Jul 10 2012 Ville Skyttä <ville.skytta at iki.fi> - 1.23-6
+- Build with $RPM_OPT_FLAGS and %%{_smp_mflags} (regression in -5).
+- Build with $RPM_LD_FLAGS.
+
 * Sun Jul 1 2012 pcpa <paulo.cesar.pereira.de.andrade at gmail.com> - 1.23-5
 - Merge with duplicate review request #821195 that had changelog
   + Correct license tag.