rpms/gpsdrive/devel gpsdrive-2.10pre7-agg.patch, NONE, 1.1 gpsdrive.spec, 1.8, 1.9

[Tom Callaway]

Author: spot

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

Modified Files:
	gpsdrive.spec 
Added Files:
	gpsdrive-2.10pre7-agg.patch 
Log Message:
fix compile, mapnik needs libagg

gpsdrive-2.10pre7-agg.patch:
 FindMapnik.cmake |   11 +++++++++++
 1 file changed, 11 insertions(+)

--- NEW FILE gpsdrive-2.10pre7-agg.patch ---
diff -up gpsdrive-2.10pre7/cmake/Modules/FindMapnik.cmake.BAD gpsdrive-2.10pre7/cmake/Modules/FindMapnik.cmake
--- gpsdrive-2.10pre7/cmake/Modules/FindMapnik.cmake.BAD	2009-09-12 10:43:35.540799139 -0400
+++ gpsdrive-2.10pre7/cmake/Modules/FindMapnik.cmake	2009-09-12 10:44:58.433782755 -0400
@@ -38,6 +38,16 @@ else (MAPNIK_LIBRARIES AND MAPNIK_INCLUD
       /sw/lib
   )
 
+  find_library(AGG_LIBRARY
+    NAMES
+      agg
+    PATHS
+      /usr/lib
+      /usr/local/lib
+      /opt/local/lib
+      /sw/lib
+  )
+
   if (MAPNIK_LIBRARY)
     set(MAPNIK_FOUND TRUE)
   endif (MAPNIK_LIBRARY)
@@ -50,6 +60,7 @@ else (MAPNIK_LIBRARIES AND MAPNIK_INCLUD
     set(MAPNIK_LIBRARIES
       ${MAPNIK_LIBRARIES}
       ${MAPNIK_LIBRARY}
+      ${AGG_LIBRARY}
     )
   endif (MAPNIK_FOUND)
 


Index: gpsdrive.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gpsdrive/devel/gpsdrive.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- gpsdrive.spec	25 Jul 2009 01:20:57 -0000	1.8
+++ gpsdrive.spec	12 Sep 2009 14:48:02 -0000	1.9
@@ -1,7 +1,7 @@
 Summary: A GPS based navigation tool 
 Name: gpsdrive
 Version: 2.10
-Release: 0.2.pre7%{?dist}
+Release: 0.3.pre7%{?dist}
 License: GPLv2+
 Group: Applications/Productivity
 URL: http://www.gpsdrive.de/index.shtml
@@ -12,6 +12,7 @@ URL: http://www.gpsdrive.de/index.shtml
 Source0: http://www.gpsdrive.de/packages/gpsdrive-2.10pre7.tar.gz
 Source1: http://download.sourceforge.net/sourceforge/gpsdrive/openstreetmap-map-icons-minimal.tar.gz
 Patch1: gpsdrive-2.10pre7-fedora.patch
+Patch2: gpsdrive-2.10pre7-agg.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: gtk2-devel >= 2.0.6
@@ -56,6 +57,7 @@ Speech output is also available. MySQL i
 %setup -q -a 1 -T -D -n gpsdrive-2.10pre7
 
 %patch1 -p1
+%patch2 -p1 -b .agg
 
 %build
 mkdir build
@@ -111,6 +113,9 @@ rm -rf $RPM_BUILD_ROOT
 %{perl_vendorlib}/*
 
 %changelog
+* Sat Sep 12 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 2.1.0-0.3.pre7
+- mapnik needs libagg to work
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.10-0.2.pre7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild