rpms/boost/devel boost-1.41.0-mapnik.patch, NONE, 1.1 boost.spec, 1.73, 1.74

Petr Machata pmachata at fedoraproject.org
Mon Jan 25 09:40:33 UTC 2010


Author: pmachata

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

Modified Files:
	boost.spec 
Added Files:
	boost-1.41.0-mapnik.patch 
Log Message:
- Add a patch to build mapnik
- Resolves: #558383


boost-1.41.0-mapnik.patch:
 mapped_file.hpp |    5 +++++
 1 file changed, 5 insertions(+)

--- NEW FILE boost-1.41.0-mapnik.patch ---
diff -up /home/petr/fedora/boost/devel/boost-1.41.0.cmake0/boost/iostreams/device/mapped_file.hpp\~ /home/petr/fedora/boost/devel/boost-1.41.0.cmake0/boost/iostreams/device/mapped_file.hpp
--- boost/iostreams/device/mapped_file.hpp~	2009-12-17 20:51:56.000000000 +0100
+++ boost/iostreams/device/mapped_file.hpp	2010-01-25 10:33:43.000000000 +0100
@@ -4,6 +4,9 @@
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt.)
 
+#ifndef BOOST_IOSTREAMS_MAPPED_FILE_HPP_INCLUDED
+#define BOOST_IOSTREAMS_MAPPED_FILE_HPP_INCLUDED
+
 #if defined(_MSC_VER) && (_MSC_VER >= 1020)
 # pragma once
 #endif
@@ -591,3 +594,5 @@ operator^=(mapped_file::mapmode& a, mapp
 } } // End namespaces iostreams, boost.
 
 #include <boost/config/abi_suffix.hpp> // pops abi_suffix.hpp pragmas
+
+#endif // #ifndef BOOST_IOSTREAMS_MAPPED_FILE_HPP_INCLUDED

Diff finished.  Mon Jan 25 10:33:55 2010


Index: boost.spec
===================================================================
RCS file: /cvs/pkgs/rpms/boost/devel/boost.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -p -r1.73 -r1.74
--- boost.spec	19 Jan 2010 15:50:57 -0000	1.73
+++ boost.spec	25 Jan 2010 09:40:32 -0000	1.74
@@ -13,7 +13,7 @@
 Name: boost
 Summary: The free peer-reviewed portable C++ source libraries
 Version: 1.41.0
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: Boost
 URL: http://sodium.resophonic.com/boost-cmake/%{version}.cmake0/
 Group: System Environment/Libraries
@@ -62,6 +62,7 @@ BuildRequires: mpich2-devel
 
 Patch0: boost-cmake-soname.patch
 Patch1: boost-graph-compile.patch
+Patch2: boost-1.41.0-mapnik.patch
 
 %bcond_with tests
 %bcond_with docs_generated
@@ -265,6 +266,7 @@ web page (http://www.boost.org/doc/libs/
 
 sed 's/_FEDORA_SONAME/%{sonamever}/' %{PATCH0} | %{__patch} -p0 --fuzz=0
 %patch1 -p0
+%patch2 -p0
 
 %build
 %{__mkdir_p} build
@@ -511,6 +513,10 @@ find $RPM_BUILD_ROOT%{_libdir}/ -name '*
 %{_libdir}/*.a
 
 %changelog
+* Mon Jan 25 2010 Petr Machata <pmachata at redhat.com> - 1.41.0-4
+- Add a patch to build mapnik
+- Resolves: #558383
+
 * Tue Jan 19 2010 Petr Machata <pmachata at redhat.com> - 1.41.0-3
 - Generalize the soname selection
 



More information about the scm-commits mailing list