rpms/mapnik/devel mapnik-0.5.2-gcc44.patch, NONE, 1.1 mapnik.spec, 1.12, 1.13

[Jesse Keating]

Author: jkeating

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

Modified Files:
	mapnik.spec 
Added Files:
	mapnik-0.5.2-gcc44.patch 
Log Message:
* Tue Mar 24 2009 Alex Lancaster <alexlan[AT] fedoraproject org> - 0.5.2-0.12.svn780
- Add patch for compiling against GCC 4.4
- Fix file list for Python
- Fix font Requires: dejavu-fonts-compat and macro


mapnik-0.5.2-gcc44.patch:

--- NEW FILE mapnik-0.5.2-gcc44.patch ---
--- mapnik/include/mapnik/octree.hpp.orig	2009-03-23 20:36:08.000000000 -0700
+++ mapnik/include/mapnik/octree.hpp	2009-03-23 20:36:58.000000000 -0700
@@ -29,6 +29,7 @@
 #include <vector>
 #include <iostream>
 #include <deque>
+#include <stdint.h>
 
 namespace mapnik {
 	


Index: mapnik.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mapnik/devel/mapnik.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- mapnik.spec	25 Feb 2009 23:38:40 -0000	1.12
+++ mapnik.spec	24 Mar 2009 20:05:30 -0000	1.13
@@ -1,6 +1,6 @@
 Name:      mapnik
 Version:   0.5.2
-Release:   0.11.svn780%{?dist}
+Release:   0.12.svn780%{?dist}
 Summary:   Free Toolkit for developing mapping applications
 Group:     Applications/Engineering
 License:   LGPLv2+
@@ -10,10 +10,11 @@
 Source2:   no_date_footer.html
 Source3:   viewer.desktop
 Patch0:    use-system-fonts.patch
+Patch1:    mapnik-0.5.2-gcc44.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-%if "%{?dist}" == ".fc11"
-Requires:  dejavu-fonts-sans
+%if 0%{?fedora} >= 11
+Requires:  dejavu-fonts-compat
 %else
 Requires:  dejavu-fonts
 %endif
@@ -102,6 +103,7 @@
 %prep
 %setup -q -n %{name}
 %patch0 -p0
+%patch1 -p1 -b .gcc44
 
 # clean SVN
 find . -type d -name .svn -exec rm -rf '{}' +
@@ -250,7 +252,6 @@
 %files python
 %defattr(-,root,root,-)
 %{python_sitearch}/%{name}
-%exclude %{_bindir}/mapdef_stats.py?
 %{_bindir}/mapdef_stats.py
 
 %files utils
@@ -266,6 +267,11 @@
 %doc demo/python demo/test
 
 %changelog
+* Tue Mar 24 2009 Alex Lancaster <alexlan[AT] fedoraproject org> - 0.5.2-0.12.svn780
+- Add patch for compiling against GCC 4.4
+- Fix file list for Python
+- Fix font Requires: dejavu-fonts-compat and macro
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.2-0.11.svn780
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild