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

[Tom Callaway]

Author: spot

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

Modified Files:
	gpsdrive.spec 
Added Files:
	gpsdrive-2.10pre7-usepc.patch 
Removed Files:
	gpsdrive-2.10pre7-agg.patch 
Log Message:
properly detect/use mapnik, drop old libagg patch

gpsdrive-2.10pre7-usepc.patch:
 FindMapnik.cmake |   60 -------------------------------------------------------
 1 file changed, 1 insertion(+), 59 deletions(-)

--- NEW FILE gpsdrive-2.10pre7-usepc.patch ---
diff -Nru gpsdrive-2.10pre7.orig/cmake/Modules/FindMapnik.cmake gpsdrive-2.10pre7/cmake/Modules/FindMapnik.cmake
--- gpsdrive-2.10pre7.orig/cmake/Modules/FindMapnik.cmake	2009-09-11 13:30:56.000000000 +0100
+++ gpsdrive-2.10pre7/cmake/Modules/FindMapnik.cmake	2009-09-11 13:33:36.000000000 +0100
@@ -13,62 +13,4 @@
 #  For details see the accompanying COPYING-CMAKE-SCRIPTS file.
 #
 
-
-if (MAPNIK_LIBRARIES AND MAPNIK_INCLUDE_DIRS)
-  # in cache already
-  set(MAPNIK_FOUND TRUE)
-else (MAPNIK_LIBRARIES AND MAPNIK_INCLUDE_DIRS)
-  find_path(MAPNIK_INCLUDE_DIR
-    NAMES
-      mapnik/config.hpp
-    PATHS
-      /usr/include
-      /usr/local/include
-      /opt/local/include
-      /sw/include
-  )
-
-  find_library(MAPNIK_LIBRARY
-    NAMES
-      mapnik
-    PATHS
-      /usr/lib
-      /usr/local/lib
-      /opt/local/lib
-      /sw/lib
-  )
-
-  if (MAPNIK_LIBRARY)
-    set(MAPNIK_FOUND TRUE)
-  endif (MAPNIK_LIBRARY)
-
-  set(MAPNIK_INCLUDE_DIRS
-    ${MAPNIK_INCLUDE_DIR}
-  )
-
-  if (MAPNIK_FOUND)
-    set(MAPNIK_LIBRARIES
-      ${MAPNIK_LIBRARIES}
-      ${MAPNIK_LIBRARY}
-    )
-  endif (MAPNIK_FOUND)
-
-  if (MAPNIK_INCLUDE_DIRS AND MAPNIK_LIBRARIES)
-     set(MAPNIK_FOUND TRUE)
-  endif (MAPNIK_INCLUDE_DIRS AND MAPNIK_LIBRARIES)
-
-  if (MAPNIK_FOUND)
-    if (NOT Mapnik_FIND_QUIETLY)
-      message(STATUS "Found Mapnik: ${MAPNIK_LIBRARIES}")
-    endif (NOT Mapnik_FIND_QUIETLY)
-  else (MAPNIK_FOUND)
-    if (Mapnik_FIND_REQUIRED)
-      message(FATAL_ERROR "Could not find Mapnik")
-    endif (Mapnik_FIND_REQUIRED)
-  endif (MAPNIK_FOUND)
-
-  # show the MAPNIK_INCLUDE_DIRS and MAPNIK_LIBRARIES variables only in the advanced view
-  mark_as_advanced(MAPNIK_INCLUDE_DIRS MAPNIK_LIBRARIES)
-
-endif (MAPNIK_LIBRARIES AND MAPNIK_INCLUDE_DIRS)
-
+pkg_check_modules (MAPNIK REQUIRED mapnik)


Index: gpsdrive.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gpsdrive/devel/gpsdrive.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- gpsdrive.spec	12 Sep 2009 14:48:02 -0000	1.9
+++ gpsdrive.spec	12 Sep 2009 20:13:40 -0000	1.10
@@ -1,7 +1,7 @@
 Summary: A GPS based navigation tool 
 Name: gpsdrive
 Version: 2.10
-Release: 0.3.pre7%{?dist}
+Release: 0.4.pre7%{?dist}
 License: GPLv2+
 Group: Applications/Productivity
 URL: http://www.gpsdrive.de/index.shtml
@@ -12,7 +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
+Patch2: gpsdrive-2.10pre7-usepc.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: gtk2-devel >= 2.0.6
@@ -57,7 +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
+%patch2 -p1 -b .usepc
 
 %build
 mkdir build
@@ -113,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.4.pre7
+- use caolanm's fix (now that mapnik is properly fixed), use pkgconfig to figure out mapnik cflags/libs
+
 * Sat Sep 12 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 2.1.0-0.3.pre7
 - mapnik needs libagg to work
 


--- gpsdrive-2.10pre7-agg.patch DELETED ---