rpms/boost/devel boost-function_template.patch, NONE, 1.1 boost.spec, 1.54, 1.55

[Petr Machata]

Author: pmachata

Update of /cvs/pkgs/rpms/boost/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11134

Modified Files:
	boost.spec 
Added Files:
	boost-function_template.patch 
Log Message:
- Apply a function_template patch from Caolan McNamara
- Resolves: #477131


boost-function_template.patch:

--- NEW FILE boost-function_template.patch ---
--- boost/function/function_template.hpp.orig	2008-12-19 10:32:27.000000000 +0000
+++ boost/function/function_template.hpp	2008-12-19 10:33:27.000000000 +0000
@@ -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;


Index: boost.spec
===================================================================
RCS file: /cvs/pkgs/rpms/boost/devel/boost.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- boost.spec	17 Dec 2008 17:40:21 -0000	1.54
+++ boost.spec	19 Dec 2008 13:32:20 -0000	1.55
@@ -4,7 +4,7 @@
 Name: boost
 Summary: The Boost C++ Libraries
 Version: 1.37.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: Boost
 URL: http://www.boost.org/
 Group: System Environment/Libraries
@@ -26,6 +26,7 @@
 Patch2: boost-run-tests.patch
 Patch3: boost-gcc43.patch
 Patch4: boost-gcc-soname.patch
+Patch5: boost-function_template.patch
 
 %description
 Boost provides free peer-reviewed portable C++ source libraries.  The
@@ -70,6 +71,7 @@
 %patch2 -p0
 %patch3 -p1
 sed 's/!!!SONAME!!!/%{sonamever}/' %{PATCH4} | %{__patch} -p1
+%patch5 -p0
 
 %build
 BOOST_ROOT=`pwd`
@@ -202,6 +204,10 @@
 %doc %{_docdir}/%{name}-%{version}
 
 %changelog
+* Fri Dec 19 2008 Petr Machata <pmachata at redhat.com> - 1.37.0-2
+- Apply a function_template patch from Caolan McNamara
+- Resolves: #477131
+
 * Tue Dec 16 2008 Benjamin Kosnik <bkoz at redhat.com> - 1.37.0-1
 - Fix rpmlint rpath errors.
 - Fix rpmlint warnings on tabs and spaces.