- Up to 0.7.1

- Updated boost patch
- NFY, build fails

Changed files:
    mapnik-boost_lib_names.patch -> 1.2
    mapnik.spec -> 1.5

diff --git a/mapnik-boost_lib_names.patch b/mapnik-boost_lib_names.patch
index f3c574724e08ae8c517c2212d335d53276c2cf48..4b68668a78785ad5319b76c5309337d5828b2866 100644 (file)
--- a/mapnik-boost_lib_names.patch
+++ b/mapnik-boost_lib_names.patch
@@ -1,20 +1,13 @@
---- mapnik-0.6.0/SConstruct~   2009-04-01 17:32:53.000000000 +0200
-+++ mapnik-0.6.0/SConstruct    2009-05-08 21:31:52.000000000 +0200
-@@ -588,10 +588,6 @@
-     # which goes <toolset>-<threading>-<abi>-<version>. See:
-     #  http://www.boost.org/doc/libs/1_35_0/more/getting_started/unix-variants.html#library-naming
-     append_params = ['']
--    if env['BOOST_TOOLKIT']: append_params.append(env['BOOST_TOOLKIT'])
--    if thread_flag: append_params.append(thread_flag)
--    if env['BOOST_ABI']: append_params.append(env['BOOST_ABI'])
--    if env['BOOST_VERSION']: append_params.append(env['BOOST_VERSION'])
-     
-     # if the user is not setting custom boost configuration
-     # enforce boost version greater than or equal to 1.33
-@@ -885,4 +881,4 @@
-     SConscript('bindings/python/SConscript')
+--- mapnik-0.7.1/SConstruct~   2010-03-22 18:40:47.000000000 +0200
++++ mapnik-0.7.1/SConstruct    2010-04-06 15:26:44.282392752 +0300
+@@ -561,10 +561,6 @@
+         # which goes <toolset>-<threading>-<abi>-<version>. See:
+         #  http://www.boost.org/doc/libs/1_35_0/more/getting_started/unix-variants.html#library-naming
+         append_params = ['']
+-        if env['BOOST_TOOLKIT']: append_params.append(env['BOOST_TOOLKIT'])
+-        if thread_flag: append_params.append(thread_flag)
+-        if env['BOOST_ABI']: append_params.append(env['BOOST_ABI'])
+-        if env['BOOST_VERSION']: append_params.append(env['BOOST_VERSION'])
  
- # Configure fonts and if requested install the bundled DejaVu fonts
--SConscript('fonts/SConscript')
-\ No newline at end of file
-+SConscript('fonts/SConscript')
+         # Constructing the BOOST_APPEND setting that will be used to find the
+         # Boost libraries.

diff --git a/mapnik.spec b/mapnik.spec
index 113f2ce26d6b3e055e143b767accfaee34702923..3dd5d86a18aada4bf10a5c7c52ca9aa3f4bd5d74 100644 (file)
--- a/mapnik.spec
+++ b/mapnik.spec
@@ -1,12 +1,12 @@
 #
-Summary:       Toolkit for developing GIS (Geographic Information Systems) applications.
+Summary:       Toolkit for developing GIS (Geographic Information Systems) applications
 Name:          mapnik
-Version:       0.6.0
-Release:       1
+Version:       0.7.1
+Release:       0.1
 License:       LGPL v2.1
 Group:         Applications
 Source0:       http://download.berlios.de/mapnik/%{name}-%{version}.tar.bz2
-# Source0-md5: 981271ac1cd1432314a963809c245fe1
+# Source0-md5: 8f65fda2a792518d6f6be8a85f62fc73
 Patch0:                %{name}-boost_lib_names.patch
 URL:           http://prdownload.berlios.de/
 BuildRequires: boost-devel
@@ -34,15 +34,15 @@ Suggests:   fonts-TTF-DejaVu
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
-Mapnik is a Free Toolkit for developing mapping applications. It's written in
-C++ and there are Python bindings to facilitate fast-paced agile development.
-It can comfortably be used for both desktop and web development, which was
-something I wanted from the beginning.
+Mapnik is a Free Toolkit for developing mapping applications. It's
+written in C++ and there are Python bindings to facilitate fast-paced
+agile development. It can comfortably be used for both desktop and web
+development, which was something I wanted from the beginning.
 
-Mapnik is about making beautiful maps. It uses the AGG library and offers world
-class anti-aliasing rendering with subpixel accuracy for geographic data. It is
-written from scratch in modern C++ and doesn't suffer from design decisions
-made a decade ago.
+Mapnik is about making beautiful maps. It uses the AGG library and
+offers world class anti-aliasing rendering with subpixel accuracy for
+geographic data. It is written from scratch in modern C++ and doesn't
+suffer from design decisions made a decade ago.
 
 %package -n python-%{name}
 Summary:       Python bindings for Mapnik
@@ -85,7 +85,7 @@ Statyczna biblioteka Mapnik.
 %scons \
        PREFIX=%{_prefix} \
        BOOST_TOOLKIT=gcc43 \
-       SYSTEM_FONTS=/usr/share/fonts/TTF
+       SYSTEM_FONTS=%{_datadir}/fonts/TTF
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -93,7 +93,7 @@ rm -rf $RPM_BUILD_ROOT
 %scons install \
        PREFIX=%{_prefix} \
        DESTDIR=$RPM_BUILD_ROOT \
-       SYSTEM_FONTS=/usr/share/fonts/TTF
+       SYSTEM_FONTS=%{_datadir}/fonts/TTF
 
 %py_ocomp $RPM_BUILD_ROOT%{py_sitedir}
 %py_comp $RPM_BUILD_ROOT%{py_sitedir}