[mapnik] Patch for mapnik 2.1.0 (#912087). Thanks to Tom Hughes.

[alexlan]

commit e9fca636b0258e0fae1efa8f9faad06c7b56ef66
Author: Alex Lancaster <alexlan[AT]fedoraproject org>
Date:   Mon Apr 29 12:55:29 2013 -0400

    Patch for mapnik 2.1.0 (#912087).
    Thanks to Tom Hughes.

 mapnik-2.0.0-64bit.patch        |   12 ------
 mapnik-2.0.0-big-endian.patch   |   19 ---------
 mapnik-2.0.0-build-viewer.patch |   21 ----------
 mapnik.spec                     |   78 +++++++++++++++++++++-----------------
 4 files changed, 43 insertions(+), 87 deletions(-)
---
diff --git a/mapnik.spec b/mapnik.spec
index 9565d29..65215aa 100644
--- a/mapnik.spec
+++ b/mapnik.spec
@@ -1,17 +1,15 @@
 Name:      mapnik
-Version:   2.0.0
-Release:   13%{?dist}
+Version:   2.1.0
+Release:   2%{?dist}
 Summary:   Free Toolkit for developing mapping applications
 Group:     Applications/Engineering
 License:   LGPLv2+
 URL:       http://mapnik.org/
-Source0:   http://download.berlios.de/mapnik/mapnik-%{version}.tar.bz2
+Source0:   https://github.com/downloads/mapnik/mapnik/mapnik-v%{version}.tar.bz2
 Source1:   mapnik-data.license
 Source2:   no_date_footer.html
 Source3:   viewer.desktop
-Patch0:	   mapnik-2.0.0-build-viewer.patch
-Patch1:	   mapnik-2.0.0-big-endian.patch
-Patch2:	   mapnik-2.0.0-64bit.patch
+Patch0:	   mapnik-2.1.0-build-viewer.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
@@ -23,10 +21,14 @@ BuildRequires: libtool-ltdl-devel qt-devel > 4.3
 BuildRequires: libxml2-devel boost-devel libicu-devel
 BuildRequires: libtiff-devel libjpeg-devel libpng-devel
 BuildRequires: cairomm-devel pycairo-devel freetype-devel
+BuildRequires: sqlite-devel libcurl-devel
 
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
+%filter_provides_in %{_libdir}/%{name}/input
+%filter_setup
+
 %description
 Mapnik is a Free Toolkit for developing mapping applications.
 It's written in C++ and there are Python bindings to
@@ -98,11 +100,9 @@ Demo application and sample vector datas distributed with the Mapnik
 spatial visualization library
 
 %prep
-%setup -q -n %{name}-%{version}
+%setup -q -n %{name}-v%{version}
 
-%patch0 -p0
-%patch1 -p1
-%patch2 -p1
+%patch0 -p1
 
 # clean SVN
 find . -type d -name .svn -exec rm -rf '{}' +
@@ -128,7 +128,6 @@ set -x
 
 # fix spurious exec flag
 chmod -x demo/viewer/images/*.png
-chmod -x bindings/python/mapnik/ogcserver/modserver.py
 chmod -x demo/data/test/regenerate.sh
 find . -type d -perm /g+s -exec chmod -s '{}' \;
 
@@ -151,32 +150,30 @@ sed -i -e 's|/usr/local|/usr|g' demo/viewer/viewer.pro
 # fix build flags
 sed -i -e "s|common_cxx_flags = .-D\%s|common_cxx_flags = \'-D\%s $RPM_OPT_FLAGS |g" SConstruct
 
-# WARNING smp may break build
-# %{?_smp_mflags}
-scons         PREFIX=%{_prefix} \
-              THREADING=multi \
-              XMLPARSER=libxml2 \
-              GDAL_INCLUDES=%{_includedir}/gdal \
-              INTERNAL_LIBAGG=False \
-	      SYSTEM_FONTS=%{_datadir}/fonts \
-	      BOOST_SYSTEM_REQUIRED=True
+# configure mapnik
+scons configure DESTDIR=%{buildroot} \
+                PREFIX=%{_prefix} \
+                THREADING=multi \
+                XMLPARSER=libxml2 \
+                GDAL_INCLUDES=%{_includedir}/gdal \
+                INTERNAL_LIBAGG=False \
+	        SYSTEM_FONTS=%{_datadir}/fonts \
+	        BOOST_SYSTEM_REQUIRED=True \
+                LIBDIR_SCHEMA=%{_lib}
+
+# build mapnik
+scons %{?_smp_mflags}
 
 # build mapnik viewer app
 pushd demo/viewer
 qmake-qt4 viewer.pro
-# WARNING smp may break build
-# %{?_smp_mflags}
-make
+make %{?_smp_mflags}
 popd
 
 %install
 
-scons install DESTDIR=%{buildroot} \
-              PREFIX=%{_prefix} \
-              THREADING=multi \
-              XMLPARSER=libxml2 \
-              GDAL_INCLUDES=%{_includedir}/gdal \
-              INTERNAL_LIBAGG=False
+# install mapnik
+scons install
 
 # get rid of fonts use external instead
 rm -rf %{buildroot}%{_libdir}/%{name}/fonts
@@ -233,29 +230,31 @@ popd
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING README
-%dir %{_libdir}/%{name}2
-%dir %{_libdir}/%{name}2/input
+%doc AUTHORS.md CHANGELOG.md COPYING README.md
+%dir %{_libdir}/%{name}
+%dir %{_libdir}/%{name}/input
 %{_bindir}/mapnik-config
-%{_libdir}/%{name}2/input/*.input
-%{_libdir}/lib%{name}2.so.*
+%{_libdir}/%{name}/input/*.input
+%{_libdir}/lib%{name}.so.*
 
 %files devel
 %defattr(-,root,root,-)
 %doc docs/
 %dir %{_includedir}/%{name}
 %{_includedir}/%{name}/*
-%{_libdir}/lib%{name}2.so
+%{_libdir}/lib%{name}.so
 %{_datadir}/pkgconfig/%{name}.pc
 
 %files python
 %defattr(-,root,root,-)
+%{python_sitearch}/%{name}
 %{python_sitearch}/%{name}2
 %{_bindir}/mapdef_stats.py
 
 %files utils
 %defattr(-,root,root,-)
 %{_bindir}/shapeindex
+%{_bindir}/svg2png
 %{_bindir}/viewer
 %{_bindir}/mapnik-speed-check
 %{_bindir}/upgrade_map_xml.py
@@ -272,6 +271,15 @@ popd
 %doc demo/python demo/test
 
 %changelog
+* Tue Apr  2 2013 Tom Hughes <tom at compton.nu> - 2.1.0-2
+- Avoid recompilation during install phase
+- Use parallel compilation
+- BuildRequire libcurl-devel for the osm plugin
+
+* Sat Feb 16 2013 Tom Hughes <tom at compton.nu> - 2.1.0-1
+- Update to 2.1.0 upstream release
+- Filter out provides from the plugins
+
 * Thu Feb 14 2013 Toshio Kuratomi <toshio at fedoraproject.org> - 2.0.0-13
 - Remove --vendor from desktop-file-install https://fedorahosted.org/fesco/ticket/1077