- Apply patch from Caolan McNamara
- Resolves: #500030 function_template bug is back...
This commit is contained in:
parent
908d7d2963
commit
ab7902e738
|
@ -0,0 +1,15 @@
|
|||
diff -ru boost/function/function_template.hpp boost/function/function_template.hpp
|
||||
--- boost/function/function_template.hpp 2009-05-10 10:31:29.000000000 +0100
|
||||
+++ boost/function/function_template.hpp 2009-05-10 10:49:46.000000000 +0100
|
||||
@@ -950,10 +950,10 @@
|
||||
f.vtable->manager(f.functor, this->functor,
|
||||
boost::detail::function::move_functor_tag);
|
||||
f.vtable = 0;
|
||||
-#if !defined(BOOST_NO_EXCEPTIONS)
|
||||
} else {
|
||||
clear();
|
||||
}
|
||||
+#if !defined(BOOST_NO_EXCEPTIONS)
|
||||
} catch (...) {
|
||||
vtable = 0;
|
||||
throw;
|
|
@ -1,4 +1,4 @@
|
|||
diff -ru boost_1_37_0.orig/boost/spirit/home/classic/iterator/multi_pass.hpp boost_1_37_0/boost/spirit/home/classic/iterator/multi_pass.hpp
|
||||
diff -ru boost/spirit/home/classic/iterator/multi_pass.hpp boost/spirit/home/classic/iterator/multi_pass.hpp
|
||||
--- boost/spirit/home/classic/iterator/multi_pass.hpp 2009-01-09 10:38:36.000000000 +0000
|
||||
+++ boost/spirit/home/classic/iterator/multi_pass.hpp 2009-01-09 10:39:41.000000000 +0000
|
||||
@@ -12,7 +12,6 @@
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
Name: boost
|
||||
Summary: The Boost C++ Libraries
|
||||
Version: 1.39.0
|
||||
Release: 1%{?dist}
|
||||
Release: 2%{?dist}
|
||||
License: Boost
|
||||
URL: http://www.boost.org/
|
||||
Group: System Environment/Libraries
|
||||
|
@ -39,6 +39,7 @@ Patch2: boost-run-tests.patch
|
|||
Patch3: boost-soname.patch
|
||||
Patch4: boost-unneccessary_iostreams.patch
|
||||
Patch5: boost-bitset.patch
|
||||
Patch6: boost-function_template.patch
|
||||
|
||||
%bcond_with tests
|
||||
%bcond_with docs_generated
|
||||
|
@ -209,6 +210,7 @@ sed 's/_FEDORA_OPT_FLAGS/%{optflags}/' %{PATCH1} | %{__patch} -p0 --fuzz=0
|
|||
sed 's/_FEDORA_SONAME/%{sonamever}/' %{PATCH3} | %{__patch} -p0 --fuzz=0
|
||||
%patch4 -p0
|
||||
%patch5 -p0
|
||||
%patch6 -p0
|
||||
|
||||
%build
|
||||
BOOST_ROOT=`pwd`
|
||||
|
@ -418,6 +420,10 @@ rm -rf $RPM_BUILD_ROOT
|
|||
%{_libdir}/*.a
|
||||
|
||||
%changelog
|
||||
* Mon May 11 2009 Benjamin Kosnik <bkoz@redhat.com> - 1.39.0-2
|
||||
- Apply patch from Caolan McNamara
|
||||
- Resolves: #500030 function_template bug is back...
|
||||
|
||||
* Thu May 07 2009 Benjamin Kosnik <bkoz@redhat.com> - 1.39.0-1
|
||||
- Update release.
|
||||
|
||||
|
|
Loading…
Reference in New Issue