[mapnik] Patch for newer boost from upstream

[alexlan]

commit 11ffeacbc5bc60f2f7876661e59e6dd92748b7e6
Author: Alex Lancaster <alexlan[AT]fedoraproject org>
Date:   Mon Apr 29 14:32:19 2013 -0400

    Patch for newer boost from upstream

 mapnik-2.1.0-boost.patch |   36 ++++++++++++++++++++++++++++++++++++
 mapnik.spec              |    7 ++++++-
 2 files changed, 42 insertions(+), 1 deletions(-)
---
diff --git a/mapnik-2.1.0-boost.patch b/mapnik-2.1.0-boost.patch
new file mode 100644
index 0000000..9827e99
--- /dev/null
+++ b/mapnik-2.1.0-boost.patch
@@ -0,0 +1,36 @@
+From cf70b9959a45b9ab6af4a34824a5e4e80ce1d05c Mon Sep 17 00:00:00 2001
+From: Dane Springmeyer <dane at dbsgeo.com>
+Date: Sun, 10 Feb 2013 07:24:35 -0800
+Subject: [PATCH] fix compile of json feature_collection grammar when building
+ against >= boost 1.52 - refs #1658 and #1716
+
+---
+ src/json/feature_collection_parser.cpp | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/src/json/feature_collection_parser.cpp b/src/json/feature_collection_parser.cpp
+index 3faeda7..51ad824 100644
+--- a/src/json/feature_collection_parser.cpp
++++ b/src/json/feature_collection_parser.cpp
+@@ -20,12 +20,17 @@
+  *
+  *****************************************************************************/
+ 
++// TODO https://github.com/mapnik/mapnik/issues/1658
++#include <boost/version.hpp>
++#if BOOST_VERSION >= 105200
++#define BOOST_SPIRIT_USE_PHOENIX_V3
++#endif
++
+ // mapnik
+ #include <mapnik/json/feature_collection_parser.hpp>
+ #include <mapnik/json/feature_collection_grammar.hpp>
+ 
+ // boost
+-#include <boost/version.hpp>
+ #include <boost/spirit/include/qi.hpp>
+ #include <boost/spirit/include/support_multi_pass.hpp>
+ 
+-- 
+1.8.1.6
+
diff --git a/mapnik.spec b/mapnik.spec
index 65215aa..684ec07 100644
--- a/mapnik.spec
+++ b/mapnik.spec
@@ -1,6 +1,6 @@
 Name:      mapnik
 Version:   2.1.0
-Release:   2%{?dist}
+Release:   3%{?dist}
 Summary:   Free Toolkit for developing mapping applications
 Group:     Applications/Engineering
 License:   LGPLv2+
@@ -10,6 +10,7 @@ Source1:   mapnik-data.license
 Source2:   no_date_footer.html
 Source3:   viewer.desktop
 Patch0:	   mapnik-2.1.0-build-viewer.patch
+Patch1:	   mapnik-2.1.0-boost.patch
 
 Requires: dejavu-serif-fonts dejavu-sans-fonts dejavu-sans-mono-fonts dejavu-lgc-serif-fonts dejavu-lgc-sans-fonts dejavu-lgc-sans-mono-fonts
 Requires: proj-epsg
@@ -103,6 +104,7 @@ spatial visualization library
 %setup -q -n %{name}-v%{version}
 
 %patch0 -p1
+%patch1 -p1
 
 # clean SVN
 find . -type d -name .svn -exec rm -rf '{}' +
@@ -271,6 +273,9 @@ popd
 %doc demo/python demo/test
 
 %changelog
+* Mon Apr 29 2013 Alex Lancaster <alexlan fedoraproject org> - 2.1.0-3
+- Patch for newer boost from upstream
+
 * Tue Apr  2 2013 Tom Hughes <tom at compton.nu> - 2.1.0-2
 - Avoid recompilation during install phase
 - Use parallel compilation