From e283993866542310a2fae11c4fc00e6413829d6e Mon Sep 17 00:00:00 2001
From: Jonathan Wakely <jwakely@redhat.com>
Date: Aug 05 2015 21:03:23 +0000
Subject: Patch incorrect placement of BOOST_UBLAS_INLINE macros.


---

diff --git a/boost-1.58-ublas-inlines.patch b/boost-1.58-ublas-inlines.patch
new file mode 100644
index 0000000..e50ca3f
--- /dev/null
+++ b/boost-1.58-ublas-inlines.patch
@@ -0,0 +1,52 @@
+From ca2ff08600fa63c8dea90897cfe649427bf58a6e Mon Sep 17 00:00:00 2001
+From: Nasos <nasos_i@hotmail.com>
+Date: Wed, 5 Aug 2015 10:17:51 -0400
+Subject: [PATCH] Corrected inline issue in storage.hpp
+
+---
+ include/boost/numeric/ublas/storage.hpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/include/boost/numeric/ublas/storage.hpp b/include/boost/numeric/ublas/storage.hpp
+index 8821309..19bc907 100644
+--- a/include/boost/numeric/ublas/storage.hpp
++++ b/include/boost/numeric/ublas/storage.hpp
+@@ -777,8 +777,8 @@ namespace boost { namespace numeric { namespace ublas {
+         BOOST_UBLAS_INLINE
+         shallow_array_adaptor (size_type size, pointer data):
+             size_ (size), own_ (false), data_ (data, leaker<value_type> ()) {}
+-        BOOST_UBLAS_INLINE
+         template <size_t N>
++        BOOST_UBLAS_INLINE
+         shallow_array_adaptor (T (&data)[N]):
+             size_ (N), own_ (false), data_ (data, leaker<value_type> ()) {}
+ 
+From b805369990aed13a2c837f642a280a7b6352e012 Mon Sep 17 00:00:00 2001
+From: Nasos <nasos_i@hotmail.com>
+Date: Wed, 5 Aug 2015 10:31:25 -0400
+Subject: [PATCH] Corrected inline issue in storage.hpp
+
+---
+ include/boost/numeric/ublas/storage.hpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/include/boost/numeric/ublas/storage.hpp b/include/boost/numeric/ublas/storage.hpp
+index 19bc907..bd64892 100644
+--- a/include/boost/numeric/ublas/storage.hpp
++++ b/include/boost/numeric/ublas/storage.hpp
+@@ -833,13 +833,13 @@ namespace boost { namespace numeric { namespace ublas {
+         void resize (size_type size, pointer data, value_type init) {
+             resize_internal (size, data, init, true);
+         }
+-        BOOST_UBLAS_INLINE
+         template <size_t N>
++        BOOST_UBLAS_INLINE
+         void resize (T (&data)[N]) {
+             resize_internal (N, data, value_type (), false);
+         }
+-        BOOST_UBLAS_INLINE
+         template <size_t N>
++        BOOST_UBLAS_INLINE
+         void resize (T (&data)[N], value_type init) {
+             resize_internal (N, data, init, true);
+         }
diff --git a/boost.spec b/boost.spec
index cf72e89..63177ed 100644
--- a/boost.spec
+++ b/boost.spec
@@ -32,7 +32,7 @@ Name: boost
 Summary: The free peer-reviewed portable C++ source libraries
 Version: 1.58.0
 %define version_enc 1_58_0
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: Boost and MIT and Python
 
 %define toplev_dirname %{name}_%{version_enc}
@@ -130,6 +130,9 @@ Patch67: boost-1.58.0-variant-includes.patch
 # Prevent gcc.jam from setting -m32 or -m64.
 Patch68: boost-1.58.0-address-model.patch
 
+# https://github.com/boostorg/ublas/pull/25
+Patch69: boost-1.58-ublas-inlines.patch
+
 Patch70: 0001-Changes-required-for-aarch64-support-in-boost-config.patch
 
 %bcond_with tests
@@ -621,6 +624,7 @@ a number of significant features and is now developed independently
 %patch66 -p2
 %patch67 -p2
 %patch68 -p1
+%patch69 -p2
 %patch70 -p1
 
 # At least python2_version needs to be a macro so that it's visible in
@@ -1240,6 +1244,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/bjam.1*
 
 %changelog
+* Wed Aug 05 2015 Jonathan Wakely <jwakely@redhat.com> 1.58.0-5
+- Patch incorrect placement of BOOST_UBLAS_INLINE macros.
+
 * Tue Aug 04 2015 Jonathan Wakely <jwakely@redhat.com> 1.58.0-4
 - Patch to prevent address model being set by Boost.Build.