[mapnik] Update to upstream 2.0.0 Namespace is "mapnik2". Add some new binaries to main package and python su

[alexlan]

commit f6795d0ea40c100963ab9db4ab36bebaabe1c465
Author: Alex Lancaster <alexlan[AT]fedoraproject org>
Date:   Mon Nov 28 16:55:39 2011 -0500

    Update to upstream 2.0.0
    Namespace is "mapnik2".
    Add some new binaries to main package and python subpackage
    Add Requires for proj-epsg (#689201) so that tile rendering
      for OSM works out of the box
    Drop old patches

 .gitignore                        |    1 +
 mapnik-0.7.0-libs.patch           |   15 ------------
 mapnik-2.0.0-build-viewer.patch   |   21 +++++++++++++++++
 mapnik-build-viewer.patch         |   23 -------------------
 mapnik-changeset_trunk_r2496.diff |   13 ----------
 mapnik.spec                       |   45 ++++++++++++++++++++++--------------
 sources                           |    2 +-
 7 files changed, 50 insertions(+), 70 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index d2bcdb6..2668151 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 mapnik-0.7.1.tar.bz2
+/mapnik-2.0.0.tar.bz2
diff --git a/mapnik-2.0.0-build-viewer.patch b/mapnik-2.0.0-build-viewer.patch
new file mode 100644
index 0000000..77a59c8
--- /dev/null
+++ b/mapnik-2.0.0-build-viewer.patch
@@ -0,0 +1,21 @@
+--- demo/viewer/viewer.pro.orig	2011-11-22 15:31:15.047234855 -0500
++++ demo/viewer/viewer.pro	2011-11-22 15:32:35.205213622 -0500
+@@ -4,14 +4,15 @@
+ CC = g++
+ TEMPLATE = app
+ 
+-INCLUDEPATH += /usr/local/include/
++INCLUDEPATH += /usr/include/
++INCLUDEPATH += ../../include/
+ INCLUDEPATH += /usr/boost/include/
+ INCLUDEPATH += /usr/X11/include/
+-INCLUDEPATH += /usr/X11/include/freetype2
++INCLUDEPATH += /usr/include/freetype2
+ INCLUDEPATH += .
+ 
+ QMAKE_CXXFLAGS +=' -DDARWIN -Wno-missing-field-initializers -ansi'
+-unix:LIBS =  -L/usr/local/lib -L/usr/X11/lib -lmapnik2 -lfreetype
++unix:LIBS = -L../../src/ -L/usr/local/lib -L/usr/X11/lib -lmapnik2 -lfreetype
+ unix:LIBS += -lboost_system -licuuc -lboost_filesystem -lboost_regex
+ 
+ # Input
diff --git a/mapnik.spec b/mapnik.spec
index 63fd8d4..9d46834 100644
--- a/mapnik.spec
+++ b/mapnik.spec
@@ -1,6 +1,6 @@
 Name:      mapnik
-Version:   0.7.1
-Release:   12%{?dist}
+Version:   2.0.0
+Release:   1%{?dist}
 Summary:   Free Toolkit for developing mapping applications
 Group:     Applications/Engineering
 License:   LGPLv2+
@@ -9,9 +9,7 @@ Source0:   http://download.berlios.de/mapnik/mapnik-%{version}.tar.bz2
 Source1:   mapnik-data.license
 Source2:   no_date_footer.html
 Source3:   viewer.desktop
-Patch0:	   mapnik-build-viewer.patch
-Patch1:    mapnik-0.7.0-libs.patch
-Patch2:	   mapnik-changeset_trunk_r2496.diff
+Patch0:	   mapnik-2.0.0-build-viewer.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %if 0%{?fedora} >= 11
@@ -19,6 +17,8 @@ Requires:  dejavu-serif-fonts dejavu-sans-fonts dejavu-sans-mono-fonts dejavu-lg
 %else
 Requires:  dejavu-fonts
 %endif
+Requires: proj-epsg
+
 
 BuildRequires: postgresql-devel pkgconfig
 BuildRequires: gdal-devel proj-devel agg-devel
@@ -104,8 +104,6 @@ spatial visualization library
 %setup -q -n %{name}-%{version}
 
 %patch0 -p0
-%patch1 -p0
-%patch2 -p1
 
 # clean SVN
 find . -type d -name .svn -exec rm -rf '{}' +
@@ -146,10 +144,10 @@ sed -i -e 's|/usr/local|/usr|g' demo/viewer/viewer.pro
 %build
 
 # linkage errors
-sed -i -e "s|libraries \= \[|libraries \= \[\'mapnik\',|g" plugins/input/gdal/SConscript
-sed -i -e "s|libraries \= \[|libraries \= \[\'mapnik\',|g" plugins/input/postgis/SConscript
-sed -i -e "s|libraries \= \[|libraries \= \[\'mapnik\',|g" plugins/input/shape/SConscript
-sed -i -e "s|libraries \= \[|libraries \= \[\'mapnik\'|g" plugins/input/raster/SConscript
+#sed -i -e "s|libraries \= \[|libraries \= \[\'mapnik\',|g" plugins/input/gdal/SConscript
+#sed -i -e "s|libraries \= \[|libraries \= \[\'mapnik\',|g" plugins/input/postgis/SConscript
+#sed -i -e "s|libraries \= \[|libraries \= \[\'mapnik\',|g" plugins/input/shape/SConscript
+#sed -i -e "s|libraries \= \[|libraries \= \[\'mapnik\'|g" plugins/input/raster/SConscript
 
 # fix build flags
 sed -i -e "s|common_cxx_flags = .-D\%s|common_cxx_flags = \'-D\%s $RPM_OPT_FLAGS |g" SConstruct
@@ -239,28 +237,31 @@ rm -rf %{buildroot}
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING README
-%dir %{_libdir}/%{name}
-%dir %{_libdir}/%{name}/input
-%{_libdir}/%{name}/input/*.input
-%{_libdir}/lib%{name}.so.*
+%dir %{_libdir}/%{name}2
+%dir %{_libdir}/%{name}2/input
+%{_bindir}/mapnik-config
+%{_libdir}/%{name}2/input/*.input
+%{_libdir}/lib%{name}2.so.*
 
 %files devel
 %defattr(-,root,root,-)
 %doc docs/
 %dir %{_includedir}/%{name}
 %{_includedir}/%{name}/*
-%{_libdir}/lib%{name}.so
+%{_libdir}/lib%{name}2.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}/viewer
+%{_bindir}/mapnik-speed-check
+%{_bindir}/upgrade_map_xml.py
 %{_datadir}/applications/fedora-viewer.desktop
 
 %files demo
@@ -270,7 +271,15 @@ rm -rf %{buildroot}
 %doc demo/python demo/test
 
 %changelog
-* Tue Nov 22 2011  <alex at sup35.ccdom.wi.mit.edu> - 0.7.1-12
+* Tue Nov 22 2011 Alex Lancaster <alexlan[AT]fedoraproject org> - 2.0.0-1
+- Update to upstream 2.0.0
+- Namespace is "mapnik2".
+- Add some new binaries to main package and python subpackage
+- Add Requires for proj-epsg (#689201) so that tile rendering
+  for OSM works out of the box
+- Drop old patches
+
+* Tue Nov 22 2011 Alex Lancaster <alexlan[AT]fedoraproject org> - 0.7.1-12
 - Rebuild for new boost.
 
 * Mon Oct 17 2011 Alex Lancaster <alexlan[AT]fedoraproject org> - 0.7.1-11
diff --git a/sources b/sources
index e8da6fb..f3bc807 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8f65fda2a792518d6f6be8a85f62fc73  mapnik-0.7.1.tar.bz2
+499c6a61544014b9bc2a7c978f963ef3  mapnik-2.0.0.tar.bz2