rpms/gpsdrive/F-7 gpsdrive-2.09-gps-mysql.patch, NONE, 1.1 gpsdrive.spec, 1.2, 1.3

[Kevin Fenzi (kevin)]

Author: kevin

Update of /cvs/extras/rpms/gpsdrive/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22229

Modified Files:
	gpsdrive.spec 
Added Files:
	gpsdrive-2.09-gps-mysql.patch 
Log Message:
Add patch for gpsd arguments - bug 438615
Add patch for mysql - bug 441179


gpsdrive-2.09-gps-mysql.patch:

--- NEW FILE gpsdrive-2.09-gps-mysql.patch ---
diff -Nur gpsdrive-2.09.orig/src/gpsdrive.c gpsdrive-2.09/src/gpsdrive.c
--- gpsdrive-2.09.orig/src/gpsdrive.c	2004-03-03 13:46:47.000000000 -0700
+++ gpsdrive-2.09/src/gpsdrive.c	2008-04-08 20:14:57.000000000 -0600
@@ -2305,10 +2305,10 @@
     {
       g_snprintf (s2, sizeof (s2), "%d", t[serialspeed]);
       if (usedgps)
-	g_snprintf (s, sizeof (s), "gpsd -p %s -c -d %s -s %s -r %s",
-		    serialdev, dgpsserver, s2, dgpsport);
+	g_snprintf (s, sizeof (s), "/usr/sbin/gpsd %s dgpsip://%s:%s",
+		    serialdev, dgpsserver, dgpsport);
       else
-	g_snprintf (s, sizeof (s), "gpsd -p %s -s %s", serialdev, s2);
+	g_snprintf (s, sizeof (s), "/usr/sbin/gpsd %s", serialdev);
       if (earthmate)
 	g_strlcat (s, " -T e -s 9600", sizeof (s));
       system (s);
@@ -10496,7 +10496,7 @@
       if (!handle)
 	handle = dlopen ("libmysqlclient.so", RTLD_LAZY);
       if (!handle)
-	handle = dlopen ("libmysqlclient.so.10", RTLD_LAZY);
+	handle = dlopen ("libmysqlclient.so.15", RTLD_LAZY);
       if (!handle)
 	handle = dlopen ("/opt/lib/mysql/libmysqlclient.so.10", RTLD_LAZY);
       if (!handle)


Index: gpsdrive.spec
===================================================================
RCS file: /cvs/extras/rpms/gpsdrive/F-7/gpsdrive.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gpsdrive.spec	22 Aug 2007 03:38:37 -0000	1.2
+++ gpsdrive.spec	9 Apr 2008 03:30:46 -0000	1.3
@@ -1,13 +1,14 @@
 Summary: A GPS based navigation tool 
 Name: gpsdrive
 Version: 2.09
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv2+
 Group: Applications/Productivity
 URL: http://www.gpsdrive.de/index.shtml
 Source: http://www.gpsdrive.de/packages/gpsdrive-2.09.tar.gz
 Patch0: gpsdrive-disable-gcc3-test.patch
 Patch1: gpsdrive-2.09-greek.patch
+Patch3: gpsdrive-2.09-gps-mysql.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: gtk2-devel >= 2.0.6
 BuildRequires: gettext
@@ -31,6 +32,7 @@
 
 %patch0 -p1
 %patch1 -p1
+%patch3 -p1
 
 # Convert 8859 man pages to UTF-8
 for f in man/es/gpsdrive.1 man/de/gpsdrive.1 ; do
@@ -138,6 +140,10 @@
 %{_datadir}/pixmaps/gpsicon.png
 
 %changelog
+* Tue Apr 08 2008 Kevin Fenzi <kevin at tummy.com> - 2.09-5
+- Add patch for gpsd arguments - bug 438615
+- Add patch for mysql - bug 441179
+
 * Tue Aug 21 2007 Kevin Fenzi <kevin at tummy.com> - 2.09-4
 - Update License tag.