- force boost filesystem v2

- rel. 3

Changed files:
    boost-filesystem.patch -> 1.1
    mapnik.spec -> 1.10

diff --git a/boost-filesystem.patch b/boost-filesystem.patch
new file mode 100644 (file)
index 0000000..fa104b4
--- /dev/null
+++ b/boost-filesystem.patch
@@ -0,0 +1,11 @@
+--- mapnik-0.7.1/SConstruct.orig       2011-06-16 20:59:28.000000000 +0200
++++ mapnik-0.7.1/SConstruct    2011-06-16 21:02:18.816618308 +0200
+@@ -1011,7 +1011,7 @@ if not preconfigured:
+                 env.Append(CXXFLAGS = common_cxx_flags + '-O %s' % ndebug_flags)
+         else:
+             # Common flags for GCC.
+-            gcc_cxx_flags = '-ansi -Wall %s -ftemplate-depth-100 %s' % (pthread, common_cxx_flags)
++            gcc_cxx_flags = '-ansi -Wall %s -ftemplate-depth-100 -DBOOST_FILESYSTEM_VERSION=2 %s' % (pthread, common_cxx_flags)
+         
+             if env['DEBUG']:
+                 env.Append(CXXFLAGS = gcc_cxx_flags + '-O0 -fno-inline %s' % debug_flags)

diff --git a/mapnik.spec b/mapnik.spec
index d00da4eeaa7f060de82e7826cec6503c19bf03c9..c6072802499ea56d6627075a989676bbc5f7ca49 100644 (file)
--- a/mapnik.spec
+++ b/mapnik.spec
@@ -2,12 +2,13 @@
 Summary:       Toolkit for developing GIS (Geographic Information Systems) applications
 Name:          mapnik
 Version:       0.7.1
-Release:       2
+Release:       3
 License:       LGPL v2.1
 Group:         Applications
 Source0:       http://download.berlios.de/mapnik/%{name}-%{version}.tar.bz2
 # Source0-md5: 8f65fda2a792518d6f6be8a85f62fc73
 Patch0:                %{name}-boost_lib_names.patch
+Patch1:                boost-filesystem.patch
 URL:           http://mapnik.org/
 BuildRequires: boost-devel
 BuildRequires: boost-python-devel
@@ -80,6 +81,7 @@ Statyczna biblioteka Mapnik.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %scons \