Enable the RPM to build again. Also, some minor documentation tweaks.

5 files changed, 20 insertions, 10 deletions

diff --git a/Makefile.am b/Makefile.am
index 51df9df2..cdd807cc 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -14,7 +14,7 @@ XMLTO = xmlto
 if HAVE_DBUS
 INCLUDES = $(DBUS_CFLAGS) $(DBUS_GLIB_CFLAGS) -DDBUS_API_SUBJECT_TO_CHANGE=1
 DBUSPROGS = gpxlogger
-DBUSPAGES = gpxlogger.1
+DBUSPAGES = gpxlogger.1 
 gpxlogger_LDADD = $(DBUS_GLIB_LIBS)
 endif
 
@@ -164,6 +164,7 @@ man_MANS = \
 	gpsfake.1 \
 	sirfmon.1 \
 	$(DBUSPAGES) \
+	cgpxlogger.1 \
 	$(RTCM104PAGES) \
 	gpspipe.1 \
 	gpsflash.1 \
@@ -197,6 +198,9 @@ sirfmon.1: sirfmon.xml
 gpxlogger.1: gpxlogger.xml
 	-$(XMLTO) man gpxlogger.xml
 
+cgpxlogger.1: cgpxlogger.xml
+	-$(XMLTO) man cgpxlogger.xml
+
 gpspipe.1: gpspipe.xml
 	-$(XMLTO) man gpspipe.xml
 
@@ -232,6 +236,7 @@ EXTRA_DIST = \
 	gpsfake.xml \
 	sirfmon.xml \
 	gpxlogger.xml \
+	cgpxlogger.xml \
 	gpspipe.xml \
 	rtcmdecode.xml \
 	rtcm-104.xml \
diff --git a/evermore.c b/evermore.c
index c4f38b35..931cc468 100644
--- a/evermore.c
+++ b/evermore.c
@@ -79,8 +79,7 @@
  * with 1s period:
  * 10 02 12 8E 7F 01 01 01 01 01 01 01 01 00 00 00 00 00 00 15 10 03
  * 
- *
- * There is a way to probe for EverMore chipset. When binary message 0x81 is sent:
+ * There is a way to probe for this chipset. When binary message 0x81 is sent:
  * 10 02 04 81 13 94 10 03
  *
  * EverMore will reply with message like this:
@@ -88,13 +87,12 @@
  * bytes marked with * are fixed
  * Message in reply is information about logging configuration of GPS
  *
- * Other way to probe for EverMore chipset is to send one of messages 
- * 0x85, 0x8d, 0x8e or 0x8f and check for reply.
- * Reply message from EverMore GPS looks like this:
+ * Another way to detect the EverMore chipset is to send one of the messages 
+ * 0x85, 0x8d, 0x8e or 0x8f and check for a reply.
+ * The reply message from an EverMore GPS will look like this:
  * *10 *02 *04 *38 8d c5 *10 *03
  * 8d indicates that message 0x8d was sent;
- * c5 is EverMore checksum
- * other bytes are fixed
+ * c5 is EverMore checksum, other bytes are fixed
  *
  */
 
diff --git a/gpsd.spec.in b/gpsd.spec.in
index d5be7e27..ce212d27 100644
--- a/gpsd.spec.in
+++ b/gpsd.spec.in
@@ -141,7 +141,7 @@ cp gps.py gpsfake.py "$RPM_BUILD_ROOT"%{_libdir}/python${PYVERSION}/site-package
 %{_libdir}/X11/app-defaults/xgpsspeed
 
 %changelog
-* Thu Dec 22 2005 Eric S. Raymond <esr@snark.thyrsus.com> - 2.31-1
+* Fri Feb 17 2006 Eric S. Raymond <esr@snark.thyrsus.com> - 2.31-1
 - Now builds and runs under Cygwin.  Correct the speed units in synthetic 
   NMEA.  Slightly better time handling under NMEA.  Daemon now builds with
   all but NMEA disabled.  Update the leap-second offset.  Fix bad unit 
diff --git a/www/gps-hacking.html b/www/gps-hacking.html
index ebc7d5a2..c4ddb783 100644
--- a/www/gps-hacking.html
+++ b/www/gps-hacking.html
@@ -75,7 +75,7 @@ href="http://rhp.detmich.com/gps.html">simulation</a>
 of GPS satellite orbits. (Also includes GLONASS, the Russian military 
 equivalent of GPS.)  You can also look at 
 <a href='http://www.tsgc.utexas.edu/images/spacecraft/gps/'>pictures</a> 
-of GPS satellites and the control systm.</p>
+of GPS satellites and the control system.</p>
 
 <p>Each satellite broadcasts identification pulses, each one including
 the clock time it was sent. A GPS receiver, picking up one of these
diff --git a/www/index.html.in b/www/index.html.in
index f4c38eda..2195fe62 100644
--- a/www/index.html.in
+++ b/www/index.html.in
@@ -167,6 +167,9 @@ and fix latency.</dd>
 <dt><a href="gpxlogger.html">gpxlogger.1</a></dt>
 <dd>Demonstration DBUS client; writes log files in an XML format.</dd>
 
+<dt><a href="cgpxlogger.html">cgpxlogger.1</a></dt>
+<dd>Captures fixes from a gpsd instance and emits them in XML format.</dd>
+
 <dt><a href="gpspipe.html">gpspipe.1</a></dt> <dd>A simple client that
 captures GPS output and/or <code>gpsd</code> reports and sends it to
 standard output.</dd>
@@ -221,6 +224,10 @@ script</a>.</p>
 
 <p><code>gpsd</code> is carried in the OpenBSD ports tree.</p>
 
+<p>There's a <a
+href='http://twiki.davisnetworks.com/bin/view/Main/GpsApplications'>Wiki
+page</a> devoted to gpsd helper applications.</p>
+
 <p>The penguin-with-satellites logo is a hacked version of one I found
 <a
 href='http://www.gfz-potsdam.de/pb1/staff/gbeyerle/opengps/'>here</a>.