[gpsdrive] Fix FTBFS (speechd), Cleanup spec and fix dates

[Peter Robinson]

commit d38874f05f923073e71df15d1c93ea296ff9cf6a
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Mon Aug 19 22:40:46 2013 +0100

    Fix FTBFS (speechd), Cleanup spec and fix dates

 gpsdrive-speechd.patch |   21 +++++++++++++++++++++
 gpsdrive.spec          |   20 ++++++++++----------
 2 files changed, 31 insertions(+), 10 deletions(-)
---
diff --git a/gpsdrive-speechd.patch b/gpsdrive-speechd.patch
new file mode 100644
index 0000000..fa14c8a
--- /dev/null
+++ b/gpsdrive-speechd.patch
@@ -0,0 +1,21 @@
+--- gpsdrive-2.11/cmake/Modules/FindSpeechd.cmake.orig	2013-08-19 22:25:36.921359302 +0100
++++ gpsdrive-2.11/cmake/Modules/FindSpeechd.cmake	2013-08-19 22:26:55.491330632 +0100
+@@ -23,6 +23,7 @@
+       libspeechd.h
+     PATHS
+       /usr/include
++      /usr/include/speech-dispatcher
+       /usr/local/include
+       /opt/local/include
+       /sw/include
+--- gpsdrive-2.11/src/speech.c.orig	2013-08-19 22:25:48.751505499 +0100
++++ gpsdrive-2.11/src/speech.c	2013-08-19 22:26:22.910927769 +0100
+@@ -62,7 +62,7 @@
+ 
+ 
+ 
+-#include <libspeechd.h>
++#include <speech-dispatcher/libspeechd.h>
+ #include "speech.h"
+ 
+ 
diff --git a/gpsdrive.spec b/gpsdrive.spec
index 0c09cc1..3e35b07 100644
--- a/gpsdrive.spec
+++ b/gpsdrive.spec
@@ -1,17 +1,14 @@
 Summary: A GPS based navigation tool 
 Name: gpsdrive
 Version: 2.11
-Release: 19%{?dist}
+Release: 20%{?dist}
 License: GPLv2+
 Group: Applications/Productivity
 URL: http://www.gpsdrive.de/index.shtml
-# svn snapshot generated with: 
-# svn co https://gpsdrive.svn.sourceforge.net/svnroot/gpsdrive/trunk gpsdrive-2.10-datesvn
-# 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: http://www.gpsdrive.de/packages/%{name}-%{version}.tar.gz
 Source1: http://downloads.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
@@ -21,7 +18,7 @@ Patch6: gpsdrive-2.11-set-boostfilesystemversion.patch
 Patch7: gpsdrive-2.11-remove-Switch.patch
 Patch8: gpsdrive-2.11-gpsd-2.96.patch
 Patch9: gpsdrive-2.11-fix-lm-dso.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Patch10: gpsdrive-speechd.patch
 
 BuildRequires: gtk2-devel >= 2.0.6
 BuildRequires: gettext intltool
@@ -71,6 +68,7 @@ Speech output is also available. MySQL is supported.
 %patch7 -p1 -b .removeswitch
 %patch8 -p1 -b .gpsd296
 %patch9 -p1 -b .lm-dso
+%patch10 -p1 -b .gpsdrive
 
 %build
 mkdir build
@@ -81,7 +79,6 @@ cd build
 make VERBOSE=1 %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
 cd build
 make install DESTDIR=$RPM_BUILD_ROOT
 
@@ -99,7 +96,6 @@ desktop-file-validate                            \
 %postun -p /sbin/ldconfig
 
 %files -f %{name}.lang
-%defattr (-,root,root,-)
 %doc ABOUT-NLS AUTHORS ChangeLog COPYING README Documentation/*
 %{_bindir}/friendsd
 %{_bindir}/gdal_slice.sh
@@ -123,7 +119,11 @@ desktop-file-validate                            \
 %{perl_vendorlib}/*
 
 %changelog
-* Thu Aug 16 2013 Nils Philippsen <nils at redhat.com> - 2.11-19
+* Mon Aug 19 2013 Peter Robinson <pbrobinson at fedoraproject.org> 2.11-20
+- Fix FTBFS (speechd)
+- Cleanup spec and fix dates
+
+* Fri Aug 16 2013 Nils Philippsen <nils at redhat.com> - 2.11-19
 - don't require unused (compat-)libgda-devel for building (#991891)
 
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.11-18