Almost ready to ship 2.0.

4 files changed, 34 insertions, 21 deletions

diff --git a/INSTALL b/INSTALL
index 6a8ce6af..96c675fe 100644
--- a/INSTALL
+++ b/INSTALL
@@ -10,9 +10,9 @@ burst of bnary garbage).  If you don't see this, you may have OS-level
 problems with your serial support, but more likely have the wrong
 device.  Look again.
 
-You will need to have either Motif or LessTif installed.  If you're on a 
-Linux system, you probably already have LessTif.  Source code is 
-available from <http://www.lesstif.org/>.
+You will need to have either Motif or LessTif installed in order for
+gps and xgpsspeed to build.  If you're on a Linux system, you probably
+already have LessTif.  Source code is available from <http://www.lesstif.org/>.
 
 Run ./autogen.sh (or sh autogen.sh if the script does not have execute
 permission).  
diff --git a/TODO b/TODO
index ddbccb24..a9e72b13 100644
--- a/TODO
+++ b/TODO
@@ -1,7 +1,3 @@
-* Integrate M8 support to whatever extent needed.
-
-See <http://trans.civil.northwestern.edu/~jay/gpsd.html>.
-
 * Do the research to figure out just what the heck is going on with status bits
 
 NMEA actually has *three* kinds of validity bits.  Mode, status, and the
@@ -35,8 +31,8 @@ relationships are there?
 
 * Mine the contrib directory for good ideas
 
-This is a post-2.0 item.  There is code in there that can do some interesting
-tricks with SiRF-II chipsets.  Lonnie Mendez is working on this.
+There is code in there that can do some interesting tricks with
+SiRF-II chipsets.  Lonnie Mendez is working on this.
 
 * gpsd.py is unsatisfactory
 
@@ -45,8 +41,12 @@ Python extension built around libgps.a.
 
 * Autodetect USB GPS by scanning the USB bus, if no device is specified.
 
-This is a long-term wishlist item.  It's going to be difficult, since there
-is no GPS device class yet.  Here are some IDs:
+Integrate Lonnie Mendez's USB-discovery code to do this. Here are some IDs:
 
 BU-303          	0x067b:0x2303	This IDs itself as a serial port
 DeLorme Earthmate	0x1163:0x0100	This IDs itself as a HIDDEV.
+
+* Integrate M8 support to whatever extent needed.
+
+See <http://trans.civil.northwestern.edu/~jay/gpsd.html>.
+
diff --git a/gpsd.spec.in b/gpsd.spec.in
index 252143c0..26496966 100644
--- a/gpsd.spec.in
+++ b/gpsd.spec.in
@@ -43,7 +43,7 @@ for it to work.
 %setup -q
 
 %build
-configure --prefix=/usr
+%configure
 make %{?_smp_mflags}
 
 %install
@@ -71,6 +71,9 @@ cp gps.h "$RPM_BUILD_ROOT"%{_includedir}
 PYVERS=`python -c "import sys; print sys.version[:3]"`
 mkdir -p "$RPM_BUILD_ROOT"%{_libdir}/python${PYVERS}/site-packages
 cp gps.py gpsd.py "$RPM_BUILD_ROOT"%{_libdir}/python${PYVERS}/site-packages
+mkdir -p "$RPM_BUILD_ROOT"%{_libdir}/X11/app-defaults/
+cp gps.ad "$RPM_BUILD_ROOT"%{_libdir}/X11/app-defaults/gps
+cp xgpsspeed.ad "$RPM_BUILD_ROOT"%{_libdir}/X11/app-defaults/xgpsspeed
 
 %clean
 [ "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf "$RPM_BUILD_ROOT"
@@ -78,14 +81,12 @@ cp gps.py gpsd.py "$RPM_BUILD_ROOT"%{_libdir}/python${PYVERS}/site-packages
 %post -n gpsd
 /sbin/chkconfig --add gpsd
 /sbin/chkconfig gpsd on
+/sbin/ldconfig
 
 %preun -n gpsd
 /sbin/chkconfig --del gpsd
 
-%post -n gpsd-devel
-/sbin/ldconfig
-
-%postun -n gpsd-devel
+%postun -n gpsd
 /sbin/ldconfig
 
 %files
@@ -96,25 +97,30 @@ cp gps.py gpsd.py "$RPM_BUILD_ROOT"%{_libdir}/python${PYVERS}/site-packages
 %attr(755, root, root) %{_bindir}/gps
 %attr(755, root, root) %{_bindir}/xgpsspeed
 %attr(755, root, root) %{_bindir}/gpsprobe
+%{_libdir}/libgps.so.%{SO3VERSION}
+%{_libdir}/libgps.so.%{SO1VERSION}
 %{_mandir}/man1/gpsd.1*
 %{_mandir}/man1/gpsprobe.1*
+%{_mandir}/man3/libgps.3*
+%{_mandir}/man3/libgpsd.3*
 %attr(755, root, root) %{_sysconfdir}/init.d/gpsd
+{_libdir}/X11/app-defaults/gps
+{_libdir}/X11/app-defaults/xgpsspeed
 
 %files -n gpsd-devel
 %doc README INSTALL COPYING libgps.xml libgpsd.xml HACKING
 %{_libdir}/libgps.la
-%{_libdir}/libgps.so.%{SO3VERSION}
-%{_libdir}/libgps.so.%{SO1VERSION}
 %{_libdir}/libgps.so
-%{_mandir}/man3/libgps.3*
-%{_mandir}/man3/libgpsd.3*
 %{_includedir}/gps.h
 %{_includedir}/gpsd.h
 %{_libdir}/python*/site-packages/gps.py
 %{_libdir}/python*/site-packages/gpsd.py
 
 %changelog
-* Wed Sep  8 2004 Eric S. Raymond <esr@snark.thyrsus.com> - 1,98-1
+* Thu Sep 16 2004 Eric S. Raymond <esr@snark.thyrsus.com> - @VERSION@-1
+- Packaging fixes for 2.0 release
+
+* Wed Sep  8 2004 Eric S. Raymond <esr@snark.thyrsus.com> - 1.98-1
 - Only do one getdtablesize() call, otherwise we do several
   getrlimits() each poll cycle.  TripMate is working.  gpsprobe now
   deduces NMEA version.  Zodiac Earthmate seems to work.
diff --git a/www/hardware.html b/www/hardware.html
index 850c6384..540c3df1 100644
--- a/www/hardware.html
+++ b/www/hardware.html
@@ -141,5 +141,12 @@ U.S. reseller.</p>
 
 <p>PL2303: support is broken in late 2.4 Linux kernels but good in 2.6.8.</p>
 
+<h2>RS232 levels:</h2>
+
+<p>TTL level RS-232 uses 0v and +5v, ordinary RS-232 uses -12v to -5v
+and +5v to +12 volts for the signal (IIRC). These are not compatible,
+and attempting to combine them can zorch your GPS.  Converters do
+exist, see Google.</p>
+
 </body>
 </html>