From 52c75d16e1e08cdf37b690998f00a776952deec4 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@fedoraproject.org>
Date: Oct 11 2010 17:56:27 +0000
Subject: fix build for gpsd-2.39 (f13)


---

diff --git a/kdeedu-4.5.2-marble_gpsd_api.patch b/kdeedu-4.5.2-marble_gpsd_api.patch
new file mode 100644
index 0000000..29f9c67
--- /dev/null
+++ b/kdeedu-4.5.2-marble_gpsd_api.patch
@@ -0,0 +1,12 @@
+diff -up kdeedu-4.5.2/marble/src/plugins/positionprovider/gpsd/GpsdPositionProviderPlugin.cpp.GPSD_API kdeedu-4.5.2/marble/src/plugins/positionprovider/gpsd/GpsdPositionProviderPlugin.cpp
+--- kdeedu-4.5.2/marble/src/plugins/positionprovider/gpsd/GpsdPositionProviderPlugin.cpp.GPSD_API	2010-09-30 16:21:44.000000000 -0500
++++ kdeedu-4.5.2/marble/src/plugins/positionprovider/gpsd/GpsdPositionProviderPlugin.cpp	2010-10-11 12:36:44.189643125 -0500
+@@ -64,7 +64,7 @@ void GpsdPositionProviderPlugin::update(
+         m_position.set( data.fix.longitude, data.fix.latitude,
+                         data.fix.altitude, GeoDataCoordinates::Degree );
+         m_accuracy.level = GeoDataAccuracy::Detailed;
+-#if defined( GPSD_API_MAJOR_VERSION ) && ( GPSD_API_MAJOR_VERSION >= 3 )
++#if defined( GPSD_API_MAJOR_VERSION ) && ( GPSD_API_MAJOR_VERSION >= 4 )
+          if ( !isnan( data.fix.epx ) && !isnan( data.fix.epy ) ) {
+              m_accuracy.horizontal = qMax( data.fix.epx, data.fix.epy );
+          }
diff --git a/kdeedu.spec b/kdeedu.spec
index 052f4f1..8084210 100644
--- a/kdeedu.spec
+++ b/kdeedu.spec
@@ -20,6 +20,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # kalzium.desktop: "chemical/x-cml" is an invalid MIME type ("chemical" is an unregistered media type)
 # http://bugzilla.redhat.com/587575 , http://bugs.kde.org/235563
 Patch50: kdeedu-4.5.2-kalzium_mimetypes.patch
+# fix build using gpsd-2.39
+Patch51: kdeedu-4.5.2-marble_gpsd_api.patch
 
 ## upstream patches
 
@@ -35,17 +37,13 @@ BuildRequires: boost-devel
 %if 0%{?fedora}
 BuildRequires: cfitsio-devel
 BuildRequires: xplanet
-# FIXME: need 0.6.2 backported to F12/F13
 BuildRequires: libindi-devel >= 0.6.1
 BuildRequires: libnova-devel
 BuildRequires: libqalculate-devel
 BuildRequires: openbabel-devel >= 2.2.0-0.4.b5
 BuildRequires: eigen2-devel >= 2.0.3
-# FIXME: build fails on fedora < 14 , worked with 4.5.1 though?  -- Rex
-%if 0%{?fedora} > 13
 BuildRequires: gpsd-devel
 %endif
-%endif
 BuildRequires: desktop-file-utils
 BuildRequires: gsl-devel
 BuildRequires: kdelibs4-devel >= %{version}
@@ -203,6 +201,7 @@ Group:   System Environment/Libraries
 %setup -q -n kdeedu-%{version}%{?alphatag}
 
 %patch50 -p1 -b .kalzium_mimetypes
+%patch51 -p1 -b .marble_gpsd_api
 
 
 %build
@@ -212,7 +211,7 @@ pushd %{_target_platform}
 popd
 
 # occasional odd build failures, not %%{?_smp_mflags} safe?  -- Rex
-make -C %{_target_platform}
+make %{?_smp_mflags} -C %{_target_platform}
 
 
 %install
@@ -589,6 +588,7 @@ rm -rf %{buildroot}
 %changelog
 * Mon Oct 11 2010 Rex Dieter <rdieter@fedoraproject.org> - 4.5.2-2
 - kalzium.desktop: drop MimeTypes=chemical/x-cml (#587575, kde#235563)
+- fix build for gpsd-2.39 (f13)
 
 * Fri Oct 01 2010 Rex Dieter <rdieter@fedoraproject.org> - 4.5.2-1
 - 4.5.2