corsepiu pushed to gpsdrive (master). "Reflect libgps API-changes (FTFBS RHBZ #1202688). (..more)"

[notifications at fedoraproject.org]

>From bc502750d0fa78c39c0847644adf3b5db1e5c3dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ralf=20Cors=C3=A9pius?= <corsepiu at fedoraproject.org>
Date: Sat, 4 Apr 2015 07:48:41 +0200
Subject: Reflect libgps API-changes (FTFBS RHBZ #1202688).

  Add gpsdrive-2.11-libgps6.patch.

diff --git a/gpsdrive-2.11-libgps6.patch b/gpsdrive-2.11-libgps6.patch
new file mode 100644
index 0000000..2fbf298
--- /dev/null
+++ b/gpsdrive-2.11-libgps6.patch
@@ -0,0 +1,22 @@
+--- gpsdrive-2.11.orig/src/gps_handler.c	2015-03-18 19:32:52.740956266 +0100
++++ gpsdrive-2.11/src/gps_handler.c	2015-03-19 03:46:53.978763761 +0100
+@@ -405,11 +405,19 @@
+ 		for (i=0;i<data->satellites_visible;i++)
+ #endif
+ 		{
++#if (GPSD_API_MAJOR_VERSION >= 6)
++			gps_sats[i].used = data->skyview[i].used;
++			gps_sats[i].prn = data->skyview[i].PRN;
++			gps_sats[i].elevation = data->skyview[i].elevation;
++			gps_sats[i].azimuth = data->skyview[i].azimuth;
++			gps_sats[i].snr = data->skyview[i].ss;
++#else
+ 			gps_sats[i].used = data->used[i];
+ 			gps_sats[i].prn = data->PRN[i];
+ 			gps_sats[i].elevation = data->elevation[i];
+ 			gps_sats[i].azimuth = data->azimuth[i];
+ 			gps_sats[i].snr = data->ss[i];
++#endif
+ 		}
+ 	}
+ 
diff --git a/gpsdrive.spec b/gpsdrive.spec
index 032d97d..d2175e2 100644
--- a/gpsdrive.spec
+++ b/gpsdrive.spec
@@ -1,7 +1,7 @@
 Summary: A GPS based navigation tool 
 Name: gpsdrive
 Version: 2.11
-Release: 26%{?dist}
+Release: 27%{?dist}
 License: GPLv2+
 Group: Applications/Productivity
 URL: http://www.gpsdrive.de/index.shtml
@@ -20,6 +20,7 @@ Patch8: gpsdrive-2.11-gpsd-2.96.patch
 Patch9: gpsdrive-2.11-fix-lm-dso.patch
 Patch10: gpsdrive-speechd.patch
 Patch11: gpsdrive-2.11-freetype-cmake.patch
+Patch12: gpsdrive-2.11-libgps6.patch
 
 BuildRequires: gtk2-devel >= 2.0.6
 BuildRequires: gettext intltool
@@ -71,6 +72,7 @@ Speech output is also available. MySQL is supported.
 %patch9 -p1 -b .lm-dso
 %patch10 -p1 -b .gpsdrive
 %patch11 -p1 -b .freetype-cmake
+%patch12 -p1
 
 %build
 mkdir build
@@ -121,6 +123,10 @@ desktop-file-validate                            \
 %{perl_vendorlib}/*
 
 %changelog
+* Sat Apr 04 2015 Ralf Corsépius <corsepiu at fedoraproject.org> - 2.11-27
+- Reflect libgps API-changes (FTFBS RHBZ #1202688).
+  Add gpsdrive-2.11-libgps6.patch.
+
 * Mon Jan 26 2015 Petr Machata <pmachata at redhat.com> - 2.11-26
 - Rebuild for boost 1.57.0
 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/gpsdrive.git/commit/?h=master&id=bc502750d0fa78c39c0847644adf3b5db1e5c3dd