rpms/mapnik/devel mapnik-missingaggdepend.patch, NONE, 1.1 mapnik.spec, 1.17, 1.18

[Tom Callaway]

Author: spot

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

Modified Files:
	mapnik.spec 
Added Files:
	mapnik-missingaggdepend.patch 
Log Message:
fix linking to libagg, pkgconfig file

mapnik-missingaggdepend.patch:
 SConscript |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE mapnik-missingaggdepend.patch ---
--- src/SConscript.orig	2009-09-11 15:31:35.000000000 +0100
+++ src/SConscript	2009-09-11 15:32:07.000000000 +0100
@@ -53,8 +53,7 @@
     if env['BOOST_SYSTEM_REQUIRED']:
         libraries.append('boost_system%s' % env['BOOST_APPEND'])
     
-if env['INTERNAL_LIBAGG']:
-    libraries.insert(0, 'agg')
+libraries.insert(0, 'agg')
 
 if env['PLATFORM'] == 'Darwin':
     if env['FULL_LIB_PATH']:


Index: mapnik.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mapnik/devel/mapnik.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- mapnik.spec	7 Aug 2009 01:34:44 -0000	1.17
+++ mapnik.spec	12 Sep 2009 20:12:07 -0000	1.18
@@ -1,6 +1,6 @@
 Name:      mapnik
 Version:   0.6.1
-Release:   2%{?dist}
+Release:   3%{?dist}
 Summary:   Free Toolkit for developing mapping applications
 Group:     Applications/Engineering
 License:   LGPLv2+
@@ -10,6 +10,7 @@ Source1:   mapnik-data.license
 Source2:   no_date_footer.html
 Source3:   viewer.desktop
 Patch0:	   mapnik-build-viewer.patch
+Patch1:    mapnik-missingaggdepend.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %if 0%{?fedora} >= 11
@@ -102,6 +103,7 @@ spatial visualization library
 %setup -q -n %{name}-%{version}
 
 %patch0 -p0
+%patch1 -p0
 
 # clean SVN
 find . -type d -name .svn -exec rm -rf '{}' +
@@ -196,8 +198,9 @@ includedir=%{_includedir}
 Name: %{name}
 Description: Free Toolkit for developing mapping applications
 Version: %{version}
+Requires: libagg
 Libs: -lmapnik
-Cflags: -I${includedir}/%{name} -I${includedir}/agg2
+Cflags: -I\${includedir}/%{name}
 EOF
 
 mkdir -p %{buildroot}%{_datadir}/pkgconfig/
@@ -264,6 +267,10 @@ rm -rf %{buildroot}
 %doc demo/python demo/test
 
 %changelog
+* Sat Sep 12 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 0.6.1-3
+- fix mapnik to properly link to libagg (caolanm)
+- fix pkgconfig file (caolanm)
+
 * Fri Aug  7 2009 Christopher Brown <snecker[AT]fedoraproject.org> - 0.6.1-1
 - Update to 0.6.1
 - Add mapnik-build-viewer.patch