[gpsbabel] Update to 1.4.2

[Hans Ulrich Niedermann]

commit d57f43cd8392b3cb1a7d93d47b02c8ac10c97ddb
Author: Hans Ulrich Niedermann <hun at n-dimensional.de>
Date:   Tue Jan 11 17:49:57 2011 +0100

    Update to 1.4.2
    
    Includes input from Mikhail and Volker Froehlich.

 .gitignore    |    1 +
 gpsbabel.spec |   32 +++++++++++++++++++++++---------
 sources       |    2 +-
 3 files changed, 25 insertions(+), 10 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 80f7ec0..b611aa3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 gpsbabel-1.3.6.tar.gz
+/gpsbabel-1.4.2.tar.gz
diff --git a/gpsbabel.spec b/gpsbabel.spec
index 138fd37..5f16de9 100644
--- a/gpsbabel.spec
+++ b/gpsbabel.spec
@@ -1,18 +1,28 @@
 Name:          gpsbabel
-Version:       1.4.1
-Release:       2%{?dist}
+Version:       1.4.2
+Release:       1%{?dist}
 Summary:       A tool to convert between various formats used by GPS devices
 
 Group:         Applications/Text
 License:       GPLv2+
 URL:           http://www.gpsbabel.org
-# source can be downloaded from the following URL:
-# http://www.gpsbabel.org/plan9.php?dl=%{name}-%{version}.tar.gz
+# Source can only be downloaded via HTTP POST. Run
+#
+#   curl -F "dl=gpsbabel-1.4.2.tar.gz" \
+#        -F "token=a1aad879" \
+#        http://www.gpsbabel.org/plan9.php \
+#        -o gpsbabel-1.4.2.tar.gz
+#
+# which will probably stop working again in a jiffy, so you'll better
+# point your elinks/firefox/etc at
+# http://www.gpsbabel.org/download.html and click on the linux source
+# download button.
 Source0:       %{name}-%{version}.tar.gz
 Source1:       %{name}.desktop
 Source2:       %{name}.png
 Patch0:        gpsbabel-1.3.5-autoconf.patch
-BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Patch11:       gpsbabel-1.4.2-use-system-shapelib.patch
+BuildRoot:     %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 BuildRequires: expat-devel
 BuildRequires: libusb-devel
@@ -21,6 +31,7 @@ BuildRequires: qt-devel
 BuildRequires: qt-webkit-devel
 BuildRequires: desktop-file-utils
 BuildRequires: libxslt
+BuildRequires: shapelib-devel
 
 %description
 Converts GPS waypoint, route, and track data from one format type
@@ -28,7 +39,7 @@ to another.
 
 %package gui
 Summary:        Qt GUI interface for GPSBabel
-Group:          Applications/Text
+Group:          Applications/Engineering
 License:        GPLv2+
 Requires:       %{name} = %{version}-%{release}
 
@@ -37,7 +48,9 @@ Qt GUI interface for GPSBabel
 
 %prep
 %setup -q
-%patch0 -p1
+%patch0 -p1 -b .remove-autoconf-from-Makefile
+rm -rf shapelib
+%patch11 -p1 -b .use-system-shapelib
 
 # fix bad execute perms
 %{__chmod} a-x *.c *.h
@@ -48,9 +61,10 @@ make %{?_smp_mflags}
 perl xmldoc/makedoc
 make gpsbabel.html
 
-cd gui
+pushd gui
 qmake-qt4
-make
+make %{?_smp_mflags}
+popd
 
 %install
 %{__rm} -rf %{buildroot}
diff --git a/sources b/sources
index 28c4d34..a846d84 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1571b31f8f06f722995449dbff01ca49  gpsbabel-1.3.6.tar.gz
+76ea9f7852be2e98aa18976c4697ca93  gpsbabel-1.4.2.tar.gz