diff --git a/gpsd-2.92.tar.bz2 b/gpsd-2.92.tar.bz2 deleted file mode 100644 index 5c30c41..0000000 --- a/gpsd-2.92.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4088273f648805a8a2e1dd8b9e2e424b04fb50ee58f433dda3efd1488bcf2054 -size 1076298 diff --git a/gpsd-2.95.tar.bz2 b/gpsd-2.95.tar.bz2 new file mode 100644 index 0000000..82473c8 --- /dev/null +++ b/gpsd-2.95.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:eca18a390cfda975c45400e72b4ad25d9c7bea433d3ec64eb4eb769f8c97d0a8 +size 1149090 diff --git a/gpsd-fix-python-install.patch b/gpsd-fix-python-install.patch deleted file mode 100644 index 50adf53..0000000 --- a/gpsd-fix-python-install.patch +++ /dev/null @@ -1,26 +0,0 @@ -Index: gpsd-2.92/Makefile.am -=================================================================== ---- gpsd-2.92.orig/Makefile.am -+++ gpsd-2.92/Makefile.am -@@ -262,7 +262,7 @@ clean-local: - - # Install Python modules - install-exec-local: -- $(PYTHON) setup.py install --prefix=${prefix} # --root=$(DESTDIR) -+ $(PYTHON) setup.py install --prefix=${prefix} --root=$(DESTDIR) - endif - - if LIBGPSMM_ENABLE -Index: gpsd-2.92/Makefile.in -=================================================================== ---- gpsd-2.92.orig/Makefile.in -+++ gpsd-2.92/Makefile.in -@@ -1971,7 +1971,7 @@ maskdump.c: gpsd.h-tail maskaudit.py - - # Install Python modules - @HAVE_PYTHON_TRUE@install-exec-local: --@HAVE_PYTHON_TRUE@ $(PYTHON) setup.py install --prefix=${prefix} # --root=$(DESTDIR) -+@HAVE_PYTHON_TRUE@ $(PYTHON) setup.py install --prefix=${prefix} --root=$(DESTDIR) - - @HAVE_XSLT_PROCESSOR_TRUE@.xml.1: - @HAVE_XSLT_PROCESSOR_TRUE@ $(MANGENERATOR) $(MANFLAGS) $(MANTARGET) $< diff --git a/gpsd-fix-shebang.patch b/gpsd-fix-shebang.patch new file mode 100644 index 0000000..772a546 --- /dev/null +++ b/gpsd-fix-shebang.patch @@ -0,0 +1,9 @@ +diff -Nur gpsd-2.95.orig/gps/gps.py gpsd-2.95/gps/gps.py +--- gpsd-2.95.orig/gps/gps.py 2010-06-09 00:44:50.000000000 +0200 ++++ gpsd-2.95/gps/gps.py 2010-10-26 14:27:50.000000000 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/python + # -*- coding: utf-8 -*- + # + # This file is Copyright (c) 2010 by the GPSD project diff --git a/gpsd.changes b/gpsd.changes index ec21ba1..7f5c2bf 100644 --- a/gpsd.changes +++ b/gpsd.changes @@ -1,3 +1,49 @@ +------------------------------------------------------------------- +Tue Oct 26 13:20:00 UTC 2010 - jreuter@novell.com + +- Move udev rules from /etc/udev/rules.d to /lib/udev/rules.d +- Update to version 2.95: + + Rationalize clearing and generation of DOPs + + cgps now displays epx/epy rather than eph + + Speed is now always reported if our last two fixes were good + + Reading packets from UDP datagrams by specifying a listening + address and port is now supported + + AIS code now interprets message type 6 and 8 application IDs + correctly as a Designated Area Code and Functional ID pair + + gpspipe has a new -T option for setting the timestamp format + + xgpsspeed is completely rewritten in Python + + Qt bindings for the client library + + gpsdcode now uses | as a field separator in -c mode, as string + fields can contain commas + + Corrected error for reporting of AIS rate-of-turn fields +- Changes of version 2.94: + + Error-checking in the 50bps subframe code has been greatly + improved + + The Garmin GPS driver can now use libusb for device discovery + + The libgps library has been split apart; the service functions + used by the daemon now live in libgpsd + + Stronger checking for valid ephemeris before extracting the + leap-second offset +- Changes of version 2.93: + + Support for JSON dumping and parsing of AIS message types 25 and 26 + + Removing non-streaming mode from the Python exerciser + + Unsetting the appropriate in-use flag in the device array + + Change the libgps default from old protocol to JSON + + Add a close() method to the C++ binding + + Try to recover better from sporadic cases of false matches to + Trimble packet format from a SiRF binary datastream + + gps_poll() now returns -1 with errno not set when the gpsd + socket closes + + TPV now refrains from reporting fields the fix quality won't support + + gpsmon option for listing device types is now -L to -l can be used + to enable logging + + Documentation updates + + New POLL command brings back polling-mode operation + + gpsd no longer eats CPU when a device is unexpectedly uplugged + + Support for the TNT revolution is back (run mode only) + + There is now a gpsdfake diagnostic tool that fakes being gpsd shipping + arbitrary specified data to clients. + ------------------------------------------------------------------- Sat Mar 27 02:43:46 CET 2010 - vuntz@opensuse.org diff --git a/gpsd.spec b/gpsd.spec index d19865e..f231120 100644 --- a/gpsd.spec +++ b/gpsd.spec @@ -23,7 +23,7 @@ Summary: Service daemon for mediating access to a GPS License: BSD3c(or similar) Url: http://gpsd.berlios.de/ Group: Hardware/Other -Version: 2.92 +Version: 2.95 Release: 1 %define libgps libgps19 Requires: udev @@ -40,9 +40,9 @@ Source3: sysconfig.gpsd Source4: gpsd.xpm Source5: xgps.desktop Source6: xgpsspeed.desktop -# PATCH-FIX-UPSTREAM gpsd-fix-python-install.patch vuntz@opensuse.org -- Pass DESTDIR to setup.py (not sent upstream yet) -Patch0: gpsd-fix-python-install.patch +Patch0: gpsd-fix-shebang.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build +%debug_package %if 0%{?suse_version} > 1110 %else %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")} @@ -200,16 +200,17 @@ Authors: %install %makeinstall install -d -m 755 %{buildroot}/lib/udev -install -d -m 755 %{buildroot}/etc/udev/rules.d +install -d -m 755 %{buildroot}/lib/udev/rules.d install -d -m 755 %{buildroot}/var/adm/fillup-templates install -d -m 755 %{buildroot}%{_datadir}/{applications,pixmaps} -install -m 644 %{SOURCE1} %{buildroot}/etc/udev/rules.d/51-gpsd.rules +install -m 644 %{SOURCE1} %{buildroot}/lib/udev/rules.d/51-gpsd.rules install -m 755 %{SOURCE2} %{buildroot}/lib/udev/gpsd.sh install -m 644 %{SOURCE3} %{buildroot}/var/adm/fillup-templates -# remove /usr/bin/env call -sed -i "s|/usr/bin/env python|/usr/bin/python|g" %{buildroot}%{python_sitearch}/gps/gps.py -# remove .la files -rm -f %{buildroot}%{_libdir}/libgps.la +rm -f %{buildroot}%{_libdir}/libgps.la %{buildroot}%{_libdir}/libgpsd.la +if [ -f %{buildroot}%{python_sitearch}/*.egg-info ] ; then + rm -f %{buildroot}%{python_sitearch}/*.egg-info +fi +chmod 755 %{buildroot}%{python_sitearch}/gps/gps.py # install desktop entries install -m 644 %{SOURCE4} %{buildroot}%{_datadir}/pixmaps/%{name}.xpm install -m 644 %{SOURCE5} %{buildroot}%{_datadir}/applications/ @@ -237,7 +238,7 @@ rm -rf %{buildroot} %{_mandir}/man?/gpsd.* %{_mandir}/man?/gpsctl.* /lib/udev/gpsd.sh -%config(noreplace) /etc/udev/rules.d/* +/lib/udev/rules.d/* %{_sbindir}/gpsd %{_bindir}/gpsctl /var/adm/fillup-templates/sysconfig.gpsd @@ -245,6 +246,7 @@ rm -rf %{buildroot} %files -n %libgps %defattr(-,root,root) %{_libdir}/libgps.so.* +%{_libdir}/libgpsd.so.* %files devel %defattr(-,root,root) @@ -264,13 +266,13 @@ rm -rf %{buildroot} %{_includedir}/libgpsmm.h %{_includedir}/gpsd.h %{_libdir}/libgps.so +%{_libdir}/libgpsd.so %{_libdir}/pkgconfig/libgps*.pc %files -n python-gpsd %defattr(-,root,root) %{python_sitelib}/gps*.py* %{python_sitearch}/gps/ -%{python_sitearch}/gpsd-*.egg-info %files clients %defattr(-,root,root)