[coin-or-Ipopt] Fix libraries's symlinks (bz#1152812)

[Antonio Trande]

commit 32227030a660a93e08b05328ad11eb84a3cb2a48
Author: sagitter <sagitterATfedoraprojectDOTorg>
Date:   Fri Jan 23 12:29:44 2015 +0100

    Fix libraries's symlinks (bz#1152812)

 coin-or-Ipopt.spec |   17 +++++++++--------
 1 files changed, 9 insertions(+), 8 deletions(-)
---
diff --git a/coin-or-Ipopt.spec b/coin-or-Ipopt.spec
index ea265b9..d3db387 100644
--- a/coin-or-Ipopt.spec
+++ b/coin-or-Ipopt.spec
@@ -14,7 +14,7 @@ Name:           coin-or-%{module}
 Group:          Applications/Engineering
 Summary:        Interior Point OPTimizer
 Version:        3.11.10
-Release:        1%{?dist}
+Release:        2%{?dist}
 License:        EPL and GPLv2+
 URL:            https://projects.coin-or.org/%{module}
 Source0:        http://www.coin-or.org/download/pkgsource/%{module}/%{module}-%{version}.tgz
@@ -59,7 +59,7 @@ s.t.       g_L <= g(x) <= g_U
 where f(x): R^n --> R is the objective function, and g(x): R^n --> R^m are
 the constraint functions. The vectors g_L and g_U denote the lower and upper
 bounds on the constraints, and the vectors x_L and x_U are the bounds on
-the variables x. The functions f(x) and g(x) can be nonlinear and nonconvex,
+the variables x. The functions f(x) and g(x) can be non-linear and non-convex,
 but should be twice continuously differentiable. Note that equality
 constraints can be formulated in the above formulation by setting the
 corresponding components of g_L and g_U to the same value.
@@ -192,7 +192,7 @@ mkdir -p $RPM_BUILD_ROOT%{_libmpidir}
 mkdir -p $RPM_BUILD_ROOT%{_incmpidir}
 mkdir -p %{name}-%{version}-openmpi/headers
 
-cp -p %{name}-%{version}-openmpi/Ipopt/src/Interfaces/.libs/libipopt.so* \
+cp -a %{name}-%{version}-openmpi/Ipopt/src/Interfaces/.libs/libipopt.so* \
        $RPM_BUILD_ROOT%{_libmpidir}
 
 cd %{name}-%{version}-openmpi
@@ -209,7 +209,6 @@ install -p -m 644 %{name}-%{version}-openmpi/headers/* $RPM_BUILD_ROOT%{_incmpid
 #######################################################
 ## Install serial version
 
-mkdir -p $RPM_BUILD_ROOT%{_libdir}
 mkdir -p $RPM_BUILD_ROOT%{_libdir}/pkgconfig
 mkdir -p $RPM_BUILD_ROOT%{_includedir}/coin
 mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}
@@ -217,7 +216,7 @@ mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}
 mkdir -p %{name}-%{version}-serial/headers
 
 ##Copy libraries
-cp -p %{name}-%{version}-serial/Ipopt/src/Interfaces/.libs/libipopt.so* \
+cp -a %{name}-%{version}-serial/Ipopt/src/Interfaces/.libs/libipopt.so* \
        $RPM_BUILD_ROOT%{_libdir}
 install -p -m 644 %{name}-%{version}-serial/Ipopt/ipopt.pc $RPM_BUILD_ROOT%{_libdir}/pkgconfig
 
@@ -233,9 +232,6 @@ cp -far %{name}-%{version}-serial/doxydoc/html $RPM_BUILD_ROOT%{_docdir}/%{name}
 cp -p Ipopt/doc/documentation.pdf $RPM_BUILD_ROOT%{_docdir}/%{name}/Ipopt_Tutorial.pdf
 cp ChangeLog LICENSE
 
-ln -sf %{_libdir}/libipopt.so.1.9.10 $RPM_BUILD_ROOT%{_libdir}/libipopt.so
-ln -sf %{_libmpidir}/libipopt.so.1.9.10 $RPM_BUILD_ROOT%{_libmpidir}/libipopt.so
-
 #######################################################
 
 %check
@@ -244,11 +240,13 @@ cd %{name}-%{version}-serial
 LD_LIBRARY_PATH=$RPM_BUILD_ROOT%{_libdir}:$LD_LIBRARY_PATH make test
 cd ..
 
+%if 0%{?with_openmpi}
 %{_openmpi_load}
 cd %{name}-%{version}-openmpi
 LD_LIBRARY_PATH=$RPM_BUILD_ROOT%{_libmpidir}:$LD_LIBRARY_PATH make test
 cd ..
 %{_openmpi_unload}
+%endif
 
 %post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
@@ -282,6 +280,9 @@ cd ..
 %{_docdir}/%{name}/*.pdf
 
 %changelog
+* Fri Jan 23 2015 Antonio Trande <sagitterATfedoraproject.org> - 3.11.10-2
+- Fix libraries's symlinks (bz#1152812)
+
 * Mon Jan 19 2015 Antonio Trande <sagitterATfedoraproject.org> - 3.11.10-1
 - Update to 3.11.10