packages: mapnik/mapnik.spec, mapnik/boost-filesystem.patch (REMOVED) - up ...

[wiget]

Author: wiget                        Date: Thu Oct 13 23:35:08 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 2.0.0
- enable all input plugins
- more verbose %files

---- Files affected:
packages/mapnik:
   mapnik.spec (1.11 -> 1.12) , boost-filesystem.patch (1.1 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/mapnik/mapnik.spec
diff -u packages/mapnik/mapnik.spec:1.11 packages/mapnik/mapnik.spec:1.12
--- packages/mapnik/mapnik.spec:1.11	Sun Oct  9 12:23:47 2011
+++ packages/mapnik/mapnik.spec	Fri Oct 14 01:35:02 2011
@@ -2,14 +2,13 @@
 #
 Summary:	Toolkit for developing GIS (Geographic Information Systems) applications
 Name:		mapnik
-Version:	0.7.1
-Release:	4
+Version:	2.0.0
+Release:	1
 License:	LGPL v2.1
 Group:		Applications
 Source0:	http://download.berlios.de/mapnik/%{name}-%{version}.tar.bz2
-# Source0-md5:	8f65fda2a792518d6f6be8a85f62fc73
+# Source0-md5:	499c6a61544014b9bc2a7c978f963ef3
 Patch0:		%{name}-boost_lib_names.patch
-Patch1:		boost-filesystem.patch
 URL:		http://mapnik.org/
 BuildRequires:	boost-devel
 BuildRequires:	boost-python-devel
@@ -82,13 +81,12 @@
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
 
 %build
 %scons \
 	PREFIX=%{_prefix} \
 	BOOST_TOOLKIT=gcc43 \
-	INPUT_PLUGINS='raster,sqlite,osm,gdal,kismet,shape,postgis,ogr' \
+	INPUT_PLUGINS='raster,rasterlite,sqlite,osm,gdal,kismet,shape,postgis,ogr,geos,occi' \
 	SYSTEM_FONTS=%{_datadir}/fonts/TTF
 
 %install
@@ -103,9 +101,6 @@
 %py_comp $RPM_BUILD_ROOT%{py_sitedir}
 %py_postclean
 
-## DejaVu fonts are available in a separate package
-#rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}/fonts
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -115,24 +110,36 @@
 %files
 %defattr(644,root,root,755)
 %doc AUTHORS CHANGELOG INSTALL README
-%attr(755,root,root) %{_bindir}/*
-%attr(755,root,root) %{_libdir}/lib*.so.*.*
-%dir %{_libdir}/%{name}
-%dir %{_libdir}/%{name}/input
-%attr(755,root,root) %{_libdir}/%{name}/input/*.input
+%attr(755,root,root) %{_bindir}/mapnik-config
+%attr(755,root,root) %{_bindir}/mapnik-speed-check
+%attr(755,root,root) %{_bindir}/shapeindex
+%attr(755,root,root) %{_bindir}/upgrade_map_xml.py
+%attr(755,root,root) %{_libdir}/libmapnik2.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libmapnik2.so.2.0
+%dir %{_libdir}/mapnik2
+%dir %{_libdir}/mapnik2/input
+%attr(755,root,root) %{_libdir}/mapnik2/input/gdal.input
+%attr(755,root,root) %{_libdir}/mapnik2/input/geos.input
+%attr(755,root,root) %{_libdir}/mapnik2/input/kismet.input
+%attr(755,root,root) %{_libdir}/mapnik2/input/ogr.input
+%attr(755,root,root) %{_libdir}/mapnik2/input/osm.input
+%attr(755,root,root) %{_libdir}/mapnik2/input/postgis.input
+%attr(755,root,root) %{_libdir}/mapnik2/input/raster.input
+%attr(755,root,root) %{_libdir}/mapnik2/input/shape.input
+%attr(755,root,root) %{_libdir}/mapnik2/input/sqlite.input
 
 %files devel
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/lib*.so
-%{_includedir}/*
+%attr(755,root,root) %{_libdir}/libmapnik2.so
+%{_includedir}/mapnik
 
 %files -n python-%{name}
 %defattr(644,root,root,755)
-%dir %{py_sitedir}/%{name}
-%{py_sitedir}/%{name}/*.py[co]
-%attr(755,root,root) %{py_sitedir}/%{name}/*.so
-%dir %{py_sitedir}/%{name}/ogcserver
-%{py_sitedir}/%{name}/ogcserver/*.py[co]
+%dir %{py_sitedir}/mapnik2
+%{py_sitedir}/mapnik2/*.py[co]
+%attr(755,root,root) %{py_sitedir}/mapnik2/_mapnik2.so
+%dir %{py_sitedir}/mapnik2/ogcserver
+%{py_sitedir}/mapnik2/ogcserver/*.py[co]
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -140,6 +147,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.12  2011/10/13 23:35:02  wiget
+- up to 2.0.0
+- enable all input plugins
+- more verbose %files
+
 Revision 1.11  2011/10/09 10:23:47  arekm
 - release 4
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mapnik/mapnik.spec?r1=1.11&r2=1.12&f=u