From af1a953412bc18c22b4463b15e66fe4f9c378c241b9e1eb766d2a64423495a10 Mon Sep 17 00:00:00 2001
From: OBS User unknown <null@suse.de>
Date: Thu, 23 Oct 2008 15:08:07 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/openSUSE:Factory/gpsd?expand=0&rev=5

---
 gpsd.changes   |  6 ++++++
 gpsd.spec      | 16 +++++++++++++---
 sysconfig.gpsd |  9 +++++++++
 udev.gpsd      |  4 ++++
 4 files changed, 32 insertions(+), 3 deletions(-)

diff --git a/gpsd.changes b/gpsd.changes
index ddf206c..d3f2675 100644
--- a/gpsd.changes
+++ b/gpsd.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Oct 23 15:06:28 CEST 2008 - jreuter@suse.de
+
+- Disable start of gpsd by udev rule by default and add sysconfig
+  variable to enable it if desired (bnc#432420)
+
 -------------------------------------------------------------------
 Thu Apr 24 13:24:50 CEST 2008 - jreuter@suse.de
 
diff --git a/gpsd.spec b/gpsd.spec
index d5e18f5..fdd77da 100644
--- a/gpsd.spec
+++ b/gpsd.spec
@@ -2,9 +2,16 @@
 # spec file for package gpsd (Version 2.37)
 #
 # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
-# This file and all modifications and additions to the pristine
-# package are under the same license as the package itself.
 #
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
@@ -17,7 +24,7 @@ License:        BSD 3-Clause
 Url:            http://gpsd.berlios.de/
 Group:          Hardware/Other
 Version:        2.37
-Release:        10
+Release:        68
 Requires:       udev
 PreReq:         coreutils %fillup_prereq
 BuildRequires:  gcc-c++ ncurses-devel openmotif openmotif-devel python-devel udev update-desktop-files xmlto
@@ -236,6 +243,9 @@ rm -rf %{buildroot}
 %{_datadir}/pixmaps/*.xpm
 
 %changelog
+* Thu Oct 23 2008 jreuter@suse.de
+- Disable start of gpsd by udev rule by default and add sysconfig
+  variable to enable it if desired (bnc#432420)
 * Thu Apr 24 2008 jreuter@suse.de
 - Fix RPM group tag for devel package
 - Cleanup spec file
diff --git a/sysconfig.gpsd b/sysconfig.gpsd
index 5ee9ac8..934d550 100644
--- a/sysconfig.gpsd
+++ b/sysconfig.gpsd
@@ -1,9 +1,18 @@
 ## Path:	Hardware/GPS
 ## Description:	GPS Daemon
 
+## Description: TCP port number for gpsd to listen on
 ## Type:	integer
 ## Default:     2947
 #
 # Use another port for the deamon
 #
 PORT=
+
+## Description: Start gpsd by udev
+## Type:	yesno
+## Default:     no
+#
+# Whether or not to start gpsd automatically on plugin event
+#
+STARTBYUDEV="no"
diff --git a/udev.gpsd b/udev.gpsd
index b2b401b..5348ec3 100644
--- a/udev.gpsd
+++ b/udev.gpsd
@@ -30,6 +30,10 @@ case "$DEVPATH" in
 
     . /etc/sysconfig/gpsd
 
+    if [ "$STARTBYUDEV" != "yes" ]; then
+	exit 1
+    fi
+
     if [ -n "$PORT" ]; then
       options="$options -S $PORT"
     else