diff --git a/gpsd-2.37.tar.bz2 b/gpsd-2.37.tar.bz2 new file mode 100644 index 0000000..cf8c8e9 --- /dev/null +++ b/gpsd-2.37.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4995b15af14517d27545f0a604aecf6eff32bbc37d29f7e5140975885c76f714 +size 542586 diff --git a/gpsd-undeffix.patch b/gpsd-undeffix.patch new file mode 100644 index 0000000..e5ed226 --- /dev/null +++ b/gpsd-undeffix.patch @@ -0,0 +1,28 @@ +--- libgpsd_core.c.orig 2007-12-13 15:00:33.000000000 +0000 ++++ libgpsd_core.c 2007-12-13 15:06:54.000000000 +0000 +@@ -404,7 +404,7 @@ + #define ZEROIZE(x) (isnan(x)!=0 ? 0.0 : x) + ZEROIZE(session->gpsdata.fix.speed * MPS_TO_KNOTS), + ZEROIZE(session->gpsdata.fix.track), +-#undef ZEROIZE ++/*#undef ZEROIZE*/ + tm.tm_mday, + tm.tm_mon, + tm.tm_year); +@@ -414,6 +414,7 @@ + + static void gpsd_binary_fix_dump(struct gps_device_t *session, + char bufp[], size_t len) ++ + { + gpsd_position_fix_dump(session, bufp, len); + gpsd_transit_fix_dump(session, bufp + strlen(bufp), len - strlen(bufp)); +@@ -514,7 +515,7 @@ + ZEROIZE(session->gpsdata.epe * (CEP50_SIGMA/GPSD_CONFIDENCE))); + nmea_add_checksum(bufp); + } +-#undef ZEROIZE ++/*#undef ZEROIZE*/ + } + + static void gpsd_binary_dump(struct gps_device_t *session, diff --git a/gpsd.changes b/gpsd.changes index ae8b8cc..c5e87b3 100644 --- a/gpsd.changes +++ b/gpsd.changes @@ -1,42 +1,7 @@ ------------------------------------------------------------------- -Fri Feb 12 16:03:58 UTC 2010 - jreuter@novell.com +Sun Dec 8 12:00:00 CET 2009 - opensuse@dstoecker.de -- Add missing dependency to python-curses for devel package (bnc#574584) -- Add another Cyprus GPS USB id (bnc#574584) - -------------------------------------------------------------------- -Fri Dec 18 16:22:14 UTC 2009 - seife@opensuse.org - -- fix udev warnings "SYSFS is deprecated" - -------------------------------------------------------------------- -Tue Dec 8 16:51:54 UTC 2009 - jreuter@novell.com - -- Fix libgps subpackage requirements - -------------------------------------------------------------------- -Tue Dec 8 14:13:09 UTC 2009 - jreuter@novell.com - -- Upgrade to gpsd-2.90, from the upstream change log: - - GPSD-NG, the new JSON-based command protocol, is now deployed - - Detection of end of a fix-reporting cycle is now reliable - - Abandone gpsflash subproject - - Increase major version of shared library due to significant API change - - Add new driver for Motorola Oncore receivers - - gpsfake can now accept multiple logfiles, interleaving test sentences - from each. - - gpsd now accepts error estimates from the NMEA $GPGBS sentence. - - Fix potential core dump in C client handling of "K" responses - - Introduce major and minor API version symbols into the public interfaces - - The sirfmon utility is gone, replaced by gpsmon - - Fix an old error in NMEA parsing - - cgpxlogger has been merged into gpxlogger. - - Speed-setting commands now allow parity and stop-bit setting - - tcmdecode becomes gpsdecode and can now de-armor and dump AIDVM packets - - The clientlibrary now works correctly in locales where the decimal - separator is not a period. -- Typo in sirfmon / gpsmon has been fixed silently by upstream (#bnc513037) -- Make libgps and python modules subpackages +- use new python macros ------------------------------------------------------------------- Sun Aug 9 12:43:26 CEST 2009 - coolo@novell.com diff --git a/gpsd.spec b/gpsd.spec index 5c07066..e249654 100644 --- a/gpsd.spec +++ b/gpsd.spec @@ -1,7 +1,7 @@ # -# spec file for package gpsd (Version 2.90) +# spec file for package gpsd (Version 2.37) # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,12 +20,11 @@ Name: gpsd Summary: Service daemon for mediating access to a GPS -License: BSD3c(or similar) +License: BSD 3-clause (or similar) Url: http://gpsd.berlios.de/ Group: Hardware/Other Version: 2.90 -Release: 2 -%define libgps libgps19 +Release: 1 Requires: udev PreReq: coreutils %fillup_prereq BuildRequires: gcc-c++ ncurses-devel openmotif openmotif-devel python-devel udev update-desktop-files xmlto @@ -41,10 +40,6 @@ Source4: gpsd.xpm Source5: xgps.desktop Source6: xgpsspeed.desktop BuildRoot: %{_tmppath}/%{name}-%{version}-build -%if 0%{?suse_version} > 1110 -%else -%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")} -%endif %description gpsd is a service daemon that mediates access to a GPS sensor connected @@ -79,63 +74,18 @@ Authors: Ville Nuorvala %package devel -License: BSD3c(or similar) +License: BSD 3-clause (or similar) Summary: Client libraries in C and Python for talking to a running gpsd or GPS -Group: Development/Libraries +Group: Hardware/Other Requires: %name = %version -Requires: pkgconfig, python-curses +Requires: pkgconfig %description devel This package provides C header files for the gpsd shared libraries that -manage access to a GPS for applications and debugging tools. You will +manage access to a GPS for applications; also Python modules. You will need to have gpsd installed for it to work. -Authors: --------- - Remco Treffkorn - Derrick J. Brashear - Russ Nelson - Eric S. Raymond - Gary E. Miller - Jeff Francis - Amaury Jacquot - Chris Kuethe - Ville Nuorvala - - -%package -n libgps19 -License: BSD3c(or similar) -Summary: Shared library for GPS applications -Group: Development/Libraries/Python - -%description -n %libgps -This package provides the shared library for gpsd and other GPS aware -applications - -Authors: --------- - Remco Treffkorn - Derrick J. Brashear - Russ Nelson - Eric S. Raymond - Gary E. Miller - Jeff Francis - Amaury Jacquot - Chris Kuethe - Ville Nuorvala - - -%package -n python-gpsd -License: BSD3c(or similar) -Summary: Client libraries in C and Python for talking to a running gpsd or GPS -Group: Development/Libraries/Python -Requires: %name = %version -%{py_requires} - -%description -n python-gpsd -This package provides python modules and tools for the gpsd shared -You will need to have gpsd installed for it to work. Authors: -------- @@ -150,7 +100,7 @@ Authors: Ville Nuorvala %package clients -License: BSD3c(or similar) +License: BSD 3-clause (or similar) Summary: Clients for gpsd with an X interface Group: Hardware/Other @@ -205,12 +155,12 @@ install -m 644 %{SOURCE3} %{buildroot}/var/adm/fillup-templates install -m 644 gpsfake.py %{buildroot}%{python_sitelib} install -m 755 gps.py %{buildroot}%{python_sitelib} # remove /usr/bin/env call +for i in gpscat gpsfake gpsprof; do + sed -i "s|/usr/bin/env python|/usr/bin/python|g" %{buildroot}%{_bindir}/$i +done sed -i "s|/usr/bin/env python|/usr/bin/python|g" %{buildroot}%{python_sitelib}/gps.py # remove .la files rm -f %{buildroot}%{_libdir}/libgps.la -strip %{buildroot}%{_bindir}/{cgps,gpsctl,gpsdecode,gpsmon,gpspipe,gpxlogger,lcdgps,xgps,xgpsspeed} -strip %{buildroot}%{_sbindir}/gpsd -strip %{buildroot}%{_libdir}/*so %{buildroot}%{python_sitelib}/*so # install desktop entries install -m 644 %{SOURCE4} %{buildroot}%{_datadir}/pixmaps/%{name}.xpm install -m 644 %{SOURCE5} %{buildroot}%{_datadir}/applications/ @@ -226,68 +176,63 @@ install -m 644 %{SOURCE6} %{buildroot}%{_datadir}/applications/ rm -rf %{buildroot} %post +/sbin/ldconfig %fillup_only -n gpsd -%post -n %libgps -p /sbin/ldconfig - -%postun -n %libgps -p /sbin/ldconfig +%postun -p /sbin/ldconfig %files %defattr(-,root,root) %doc README INSTALL COPYING gpsd.php %{_mandir}/man?/gpsd.* +%{_mandir}/man?/gpsprof.* %{_mandir}/man?/gpsctl.* /lib/udev/gpsd.sh %config(noreplace) /etc/udev/rules.d/* %{_sbindir}/gpsd %{_bindir}/gpsctl -/var/adm/fillup-templates/sysconfig.gpsd - -%files -n %libgps -%defattr(-,root,root) +%{_bindir}/gpsprof %{_libdir}/libgps.so.* +%{python_sitelib}/gps.py* +%{python_sitelib}/gpslib.so +/var/adm/fillup-templates/sysconfig.gpsd %files devel %defattr(-,root,root) %doc README INSTALL COPYING TODO +%{_mandir}/man?/gpsdecode.* %{_mandir}/man?/gpsfake.* %{_mandir}/man?/gpscat.* +%{_mandir}/man?/gpsmon.* +%{_mandir}/man?/lcdgps.* %{_mandir}/man?/libgps*.* %{_mandir}/man?/rtcm-104.* %{_mandir}/man?/srec.* -%{_mandir}/man?/gpsdecode.* -%{_mandir}/man?/gpsprof.* %{_bindir}/gpsfake %{_bindir}/gpscat %{_bindir}/gpsdecode -%{_bindir}/gpsprof +%{_bindir}/gpsmon +%{_bindir}/lcdgps %{_includedir}/gps.h %{_includedir}/libgpsmm.h %{_includedir}/gpsd.h +%{python_sitelib}/gpscap.py* +%{python_sitelib}/gpsfake.py* +%{python_sitelib}/gpspacket.so* %{_libdir}/libgps.so %{_libdir}/pkgconfig/libgps*.pc -%files -n python-gpsd -%defattr(-,root,root) -%{python_sitelib}/gps*.py* -%{python_sitelib}/gpslib.so -%{python_sitelib}/gpspacket.so* - %files clients %defattr(-,root,root) %{_mandir}/man?/gps.* %{_mandir}/man?/cgps.* -%{_mandir}/man?/lcdgps.1.gz %{_mandir}/man?/xgps.* %{_mandir}/man?/xgpsspeed.* %{_mandir}/man?/gpspipe.* -%{_mandir}/man?/gpsmon.* %{_mandir}/man?/cgpxlogger.* %{_bindir}/xgps %{_bindir}/xgpsspeed %{_bindir}/cgps -%{_bindir}/lcdgps -%{_bindir}/gpsmon %{_bindir}/gpspipe %if 0%{?suse_version} > 1020 %{_bindir}/gpxlogger diff --git a/ready b/ready new file mode 100644 index 0000000..473a0f4 diff --git a/rules.gpsd b/rules.gpsd index b613fc2..7cd8d07 100644 --- a/rules.gpsd +++ b/rules.gpsd @@ -7,15 +7,14 @@ LABEL="gpsd_add" ACTION != "add", GOTO="gpsd_end" # "Prolific Technology 2303 (commonly in tandem with SiRF chips)" -KERNEL=="ttyUSB*", ATTR{idVendor}=="067b", ATTR{idProduct}=="2303", RUN="/lib/udev/gpsd.sh" +KERNEL=="ttyUSB*", SYSFS{idVendor}=="067b", SYSFS{idProduct}=="2303", RUN="/lib/udev/gpsd.sh" # "FTDI 8U232AM" -KERNEL=="ttyUSB*", ATTR{idVendor}=="0403", ATTR{idProduct}=="6001", RUN="/lib/udev/gpsd.sh" +KERNEL=="ttyUSB*", SYSFS{idVendor}=="0403", SYSFS{idProduct}=="6001", RUN="/lib/udev/gpsd.sh" # "Cypress M8/CY7C64013 (DeLorme uses these)" -KERNEL=="ttyUSB*", ATTR{idVendor}=="1163", ATTR{idProduct}=="0100", RUN="/lib/udev/gpsd.sh" -KERNEL=="ttyUSB*", ATTR{idVendor}=="1163", ATTR{idProduct}=="0200", RUN="/lib/udev/gpsd.sh" +KERNEL=="ttyUSB*", SYSFS{idVendor}=="1163", SYSFS{idProduct}=="0100", RUN="/lib/udev/gpsd.sh" # "PS-360 OEM (Microsoft GPS sold with Street and Trips 2005)" -KERNEL=="ttyUSB*", ATTR{idVendor}=="067b", ATTR{idProduct}=="aaa0", RUN="/lib/udev/gpsd.sh" +KERNEL=="ttyUSB*", SYSFS{idVendor}=="067b", SYSFS{idProduct}=="aaa0", RUN="/lib/udev/gpsd.sh" # SiRF Star III 20ch Gmouse GPS (a.k.a Cygnal Integrated Products, Inc.) -KERNEL=="ttyUSB*", ATTR{idVendor}=="10c4", ATTR{idProduct}=="ea60", RUN="/lib/udev/gpsd.sh" +KERNEL=="ttyUSB*", SYSFS{idVendor}=="10c4", SYSFS{idProduct}=="ea60", RUN="/lib/udev/gpsd.sh" LABEL="gpsd_end"