From a40d3f4607493b2e31b394617b6e5a9130675e20 Mon Sep 17 00:00:00 2001
From: Miroslav Lichvar <mlichvar@redhat.com>
Date: Wed, 27 Feb 2013 11:33:24 +0100
Subject: [PATCH] update to 3.8
---
.gitignore | 1 +
gpsd-nolibcap.patch | 10 +++++-----
gpsd.spec | 9 +++++++--
sources | 2 +-
4 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/.gitignore b/.gitignore
index b0ca644..d4e4330 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
/gpsd-3.3.tar.gz
/gpsd-3.4.tar.gz
/gpsd-3.5.tar.gz
+/gpsd-3.8.tar.gz
diff --git a/gpsd-nolibcap.patch b/gpsd-nolibcap.patch
index 68e1b4a..7bea89e 100644
--- a/gpsd-nolibcap.patch
+++ b/gpsd-nolibcap.patch
@@ -1,7 +1,7 @@
-diff -up gpsd-3.5/SConstruct.libcap gpsd-3.5/SConstruct
---- gpsd-3.5/SConstruct.libcap 2012-04-14 15:36:18.000000000 +0200
-+++ gpsd-3.5/SConstruct 2012-04-30 10:39:45.370120340 +0200
-@@ -458,7 +458,7 @@ else:
+diff -up gpsd-3.8/SConstruct.nolibcap gpsd-3.8/SConstruct
+--- gpsd-3.8/SConstruct.nolibcap 2013-02-26 05:09:38.000000000 +0100
++++ gpsd-3.8/SConstruct 2013-02-27 11:09:11.561350794 +0100
+@@ -490,7 +490,7 @@ else:
confdefs.append("/* #undef HAVE_LIBRT */\n")
rtlibs = []
@@ -9,4 +9,4 @@ diff -up gpsd-3.5/SConstruct.libcap gpsd-3.5/SConstruct
+if False and config.CheckLib('libcap'):
confdefs.append("#define HAVE_LIBCAP 1\n")
# System library - no special flags
- rtlibs = ["-lcap"]
+ caplibs = ["-lcap"]
diff --git a/gpsd.spec b/gpsd.spec
index 29048e9..2321508 100644
--- a/gpsd.spec
+++ b/gpsd.spec
@@ -1,6 +1,6 @@
Name: gpsd
-Version: 3.5
-Release: 3%{?dist}
+Version: 3.8
+Release: 1%{?dist}
Summary: Service daemon for mediating access to a GPS
Group: System Environment/Daemons
@@ -132,6 +132,9 @@ desktop-file-install --vendor fedora \
%{__install} -d -m 0755 %{buildroot}%{_datadir}/gpsd
%{__install} -p -m 0644 packaging/X11/gpsd-logo.png %{buildroot}%{_datadir}/gpsd/gpsd-logo.png
+# Missed in scons install
+%{__install} -p -m 0755 gpsinit %{buildroot}%{_sbindir}
+
# Not needed since gpsd.h is not installed
rm %{buildroot}%{_libdir}/{libgpsd.so,pkgconfig/libgpsd.pc}
@@ -172,6 +175,7 @@ fi
%config(noreplace) %{_sysconfdir}/udev/rules.d/*
%{_sbindir}/gpsd
%{_sbindir}/gpsdctl
+%{_sbindir}/gpsinit
%{_bindir}/gpsprof
%{_bindir}/gpsmon
%{_bindir}/gpsctl
@@ -179,6 +183,7 @@ fi
/lib/udev/gpsd*
%{_mandir}/man8/gpsd.8*
%{_mandir}/man8/gpsdctl.8*
+%{_mandir}/man8/gpsinit.8*
%{_mandir}/man1/gpsprof.1*
%{_mandir}/man1/gpsmon.1*
%{_mandir}/man1/gpsctl.1*
diff --git a/sources b/sources
index 95499fe..7fb5974 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e96881798a0ab67aa3cd5f3249f0e536 gpsd-3.5.tar.gz
+1a3177b907f25c0ce6d1a0aa22597270 gpsd-3.8.tar.gz