[gpsdrive] Update to 2.11

Hicham HAOUARI hicham at fedoraproject.org
Fri Jul 30 01:02:08 UTC 2010 

commit 23808cb5c423ab67f62951d534c5abf85a91b5cd
Author: Hicham HAOUARI <hicham.haouari at gmail.com>
Date:   Fri Jul 30 02:01:38 2010 +0100

    Update to 2.11

 .gitignore                          |    1 +
 gpsdrive-2.10pre7-fedora.patch      |    4 ++--
 gpsdrive-2.11-add-gdk-pixbuf2.patch |   31 +++++++++++++++++++++++++++++++
 gpsdrive.spec                       |   18 ++++++++++++------
 sources                             |    2 +-
 5 files changed, 47 insertions(+), 9 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 6bec754..5ba451e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 gpsdrive-2.10-20100508.tar.gz
 openstreetmap-map-icons-minimal.tar.gz
+gpsdrive-2.11.tar.gz
diff --git a/gpsdrive-2.10pre7-fedora.patch b/gpsdrive-2.10pre7-fedora.patch
index 1f0867c..8d3f48a 100644
--- a/gpsdrive-2.10pre7-fedora.patch
+++ b/gpsdrive-2.10pre7-fedora.patch
@@ -37,9 +37,9 @@ diff -Nur gpsdrive-2.10pre7.orig/scripts/osm/perl_lib/Geo/OSM/Upload.pm gpsdrive
 diff -Nur gpsdrive-2.10pre7.orig/src/gpsdrive_config.c gpsdrive-2.10pre7/src/gpsdrive_config.c
 --- gpsdrive-2.10pre7.orig/src/gpsdrive_config.c	2009-06-14 07:57:25.000000000 -0600
 +++ gpsdrive-2.10pre7/src/gpsdrive_config.c	2009-06-22 22:22:10.000000000 -0600
-@@ -884,7 +884,7 @@
+@@ -889,7 +889,7 @@ config_init ()
  	g_snprintf(local_config.mapnik_input_path, sizeof(local_config.mapnik_input_path),
- 		"%s", "/usr/lib/mapnik/0.5/input/");
+ 		"%s", "/usr/lib/mapnik/0.7/input/");
  	g_snprintf(local_config.mapnik_font_path, sizeof(local_config.mapnik_font_path),
 -		"%s", "/usr/share/fonts/truetype/ttf-dejavu/");
 +		"%s", "/usr/share/fonts/dejavu/");
diff --git a/gpsdrive-2.11-add-gdk-pixbuf2.patch b/gpsdrive-2.11-add-gdk-pixbuf2.patch
new file mode 100644
index 0000000..6f4befd
--- /dev/null
+++ b/gpsdrive-2.11-add-gdk-pixbuf2.patch
@@ -0,0 +1,31 @@
+--- gpsdrive-2.11/cmake/Modules/FindGTK2.cmake.gdk-pixbuf2	2010-07-28 18:21:37.000000000 +0100
++++ gpsdrive-2.11/cmake/Modules/FindGTK2.cmake	2010-07-28 18:23:09.000000000 +0100
+@@ -192,6 +192,20 @@
+     )
+     #MESSAGE(STATUS "DEBUG: GTK2_ATK_INCLUDE_PATH = ${GTK2_ATK_INCLUDE_PATH}")
+ 
++    if (${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} EQUAL 4)
++      pkgconfig(gdk-pixbuf-2.0 _GDKPIXBUF2_INCLUDEDIR _GDKPIXBUF2inkDir _GDKPIXBUF2_LDFLAGS _GDKPIXBUF2_CFLAGS)
++    else (${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} EQUAL 4)
++      if (PKG_CONFIG_FOUND)
++        pkg_check_modules(_GDKPIXBUF2 gdk-pixbuf-2.0)
++      endif (PKG_CONFIG_FOUND)
++    endif (${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} EQUAL 4)
++
++    FIND_PATH(GTK2_GDKPIXBUF2_INCLUDE_PATH gdk-pixbuf/gdk-pixbuf.h
++      ${_GDKPIXBUF2_INCLUDEDIR} /usr/include/gdk-pixbuf-2.0 /usr/include/gtk-2.0
++    )
++
++    #MESSAGE(STATUS "DEBUG:GTK2_GDKPIXBUF2_INCLUDE_PATH = ${GTK2_GDKPIXBUF2_INCLUDE_PATH}")
++
+     FIND_LIBRARY(GTK2_GTKGL_LIBRARY
+       NAMES
+         gtkgl
+@@ -329,6 +343,7 @@
+                       ${GTK2_GLIB_INCLUDE_PATH}
+                       ${GTK2_PANGO_INCLUDE_PATH}
+                       ${GTK2_GDKCONFIG_INCLUDE_PATH}
++                      ${GTK2_GDKPIXBUF2_INCLUDE_PATH}
+                       ${GTK2_ATK_INCLUDE_PATH}
+                       ${GTK2_CAIRO_INCLUDE_PATH}
+                     )
diff --git a/gpsdrive.spec b/gpsdrive.spec
index e4e33a7..810b474 100644
--- a/gpsdrive.spec
+++ b/gpsdrive.spec
@@ -1,7 +1,7 @@
 Summary: A GPS based navigation tool 
 Name: gpsdrive
-Version: 2.10
-Release: 0.9.20100508svn%{?dist}
+Version: 2.11
+Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/Productivity
 URL: http://www.gpsdrive.de/index.shtml
@@ -10,12 +10,13 @@ URL: http://www.gpsdrive.de/index.shtml
 # tar cvzpf gpsdrive-2.10-datesvn.tar.gz gpsdrive-2.10-datesvn
 #Source: http://www.gpsdrive.de/packages/gpsdrive-2.10-20090607svn.tar.gz
 #Source0: http://www.gpsdrive.de/packages/gpsdrive-2.10pre7.tar.gz
-Source0: gpsdrive-2.10-20100508.tar.gz
+Source0: http://www.gpsdrive.de/packages/%{name}-%{version}.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-usepc.patch
 Patch3: gpsdrive-2.10-newgps.patch
 Patch4: gpsdrive-2.10-fix-dso-linking.patch
+Patch5: gpsdrive-2.11-add-gdk-pixbuf2.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: gtk2-devel >= 2.0.6
@@ -57,16 +58,17 @@ bearing, arrival time, actual position, and target position.
 Speech output is also available. MySQL is supported.
 
 %prep
-%setup -q -n gpsdrive-2.10-20100508
-%setup -q -a 1 -T -D -n gpsdrive-2.10-20100508
+%setup -q
+%setup -q -a 1 -T -D
 
 %patch1 -p1
 %patch2 -p1 -b .usepc
 %patch3 -p1 -b .newgps
 %patch4 -p1 -b .fix-dso-linking
+%patch5 -p1 -b .gdk-pixbuf2
 
 %build
-#mkdir build
+mkdir build
 export Boost_LIBRARYDIR=%{_libdir}
 cd build
 %cmake ..
@@ -120,6 +122,10 @@ rm -rf $RPM_BUILD_ROOT
 %{perl_vendorlib}/*
 
 %changelog
+* Wed Jul 28 2010 Hicham HAOUARI <hicham.haouari at gmail.com> - 2.11-1
+- Update to 2.11
+- Add patch to add gdk-pixbuf2 to include path (gpsdrive-2.11-add-gdk-pixbuf2.patch)
+
 * Tue Jun 01 2010 Marcela Maslanova <mmaslano at redhat.com> - 2.10-0.9.20100508svn
 - Mass rebuild with perl-5.12.0
 
diff --git a/sources b/sources
index 10744d3..ac7e1ff 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-c387dad379a587cf1d8866b34c32dc17  gpsdrive-2.10-20100508.tar.gz
+6eeeca8e5c647115bea836d1f8fb6e0c  gpsdrive-2.11.tar.gz
 f369ecdbb73d4ff5ae10da6fd2ee5f5e  openstreetmap-map-icons-minimal.tar.gz

More information about the scm-commits mailing list