SHA256
1
0
forked from pool/gpsd
gpsd/project.diff

216 lines
6.9 KiB
Diff

--- gpsd.changes.orig
+++ gpsd.changes
@@ -1,7 +1,26 @@
-------------------------------------------------------------------
-Sun Dec 8 12:00:00 CET 2009 - opensuse@dstoecker.de
+Tue Dec 8 14:13:09 UTC 2009 - jreuter@novell.com
-- use new python macros
+- 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
-------------------------------------------------------------------
Fri Dec 4 12:08:31 UTC 2009 - jreuter@novell.com
--- gpsd.spec.orig
+++ gpsd.spec
@@ -1,5 +1,5 @@
#
-# spec file for package gpsd (Version 2.37)
+# spec file for package gpsd (Version 2.90)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -24,7 +24,8 @@ License: BSD 3-clause (or similar
Url: http://gpsd.berlios.de/
Group: Hardware/Other
Version: 2.90
-Release: 1
+Release: 0
+%define libgps libgps19
Requires: udev
PreReq: coreutils %fillup_prereq
BuildRequires: gcc-c++ ncurses-devel openmotif openmotif-devel python-devel udev update-desktop-files xmlto
@@ -76,16 +77,63 @@ Authors:
%package devel
License: BSD 3-clause (or similar)
Summary: Client libraries in C and Python for talking to a running gpsd or GPS
-Group: Hardware/Other
+Group: Development/Libraries
Requires: %name = %version
Requires: pkgconfig
%description devel
This package provides C header files for the gpsd shared libraries that
-manage access to a GPS for applications; also Python modules. You will
+manage access to a GPS for applications and debugging tools. You will
need to have gpsd installed for it to work.
+Authors:
+--------
+ Remco Treffkorn <remco@rvt.com>
+ Derrick J. Brashear <shadow@dementia.org>
+ Russ Nelson <nelson@crynwyr.com>
+ Eric S. Raymond <esr@thyrsus.com>
+ Gary E. Miller <gem@rellim.com>
+ Jeff Francis <jeff@gritch.org>
+ Amaury Jacquot <sxpert@esitcom.org>
+ Chris Kuethe <chris.kuethe@gmail.com>
+ Ville Nuorvala <vnuorval@tcs.hut.fi>
+
+
+%package -n %libgps
+License: BSD 3-clause (or similar)
+Summary: Shared library for GPS applications
+Group: Development/Libraries/Python
+Requires: %name = %version
+%{py_requires}
+
+%description -n %libgps
+This package provides the shared library for gpsd and other GPS aware
+applications
+
+Authors:
+--------
+ Remco Treffkorn <remco@rvt.com>
+ Derrick J. Brashear <shadow@dementia.org>
+ Russ Nelson <nelson@crynwyr.com>
+ Eric S. Raymond <esr@thyrsus.com>
+ Gary E. Miller <gem@rellim.com>
+ Jeff Francis <jeff@gritch.org>
+ Amaury Jacquot <sxpert@esitcom.org>
+ Chris Kuethe <chris.kuethe@gmail.com>
+ Ville Nuorvala <vnuorval@tcs.hut.fi>
+
+
+%package -n python-gpsd
+License: BSD 3-clause (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:
--------
@@ -155,12 +203,12 @@ install -m 644 %{SOURCE3} %{buildroot}/v
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/
@@ -176,63 +224,67 @@ install -m 644 %{SOURCE6} %{buildroot}%{
rm -rf %{buildroot}
%post
-/sbin/ldconfig
%fillup_only -n gpsd
-%postun -p /sbin/ldconfig
+%post -n %libgps -p /sbin/ldconfig
+%postun -n %libgps -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
-%{_bindir}/gpsprof
-%{_libdir}/libgps.so.*
-%{python_sitelib}/gps.py*
-%{python_sitelib}/gpslib.so
/var/adm/fillup-templates/sysconfig.gpsd
+%files -n %libgps
+%defattr(-,root,root)
+%{_libdir}/libgps.so.*
+
%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}/gpsmon
-%{_bindir}/lcdgps
+%{_bindir}/gpsprof
%{_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