rpms/mapnik/devel mapnik.spec,1.15,1.16

[Christopher Brown]

Author: snecker

Update of /cvs/pkgs/rpms/mapnik/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9075

Modified Files:
	mapnik.spec 
Log Message:
Updated spec file



Index: mapnik.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mapnik/devel/mapnik.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- mapnik.spec	25 Jul 2009 11:47:18 -0000	1.15
+++ mapnik.spec	7 Aug 2009 01:33:30 -0000	1.16
@@ -1,16 +1,15 @@
 Name:      mapnik
-Version:   0.5.2
-Release:   0.14.svn780%{?dist}
+Version:   0.6.1
+Release:   1%{?dist}
 Summary:   Free Toolkit for developing mapping applications
 Group:     Applications/Engineering
 License:   LGPLv2+
 URL:       http://mapnik.org/
-Source0:   http://download.berlios.de/mapnik/mapnik_src-%{version}.svn738.tar.gz
+Source0:   http://download.berlios.de/mapnik/mapnik-%{version}.tar.bz2
 Source1:   mapnik-data.license
 Source2:   no_date_footer.html
 Source3:   viewer.desktop
-Patch0:    use-system-fonts.patch
-Patch1:    mapnik-0.5.2-gcc44.patch
+Patch0:	   mapnik-build-viewer.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %if 0%{?fedora} >= 11
@@ -21,7 +20,7 @@ Requires:  dejavu-fonts
 
 BuildRequires: postgresql-devel pkgconfig
 BuildRequires: gdal-devel proj-devel agg-devel
-BuildRequires: scons doxygen desktop-file-utils
+BuildRequires: scons desktop-file-utils
 BuildRequires: libtool-ltdl-devel qt-devel > 4.3
 BuildRequires: libxml2-devel boost-devel libicu-devel
 BuildRequires: libtiff-devel libjpeg-devel libpng-devel
@@ -94,16 +93,15 @@ License:  GPLv2+ GeoGratis
 Group:    Development/Libraries
 Requires: %{name}-devel = %{version}-%{release}
 Requires: %{name}-python = %{version}-%{release}
-Requires: freetype-devel
 
 %description demo
 Demo application and sample vector datas distributed with the Mapnik
 spatial visualization library
 
 %prep
-%setup -q -n %{name}
+%setup -q -n %{name}-%{version}
+
 %patch0 -p0
-%patch1 -p1 -b .gcc44
 
 # clean SVN
 find . -type d -name .svn -exec rm -rf '{}' +
@@ -129,6 +127,7 @@ 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 '{}' \;
 
@@ -158,6 +157,7 @@ scons         PREFIX=%{_prefix} \
               XMLPARSER=libxml2 \
               GDAL_INCLUDES=%{_includedir}/gdal \
               INTERNAL_LIBAGG=False
+	      SYSTEM_FONTS=True
 
 # build mapnik viewer app
 pushd demo/viewer
@@ -167,14 +167,6 @@ qmake-qt4 viewer.pro
 make
 popd
 
-# build doxygen docs
-# use multilib aware footer
-sed -i -e 's|HTML_FOOTER|HTML_FOOTER=no_date_footer.html\n\#|g' docs/doxygen/Doxyfile
-install -p -m 644 %{SOURCE2} docs/doxygen/
-pushd docs/doxygen
-doxygen
-popd
-
 %install
 
 rm -rf %{buildroot}
@@ -205,7 +197,7 @@ Name: %{name}
 Description: Free Toolkit for developing mapping applications
 Version: %{version}
 Libs: -lmapnik
-Cflags: -I${includedir}/%{name} -I${includedir}/agg
+Cflags: -I${includedir}/%{name} -I${includedir}/agg2
 EOF
 
 mkdir -p %{buildroot}%{_datadir}/pkgconfig/
@@ -221,9 +213,14 @@ desktop-file-install --vendor="fedora" \
 export PYTHONPATH=$PYTHONPATH:%{buildroot}%{python_sitearch}
 export LD_LIBRARY_PATH=$LD_LIBRARY_PATH%{buildroot}%{_libdir}
 
-pushd tests/python/
-./test_load_map.py || true
-./test_save_map.py || true
+pushd tests/python_tests/
+./load_map_test.py || true
+./save_map_test.py || true
+./datasource_test.py || true
+./font_test_test.py || true
+./object_test.py || true
+./projection_test.py || true
+./render_test.py || true
 popd
 
 %clean
@@ -243,7 +240,7 @@ rm -rf %{buildroot}
 
 %files devel
 %defattr(-,root,root,-)
-%doc docs/doxygen/html
+%doc docs/
 %dir %{_includedir}/%{name}
 %{_includedir}/%{name}/*
 %{_libdir}/lib%{name}.so
@@ -267,8 +264,11 @@ rm -rf %{buildroot}
 %doc demo/python demo/test
 
 %changelog
-* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.2-0.14.svn780
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+* Fri Aug  7 2009 Christopher Brown <snecker[AT]fedoraproject.org> - 0.6.1-1
+- Update to 0.6.1
+- Add mapnik-build-viewer.patch
+- Drop use-system-fonts.patch as scons provides this
+- Drop mapnik-0.5.2-gcc44.patch as the code is now good for gcc44
 
 * Sat Jun 20 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 0.5.2-0.13.svn780
 - Require individual dejavu font packages