rpms/gpsd/devel gpsd.init,1.1,1.2 gpsd.spec,1.31,1.32

[Marek Mahut]

Author: mmahut

Update of /cvs/pkgs/rpms/gpsd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23416

Modified Files:
	gpsd.init gpsd.spec 
Log Message:
RHBZ#505588: gpsd has a broken initscript that fails to launch daemon



Index: gpsd.init
===================================================================
RCS file: /cvs/pkgs/rpms/gpsd/devel/gpsd.init,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- gpsd.init	16 Mar 2009 13:54:41 -0000	1.1
+++ gpsd.init	18 Aug 2009 14:24:01 -0000	1.2
@@ -29,20 +29,20 @@
 # Source function library.
 . /etc/rc.d/init.d/functions
 
-exec="/usr/bin/gpsd"
+exec="/usr/sbin/gpsd"
 prog=$(basename $exec)
 PIDFILE=/var/run/gpsd.pid
 CONTROL_SOCKET=/var/run/gpsd.sock
 
 [ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog
-OPTIONS="-n"
-DEVICE="/dev/ttyUSB0"
+: ${OPTIONS:=-n}
+: ${DEVICE:=/dev/ttyUSB0}
 
 lockfile=/var/lock/subsys/$prog
 
 start() {
     echo -n $"Starting $prog: "
-    daemon $exec -p $PIDFILE -F $CONTROL_SOCKET $OPTIONS $DEVICE
+    daemon $exec -P $PIDFILE -F $CONTROL_SOCKET $OPTIONS $DEVICE
     retval=$?
     echo
     [ $retval -eq 0 ] && touch $lockfile


Index: gpsd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gpsd/devel/gpsd.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- gpsd.spec	25 Jul 2009 01:20:42 -0000	1.31
+++ gpsd.spec	18 Aug 2009 14:24:01 -0000	1.32
@@ -2,7 +2,7 @@
 
 Name: gpsd
 Version: 2.39
-Release: 4%{?dist}
+Release: 5%{?dist}
 Summary: Service daemon for mediating access to a GPS
 
 Group: System Environment/Daemons
@@ -229,6 +229,9 @@ fi
 
 
 %changelog
+* Wed Aug 12 2009 Marek Mahut <mmahut at fedoraproject.org> - 2.39-5
+- RHBZ#505588: gpsd has a broken initscript that fails to launch daemon
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.39-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild