From 7af9494fb4dcc8a1566fccdd1a7a603717bb1ae84a90ca27d80ab47e2136b824 Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Sat, 18 Apr 2020 06:50:28 +0000 Subject: [PATCH] Accepting request 794991 from home:adkorte - Update to version 3.20 * Change README into an asciidoc file and publish HTML from it * Add NED and geoid_sep to gps_fix_t and TPV JSON. * Add "-e NED" to ubxtool to enable NED messages. * gpsdata.separation replaced by gpsdata.fix.geoid_sep. * Remove nofloats build option. * TPV JSON "alt" is now fixed at WGS84. Probably. * xgps now uses XGPSOPTS environment variable. * add health variable to satellite_t * change satellite_t elevation and azimuth to double * satellite_t elevation, azimuth, and ss use NAN for unknown value. * add altMSL, altHAE, and depth, to gps_fix_t * altitude in gps_fix_t is deprecated and undefined * wgs84_separation() now return EGM2008 computed from 5x5 degree base data. * The best results are close to cm, the worst off up to 12m. * Move mag_var from gps_device_t to magnetic_var gps_data_t. * Added mag_var() to interpolate magnetic variation (deviation) from a table. * Remove true2magnetic() as mag_var() improves on it. * Remove TIMEHINT_ENABLE. It only worked when enabled. * Remove NTP_ENABLE and NTPSHM_ENABLE. It only worked when enabled. * Remove PPS_ENABLE and TIMING_ENABLE. * Add dgps_age and dgps_station to gps_fix_t * Convert all timestamp_t to timespec_t. * Remove FIXED_PORT_SPEED and FIXED_STOP_BITS build options. * Add -s [speed] and -f [framing] runtime options to gpsd. * A working CC and termios.h are mandatory. * use the current leap second to determine the current GPS epoch. * leapfetch.py, leapseconds.cache, timebase.h and leapfetch option gone. - Remove 0001-Make-sure-Qgpsmm.pc-is-usable.patch (upstreamed) - Fix legacy socket path OBS-URL: https://build.opensuse.org/request/show/794991 OBS-URL: https://build.opensuse.org/package/show/Application:Geo/gpsd?expand=0&rev=132 --- 0001-Make-sure-Qgpsmm.pc-is-usable.patch | 44 ----------------------- gpsd-3.19.tar.gz | 3 -- gpsd-3.19.tar.gz.sig | Bin 566 -> 0 bytes gpsd-3.20.tar.gz | 3 ++ gpsd-3.20.tar.gz.sig | Bin 0 -> 565 bytes gpsd.changes | 34 ++++++++++++++++++ gpsd.spec | 15 +++----- udev.gpsd | 4 +-- 8 files changed, 44 insertions(+), 59 deletions(-) delete mode 100644 0001-Make-sure-Qgpsmm.pc-is-usable.patch delete mode 100644 gpsd-3.19.tar.gz delete mode 100644 gpsd-3.19.tar.gz.sig create mode 100644 gpsd-3.20.tar.gz create mode 100644 gpsd-3.20.tar.gz.sig diff --git a/0001-Make-sure-Qgpsmm.pc-is-usable.patch b/0001-Make-sure-Qgpsmm.pc-is-usable.patch deleted file mode 100644 index 6f5b95a..0000000 --- a/0001-Make-sure-Qgpsmm.pc-is-usable.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 1ab2f417451c9dcb6501952b8842ce911ce055b9 Mon Sep 17 00:00:00 2001 -From: Christophe Giboudeaux -Date: Sat, 28 Sep 2019 13:14:14 +0200 -Subject: [PATCH] Make sure Qgpsmm.pc is usable. - -The library dir and Qt version used to build gpsd can be customized but the -qgpsmm pkgconfig file had hardcoded values. - -The pkgconfig file now uses `LIBDIR` and the `qt_versioned` value. ---- - Qgpsmm.pc.in | 6 +++--- - SConstruct | 1 + - 2 files changed, 4 insertions(+), 3 deletions(-) - -diff --git a/Qgpsmm.pc.in b/Qgpsmm.pc.in -index c3006d508..b18015d51 100644 ---- a/Qgpsmm.pc.in -+++ b/Qgpsmm.pc.in -@@ -5,9 +5,9 @@ includedir=@includedir@ - qt_config=lex yacc warn_on uic resources qt release incremental link_prl def_files_disabled exceptions no_mocdepend stl qt_no_framework create_pc create_prl moc thread dll - - Name: Qgpsmm --Description: GPS Daemon communication library - QT binding -+Description: GPS Daemon communication library - Qt binding - Version: @VERSION@ - Libs: -L${libdir} -lQgpsmm --Libs.private: -L/usr/lib -lQtNetwork -lQtCore -lpthread -+Libs.private: -L${libdir} -lQt@QTVERSIONED@Network -lQt@QTVERSIONED@Core -lpthread - Cflags: -I${includedir} --Requires: QtNetwork -+Requires: Qt@QTVERSIONED@Network - -diff --git a/SConstruct b/SConstruct -index 5160481..a4b9975 100644 ---- a/SConstruct -+++ b/SConstruct -@@ -1851,6 +1851,7 @@ def substituter(target, source, env): - ('@MAINPAGE@', mainpage), - ('@MASTER@', 'DO NOT HAND_HACK! THIS FILE IS GENERATED'), - ('@prefix@', env['prefix']), -+ ('@QTVERSIONED@', env['qt_versioned']), - ('@SCPUPLOAD@', scpupload), - ('@SITENAME@', sitename), - ('@SITESEARCH@', sitesearch), diff --git a/gpsd-3.19.tar.gz b/gpsd-3.19.tar.gz deleted file mode 100644 index cf45606..0000000 --- a/gpsd-3.19.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:27dd24d45b2ac69baab7933da2bf6ae5fb0be90130f67e753c110a3477155f39 -size 10581777 diff --git a/gpsd-3.19.tar.gz.sig b/gpsd-3.19.tar.gz.sig deleted file mode 100644 index 7dfb7f9f8929e65ca3adfc8c282ed60afa9b48600beee33094557cafd953ff62..0000000000000000000000000000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 566 zcmV-60?GY}0y6{v0SEvc79j)-iH%47uTZ90D6zCIYsKC!=xRO%0$m!yP5=rC5H4%Q z-Y)2BKB18i0H+^)HFK)=uNypr@lIwM`%SKT@n`8$NR6an#cdsqhRc~f)K|UW+bW(Lt{Q_c#fTZvn9wHdb`nC%o9aLoBKM2;%#+*FGmmME#qV2+Ip!_ea}j` zYDgg-p$Rt{w%c97tkS2B@RcQ$tg*1cY zmbT~<1yxhoP>a#*u0SEvc79j)-iH%47uTZ90D6zCIYsKC!=xRO%0$vOQN&pH85H4%Q z-Y)2BK0W;p`1T=|k?^_fibBZ;zQlkLzv!*XxZ=XTnf-ScFbRAwI(7YD%f%obG>T`H z{uNNNZqDoc`5;i7LQjJ=OR+qo)GsI&Muu4ZsFxa8`#(;2(u&#(<1KNDtxXJym}D2bKf&fCf2nA&YZf2CKTl z1z~1p$B3{*Zp~eM*<}8R$O#_hq#kqNq)<6ISi}BsQT(&@L@H=PCCzW)!MG6n_f#!^ zGZN>vch;#_T}`FFdKsLh+q0ixKNPn;vw2jz^fG2R=(FkTbFza4+?Vd*UgCeDiUtWq z$}LfLa`X;~kOK?D5$5=2Iu)gp16e)%5W*B>yMzSyt*Ta>HAGqsUvb) z%z57_t@NZxi#n7RU|euV!tp5lY3fxZ{NB`9pDt-`qpZe~n~_(8cKBuf0QDAyo5Svy z&5M3J3uGiGq;H4rmg94Z>#;F-?0_WlWb$poNk$#XWN^P4S3c3x1JB2ky;J?Ru+vI1i^N_kL)lrBZ{5%n)?7isu?q=t D<%AiG literal 0 HcmV?d00001 diff --git a/gpsd.changes b/gpsd.changes index 7d62436..b3ba72b 100644 --- a/gpsd.changes +++ b/gpsd.changes @@ -1,3 +1,37 @@ +------------------------------------------------------------------- +Fri Apr 17 16:18:26 UTC 2020 - Arjen de Korte + +- Update to version 3.20 + * Change README into an asciidoc file and publish HTML from it + * Add NED and geoid_sep to gps_fix_t and TPV JSON. + * Add "-e NED" to ubxtool to enable NED messages. + * gpsdata.separation replaced by gpsdata.fix.geoid_sep. + * Remove nofloats build option. + * TPV JSON "alt" is now fixed at WGS84. Probably. + * xgps now uses XGPSOPTS environment variable. + * add health variable to satellite_t + * change satellite_t elevation and azimuth to double + * satellite_t elevation, azimuth, and ss use NAN for unknown value. + * add altMSL, altHAE, and depth, to gps_fix_t + * altitude in gps_fix_t is deprecated and undefined + * wgs84_separation() now return EGM2008 computed from 5x5 degree base data. + * The best results are close to cm, the worst off up to 12m. + * Move mag_var from gps_device_t to magnetic_var gps_data_t. + * Added mag_var() to interpolate magnetic variation (deviation) from a table. + * Remove true2magnetic() as mag_var() improves on it. + * Remove TIMEHINT_ENABLE. It only worked when enabled. + * Remove NTP_ENABLE and NTPSHM_ENABLE. It only worked when enabled. + * Remove PPS_ENABLE and TIMING_ENABLE. + * Add dgps_age and dgps_station to gps_fix_t + * Convert all timestamp_t to timespec_t. + * Remove FIXED_PORT_SPEED and FIXED_STOP_BITS build options. + * Add -s [speed] and -f [framing] runtime options to gpsd. + * A working CC and termios.h are mandatory. + * use the current leap second to determine the current GPS epoch. + * leapfetch.py, leapseconds.cache, timebase.h and leapfetch option gone. +- Remove 0001-Make-sure-Qgpsmm.pc-is-usable.patch (upstreamed) +- Fix legacy socket path + ------------------------------------------------------------------- Mon Mar 16 12:19:41 UTC 2020 - Tomáš Chvátal diff --git a/gpsd.spec b/gpsd.spec index 37a18ac..d95d6bd 100644 --- a/gpsd.spec +++ b/gpsd.spec @@ -22,7 +22,7 @@ %define _udevdir %(pkg-config --variable udevdir udev) %bcond_without python2 Name: gpsd -Version: 3.19 +Version: 3.20 Release: 0 Summary: Service daemon for mediating access to a GPS License: BSD-3-Clause @@ -34,8 +34,6 @@ Source2: udev.gpsd Source3: sysconfig.gpsd Source98: https://download-mirror.savannah.gnu.org/releases/gpsd/%{name}-%{version}.tar.gz.sig Source99: %{name}.keyring -# PATCH-FIX-UPSTREAM -Source100: 0001-Make-sure-Qgpsmm.pc-is-usable.patch BuildRequires: chrpath BuildRequires: fdupes BuildRequires: gcc-c++ @@ -55,6 +53,7 @@ BuildRequires: pkgconfig(Qt5Network) BuildRequires: pkgconfig(Qt5Widgets) BuildRequires: pkgconfig(bluez) BuildRequires: pkgconfig(dbus-1) +BuildRequires: pkgconfig(gtk+-3.0) BuildRequires: pkgconfig(libusb-1.0) %if %{with python2} BuildRequires: pkgconfig(python2) @@ -165,12 +164,6 @@ mkdir -p %{name}-%{version}/python2 mkdir -p %{name}-%{version}/python3 tar -xf %{SOURCE0} -C %{name}-%{version}/python2 tar -xf %{SOURCE0} -C %{name}-%{version}/python3 -pushd %{name}-%{version}/python2/%{name}-%{version} -patch -p1 < %{SOURCE100} -popd -pushd %{name}-%{version}/python3/%{name}-%{version} -patch -p1 < %{SOURCE100} -popd cd %{name}-%{version} # fix systemd path @@ -185,6 +178,9 @@ sed -i 's|env.Prepend.*RPATH.*|pass #\0|' python*/%{name}-%{version}/SConstruct # fix gpsd path sed -i 's|ExecStart=.*/gpsd|ExecStart=%{_sbindir}/gpsd|' python*/%{name}-%{version}/systemd/gpsd.service +# fix socket path +sed -i 's|ListenStream=/var/run/gpsd.sock|ListenStream=/run/gpsd.sock|' python*/%{name}-%{version}/systemd/gpsd.socket + %build # The SCons description does not handle CXXFLAGS correctly, pass C++ flags also in CFLAGS export CFLAGS="%{optflags}" @@ -296,7 +292,6 @@ sed -i -e 's#Icon=.*/\([^/]\+\)\(\..\+\)#Icon=\1#' %{buildroot}%{_datadir}/appli %files %license %{name}-%{version}/python3/%{name}-%{version}/COPYING -%doc %{name}-%{version}/python3/%{name}-%{version}/README %{_mandir}/man?/gpsd.* %{_mandir}/man?/gpsdctl.* %{_mandir}/man?/gpsctl.* diff --git a/udev.gpsd b/udev.gpsd index cdcb107..e1c3546 100644 --- a/udev.gpsd +++ b/udev.gpsd @@ -1,6 +1,6 @@ #!/bin/bash -CTRL_SOCK="/var/run/gpsd.socket" -DEV_NAME="/var/run/gpsd.device" +CTRL_SOCK="/run/gpsd.socket" +DEV_NAME="/run/gpsd.device" . /etc/sysconfig/gpsd