[coin-or-Bonmin] Update to latest upstream release

[pcpa]

commit 2a7027fd95ee449295bd49ab126a69d45750d0d0
Author: pcpa <paulo.cesar.pereira.de.andrade at gmail.com>
Date:   Sun Feb 22 17:51:53 2015 -0300

    Update to latest upstream release

 .gitignore          |  1 +
 coin-or-Bonmin.spec | 35 +++++++++++++++++++++++++++++++++--
 sources             |  2 +-
 3 files changed, 35 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 5a89442..19db5dd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /Bonmin-1.7.4.tgz
+/Bonmin-1.8.1.tgz
diff --git a/coin-or-Bonmin.spec b/coin-or-Bonmin.spec
index dff3f2e..dacaafe 100644
--- a/coin-or-Bonmin.spec
+++ b/coin-or-Bonmin.spec
@@ -1,9 +1,18 @@
 %global		module		Bonmin
 
+%if 0%{?fedora} > 21
+%global		with_asl	1
+%else
+%global		with_asl	0
+%endif
+
+%global		with_mpi	0
+
+
 Name:		coin-or-%{module}
 Group:		Applications/Engineering
 Summary:	Basic Open-source Nonlinear Mixed INteger programming
-Version:	1.7.4
+Version:	1.8.1
 Release:	3%{?dist}
 License:	CPL
 URL:		http://projects.coin-or.org/%{module}
@@ -15,15 +24,24 @@ BuildRequires:	coin-or-Cbc-devel
 BuildRequires:	coin-or-Cgl-devel
 BuildRequires:	coin-or-Clp-devel
 BuildRequires:	coin-or-CoinUtils-devel
+%if %{with_mpi}
+BuildRequires:	coin-or-Ipopt-openmpi-devel
+%else
 BuildRequires:	coin-or-Ipopt-devel
+%endif
 BuildRequires:	coin-or-Osi-devel
 BuildRequires:	doxygen
 BuildRequires:	glpk-devel
 BuildRequires:	graphviz
 BuildRequires:	lapack-devel
+%if %{with_asl}
+BuildRequires:	mp-devel
+%endif
+%if %{with_mpi}
 BuildRequires:	openmpi-devel
 BuildRequires:	scalapack-openmpi-devel
 BuildRequires:	openssh-clients
+%endif
 BuildRequires:	pkgconfig
 BuildRequires:	readline-devel
 BuildRequires:	texlive
@@ -86,8 +104,14 @@ This package contains the documentation for %{name}.
 %patch1 -p1
 
 %build
+%if %{with_mpi}
 %_openmpi_load
-%configure
+%endif
+%configure	\
+%if %{with_asl}
+	--with-asl-lib="-lasl -lmp -lipoptamplinterface" \
+	--with-asl-incdir="%{_includedir}/asl"
+%endif
 
 # Kill rpaths
 sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
@@ -103,7 +127,9 @@ cp -pa doc/html %{buildroot}%{_docdir}/%{name}
 rm -f %{buildroot}%{_libdir}/*.la
 
 %check
+%if %{with_mpi}
 %_openmpi_load
+%endif
 LD_LIBRARY_PATH=%{buildroot}%{_libdir}:$LD_LIBRARY_PATH make test
 
 %post -p /sbin/ldconfig
@@ -112,6 +138,7 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir}:$LD_LIBRARY_PATH make test
 
 %files
 %doc %{_docdir}/%{name}
+%{_bindir}/bonmin
 %{_libdir}/*.so.*
 
 %files		devel
@@ -123,6 +150,10 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir}:$LD_LIBRARY_PATH make test
 %doc %{_docdir}/%{name}/html
 
 %changelog
+* Sun Feb 22 2015 pcpa <paulo.cesar.pereira.de.andrade at gmail.com> - 1.8.1-1
+- Update to latest upstream release.
+- Add asl solver and openmpi build conditionals.
+
 * Sat Aug 16 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.7.4-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
 
diff --git a/sources b/sources
index c698f14..f2e3cc4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4a4a0eafbaf17b95d0c6fa9e3bea90dc  Bonmin-1.7.4.tgz
+6c2d26782be7be9b988745d684613e55  Bonmin-1.8.1.tgz