update to 3.13
This commit is contained in:
parent
7e1b026059
commit
455abd3609
1
.gitignore
vendored
1
.gitignore
vendored
@ -9,3 +9,4 @@
|
||||
/gpsd-20140127gitf2753b.tar.gz
|
||||
/gpsd-20140524gitd6b65b.tar.gz
|
||||
/gpsd-3.11.tar.gz
|
||||
/gpsd-3.13.tar.gz
|
||||
|
@ -1,50 +0,0 @@
|
||||
From 86a8f7ecbb7040236602ffb08711ef87bcdb74f7 Mon Sep 17 00:00:00 2001
|
||||
From: Miroslav Lichvar <mlichvar@redhat.com>
|
||||
Date: Mon, 25 Aug 2014 11:52:59 +0200
|
||||
Subject: [PATCH] Update systemd files.
|
||||
|
||||
- use $OPTIONS and include /etc/sysconfig/gpsd to make it compatible
|
||||
with current Fedora packaging
|
||||
- start gpsd after chronyd service to allow connecting to SOCK
|
||||
- allow enabling gpsd as a normal service not requiring socket
|
||||
activation
|
||||
---
|
||||
systemd/gpsd.service | 5 ++++-
|
||||
systemd/gpsdctl@.service | 1 +
|
||||
2 files changed, 5 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/systemd/gpsd.service b/systemd/gpsd.service
|
||||
index ef760a1..ad4be79 100644
|
||||
--- a/systemd/gpsd.service
|
||||
+++ b/systemd/gpsd.service
|
||||
@@ -1,11 +1,14 @@
|
||||
[Unit]
|
||||
Description=GPS (Global Positioning System) Daemon
|
||||
Requires=gpsd.socket
|
||||
+# Needed with chrony SOCK refclock
|
||||
+After=chronyd.service
|
||||
|
||||
[Service]
|
||||
EnvironmentFile=-/etc/default/gpsd
|
||||
EnvironmentFile=-/etc/sysconfig/gpsd
|
||||
-ExecStart=/usr/sbin/gpsd -N $GPSD_OPTIONS $DEVICES
|
||||
+ExecStart=/usr/sbin/gpsd -N $GPSD_OPTIONS $OPTIONS $DEVICES
|
||||
|
||||
[Install]
|
||||
+WantedBy=multi-user.target
|
||||
Also=gpsd.socket
|
||||
diff --git a/systemd/gpsdctl@.service b/systemd/gpsdctl@.service
|
||||
index 58c5176..26e49a2 100644
|
||||
--- a/systemd/gpsdctl@.service
|
||||
+++ b/systemd/gpsdctl@.service
|
||||
@@ -8,6 +8,7 @@ After=dev-%i.device
|
||||
Type=oneshot
|
||||
Environment="GPSD_SOCKET=/var/run/gpsd.sock"
|
||||
EnvironmentFile=-/etc/default/gpsd
|
||||
+EnvironmentFile=-/etc/sysconfig/gpsd
|
||||
RemainAfterExit=yes
|
||||
ExecStart=/bin/sh -c "[ \"$USBAUTO\" = true ] && /usr/sbin/gpsdctl add /dev/%I || :"
|
||||
ExecStop=/bin/sh -c "[ \"$USBAUTO\" = true ] && /usr/sbin/gpsdctl remove /dev/%I || :"
|
||||
--
|
||||
1.9.3
|
||||
|
@ -1,7 +1,7 @@
|
||||
%global _hardened_build 1
|
||||
|
||||
Name: gpsd
|
||||
Version: 3.11
|
||||
Version: 3.13
|
||||
Release: 1%{?dist}
|
||||
Summary: Service daemon for mediating access to a GPS
|
||||
|
||||
@ -11,9 +11,6 @@ URL: http://catb.org/gpsd/
|
||||
Source0: http://download.savannah.gnu.org/releases/gpsd/%{name}-%{version}.tar.gz
|
||||
Source11: gpsd.sysconfig
|
||||
|
||||
# Update systemd files
|
||||
Patch1: gpsd-systemd.patch
|
||||
|
||||
BuildRequires: dbus-devel dbus-glib-devel ncurses-devel xmlto python-devel
|
||||
BuildRequires: scons desktop-file-utils bluez-libs-devel pps-tools-devel
|
||||
%ifnarch s390 s390x
|
||||
@ -74,7 +71,6 @@ can run on a serial terminal or terminal emulator.
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch1 -p1 -b .systemd
|
||||
|
||||
# set gpsd revision string to include package revision
|
||||
sed -i 's|^revision=.*REVISION.*$|revision='\'\
|
||||
@ -140,6 +136,8 @@ desktop-file-install \
|
||||
# Not needed since gpsd.h is not installed
|
||||
rm %{buildroot}%{_libdir}/{libgpsd.so,pkgconfig/libgpsd.pc}
|
||||
|
||||
rm %{buildroot}%{_mandir}/man1/ntpmon*
|
||||
|
||||
%post
|
||||
%systemd_post gpsd.service gpsd.socket
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user