PR#1: Fix Geo decimal handling (RHBZ 1561337). - rpms/gpsbabel

Conrad Meyer • 5 years ago

35a4078

file added

+26

		`@@ -0,0 +1,26 @@`
		`+ From 29293f3be4eeb2f88bb9c568b22f476eae6d8a72 Mon Sep 17 00:00:00 2001`
		`+ From: Robert Lipe <robertlipe@users.noreply.github.com>`
		`+ Date: Sat, 14 Oct 2017 21:59:24 -0500`
		`+ Subject: [PATCH] Correctly read diff and terr from geo format.`
		`+`
		`+ Thank you, Rick Richardson.`
		`+ ---`
		`+ geo.cc \| 4 ++--`
		`+ 1 file changed, 2 insertions(+), 2 deletions(-)`
		`+`
		`+ diff --git a/geo.cc b/geo.cc`
		`+ index 5c785f38..e6f4560a 100644`
		`+ --- a/geo.cc`
		`+ +++ b/geo.cc`
		`+ @@ -74,9 +74,9 @@ void GeoReadLoc()`
		`+ waypt_add_url(wpt,`
		`+ reader.readElementText(), a.value("text").toString());`
		`+ } else if (current_tag == "/loc/waypoint/difficulty") {`
		`+ - wpt->gc_data->diff = reader.readElementText().toInt() * 10;`
		`+ + wpt->gc_data->diff = reader.readElementText().toDouble() * 10;`
		`+ } else if (current_tag == "/loc/waypoint/terrain") {`
		`+ - wpt->gc_data->terr = reader.readElementText().toInt() * 10;`
		`+ + wpt->gc_data->terr = reader.readElementText().toDouble() * 10;`
		`+ } else if (current_tag == "/loc/waypoint/container") {`
		`+ wpt->gc_data->container = wpt_container(reader.readElementText());`
		`+ }`

gpsbabel.spec

file modified

+9 -2

		`@@ -1,6 +1,6 @@`
		`Name: gpsbabel`
		`Version: 1.5.4`
		`- Release: 8%{?dist}`
		`+ Release: 9%{?dist}`
		`Summary: A tool to convert between various formats used by GPS devices`

		`License: GPLv2+`
		`@@ -24,6 +24,8 @@`
		`Patch6: 0006-Use-system-minizip.patch`
		`# Upstream patch`
		`Patch7: 0007-Added-geojson-read-capablity-moved-magic-strings-to-.patch`
		`+ # Upstream patch not yet in a release`
		`+ Patch8: 0008-Treat-geo-decimals-as-float.patch`

		`BuildRequires: %{__make}`
		`BuildRequires: %{__perl}`
		`@@ -55,7 +57,7 @@`
		`%if "%{?QT_GUI}"`
		`%global build_gui 1`
		`BuildRequires: qt5-%{QT_GUI}-devel`
		`- BuildRequires: /usr/bin/lrelease-qt5`
		`+ BuildRequires: qt5-linguist`
		`%endif`

		`BuildRequires: desktop-file-utils`
		`@@ -90,6 +92,7 @@`
		`%patch5 -p1`
		`%patch6 -p1`
		`%patch7 -p1`
		`+ %patch8 -p1`

		`# FIXME: RHEL7 does not have qtwebengine`
		`# Add define USE_GUI to switch between qtwebengine and qtwebkit`
		`@@ -175,6 +178,10 @@`
		`%endif`

		`%changelog`
		`+ * Wed Mar 28 2018 Conrad Meyer <cemeyer@uw.edu> - 1.5.4-9`
		`+ - Fix Geo decimal handling (RHBZ 1561337).`
		`+ - Use package name rather than a file path for qt5-linguist BR.`
		`+`
		`* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.4-8`
		`- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild`