From d170f95df24c38be330b4e3f166589ee52505822 Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson@gmail.com>
Date: Mar 02 2015 18:36:54 +0000
Subject: v1.2.0


---

diff --git a/.gitignore b/.gitignore
index 06ff24d..c4dddf2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /foxtrotgps-1.1.1.tar.xz
+/foxtrotgps-1.2.0.tar.xz
diff --git a/foxtrotgps.spec b/foxtrotgps.spec
index 7171cb0..3821211 100644
--- a/foxtrotgps.spec
+++ b/foxtrotgps.spec
@@ -1,6 +1,6 @@
 Name:          foxtrotgps
-Version:       1.1.1
-Release:       9%{?dist}
+Version:       1.2.0
+Release:       1%{?dist}
 Summary:       GTK+ mapping and GPS application
 Group:         Applications/Productivity
 License:       GPLv2
@@ -23,11 +23,6 @@ BuildRequires: gpsd-devel
 
 Requires: gpsd
 
-# foxtrotgps is a fork of tangogps which was previously packaged for Fedora.
-# tangogps is dead since 2012, therefore we include foxtrotgps into Fedora
-# and obsolete tangogps.
-Obsoletes: tangogps
-
 # The following two package are only needed, if someone wants
 # to geotag photos, which is an optional functionality. We 
 # decided to include them, because then all functionality is
@@ -61,8 +56,10 @@ make %{?_smp_mflags}
 %install
 make install DESTDIR=%{buildroot}
 
+sed -i 's/Lieu/Lieu;/' %{buildroot}/usr/share/applications/foxtrotgps.desktop
 desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop
 rm -rf %{buildroot}/usr/share/doc/%{name}/
+rm -rf %{buildroot}/usr/share/info/dir
 mv %{buildroot}%{_sysconfdir}/gconf/schemas/apps_foxtrotgps.schemas %{buildroot}%{_sysconfdir}/gconf/schemas/%{name}.schemas
 
 %find_lang %{name}
@@ -77,12 +74,15 @@ mv %{buildroot}%{_sysconfdir}/gconf/schemas/apps_foxtrotgps.schemas %{buildroot}
 %gconf_schema_remove %{name}
 
 %files -f %{name}.lang
-%doc COPYING AUTHORS ChangeLog HACKING NEWS README
+%{!?_licensedir:%global license %%doc}
+%license COPYING
+%doc AUTHORS HACKING NEWS
 %doc contrib/README.osb2foxtrot
 
 %{_bindir}/foxtrotgps
 %{_bindir}/convert2gpx
 %{_bindir}/convert2osm
+%{_bindir}/gpx2osm
 %{_bindir}/poi2osm
 %{_bindir}/osb2foxtrot
 %{_bindir}/georss2foxtrotgps-poi
@@ -90,11 +90,15 @@ mv %{buildroot}%{_sysconfdir}/gconf/schemas/apps_foxtrotgps.schemas %{buildroot}
 %{_datadir}/pixmaps/foxtrotgps.png
 %{_datadir}/pixmaps/foxtrotgps-*.png
 %{_mandir}/man?/*
-
+%{_infodir}/foxtrotgps.info.gz
 %{_sysconfdir}/gconf/schemas/%{name}.schemas
 %{_datadir}/%{name}
 
 %changelog
+* Mon Mar  2 2015 Peter Robinson <pbrobinson@fedoraproject.org> 1.2.0-1
+- Update to 1.2.0 (rhbz 1157448)
+- Use %%licenese
+
 * Sat Aug 16 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1.1-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
 
diff --git a/sources b/sources
index 68815f6..5dd3a79 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9c4fe0e145d44acaecea9f382cd90ce5  foxtrotgps-1.1.1.tar.xz
+9990cd0ecc257b80f77b911a985f2037  foxtrotgps-1.2.0.tar.xz