From 400829d8e5e6583c271cbfd66141e99abab1815e95f83e1a7692bad2d1f1f2bf Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Fri, 23 Oct 2020 17:40:06 +0000 Subject: [PATCH] Accepting request 843584 from home:adkorte - Update to version 3.21 * Create python programs from .in files to allow macro substitution. * Finally clean .sconsign*.dblite with "scons -c" * Remove revision.h. Move REVISION into gpsd_config.h * Change asciidoc to asciidoctor, and revise documents to match. * library version bumped to 27 * Add leap_seconds to gps_data_t * Add/change many rtcm2 structs in gps.h * Add/change many rtcm3 structs in gps.h * Maindenhead now 8 chars. * Add icondir and sharedir install options * Install basic doc in sharedir * Move gps_data_t->status to gps_fix_t.status for better fix merging * The gps python module is now Pure Python + FFI. FFI only for packet.py * User should manually delete any old packet*so. * Add wspeedt, wspeedr, wanglem, wanglet, wangler to gps_fix_t * Add "-p CONFIG", "-p STATUS", "-t" and "-tt" options to ubxtool. * Add python_shebang option to scons config. * gpsrinex has long options and many new options. * Added long options to gpsd. * Remove unused FORCE_GLOBAL_ENABLE * Remove config option reconfigure, replace with -p, --passive runtime option. * Remove config option controlsend (RECONFIGURE_ENABLE) * Add config option rundir=XX. Default set to /run, or /var/run as required. * Fixes for Python 2.6 up to 3.9. OBS-URL: https://build.opensuse.org/request/show/843584 OBS-URL: https://build.opensuse.org/package/show/Application:Geo/gpsd?expand=0&rev=134 --- gpsd-3.20.tar.gz | 3 --- gpsd-3.20.tar.gz.sig | Bin 565 -> 0 bytes gpsd-3.21.tar.gz | 3 +++ gpsd-3.21.tar.gz.sig | Bin 0 -> 566 bytes gpsd.changes | 29 +++++++++++++++++++++++++++++ gpsd.spec | 34 ++++++++++++++++++++-------------- 6 files changed, 52 insertions(+), 17 deletions(-) delete mode 100644 gpsd-3.20.tar.gz delete mode 100644 gpsd-3.20.tar.gz.sig create mode 100644 gpsd-3.21.tar.gz create mode 100644 gpsd-3.21.tar.gz.sig diff --git a/gpsd-3.20.tar.gz b/gpsd-3.20.tar.gz deleted file mode 100644 index a2639e0..0000000 --- a/gpsd-3.20.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:172a7805068eacb815a3c5225436fcb0be46e7e49a5001a94034eac43df85e50 -size 3600835 diff --git a/gpsd-3.20.tar.gz.sig b/gpsd-3.20.tar.gz.sig deleted file mode 100644 index fab3054f527228189a5c18d560d76e19e2657ba2ff21668231f32b464e63c8b7..0000000000000000000000000000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 565 zcmV-50?Pe~0x|>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 diff --git a/gpsd-3.21.tar.gz b/gpsd-3.21.tar.gz new file mode 100644 index 0000000..e6c7e54 --- /dev/null +++ b/gpsd-3.21.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:65504c3af8d3b0cce3c07405b8815d7730d2d2be2da7d28d275f1a9c57c6fe91 +size 3984157 diff --git a/gpsd-3.21.tar.gz.sig b/gpsd-3.21.tar.gz.sig new file mode 100644 index 0000000000000000000000000000000000000000000000000000000000000000..85e595264c01fb31136c51fe0b2f45d6b4d466feaa43e9183e35a61c12249260 GIT binary patch literal 566 zcmV-60?GY}0y6{v0SEvc79j)-iH%47uTZ90D6zCIYsKC!=xRO%0$(Yy^Z*J85H4%Q z-Y)2BK5}Od{0S1Eo2l_y1ft9{wnT3Zr;APhz#Z=fu>1`VGs{Y$ecdx4b>C~Lskvn! z<}OD7R7ooZv-e))+-hx_Hq&T_e2Q@Z_+HLWfslY3q`JJ+z(Y|Yx!NS#8zf45XXCF< zLP*rCq9tGW!^Gh*tc?<9pLR|G9h$&W&&yoq;CWz?2%pV-JDXt=E#ztg-%~~!Ovnk! z(d5ocrKzH?sGFB?V4kTPNbsLS=@pty630ni?B{KBy1HXmFU~O1)fD<>>TI&lJ%z6dTeL}Xhwthx~|5a1blC;fRvFOX)IxI#O4nAb2V37)ha~|@Yi`bOS1U7vRwsM2f$F0`S45J zt<4zD|4T0+o09jfj&dMcF~T%srp&-_2VpJKeY4C5`Rc$YyEje($=!!bFIRRuPmnV! E0UUG + +- Update to version 3.21 + * Create python programs from .in files to allow macro substitution. + * Finally clean .sconsign*.dblite with "scons -c" + * Remove revision.h. Move REVISION into gpsd_config.h + * Change asciidoc to asciidoctor, and revise documents to match. + * library version bumped to 27 + * Add leap_seconds to gps_data_t + * Add/change many rtcm2 structs in gps.h + * Add/change many rtcm3 structs in gps.h + * Maindenhead now 8 chars. + * Add icondir and sharedir install options + * Install basic doc in sharedir + * Move gps_data_t->status to gps_fix_t.status for better fix merging + * The gps python module is now Pure Python + FFI. FFI only for packet.py + * User should manually delete any old packet*so. + * Add wspeedt, wspeedr, wanglem, wanglet, wangler to gps_fix_t + * Add "-p CONFIG", "-p STATUS", "-t" and "-tt" options to ubxtool. + * Add python_shebang option to scons config. + * gpsrinex has long options and many new options. + * Added long options to gpsd. + * Remove unused FORCE_GLOBAL_ENABLE + * Remove config option reconfigure, replace with -p, --passive runtime option. + * Remove config option controlsend (RECONFIGURE_ENABLE) + * Add config option rundir=XX. Default set to /run, or /var/run as required. + * Fixes for Python 2.6 up to 3.9. + ------------------------------------------------------------------- Fri Apr 17 16:18:26 UTC 2020 - Arjen de Korte diff --git a/gpsd.spec b/gpsd.spec index d95d6bd..a32b077 100644 --- a/gpsd.spec +++ b/gpsd.spec @@ -16,13 +16,13 @@ # -%define sover 25 -%define libgps libgps%{sover} -%define libQgps libQgpsmm%{sover} +%define sover 27 +%define libgps libgps%{sover} +%define libQgps libQgpsmm%{sover} %define _udevdir %(pkg-config --variable udevdir udev) %bcond_without python2 Name: gpsd -Version: 3.20 +Version: 3.21 Release: 0 Summary: Service daemon for mediating access to a GPS License: BSD-3-Clause @@ -160,9 +160,11 @@ cgps resembles xgps, but without the pictorial satellite display. It can run on a serial terminal or terminal emulator. %prep +%if %{with python2} mkdir -p %{name}-%{version}/python2 -mkdir -p %{name}-%{version}/python3 tar -xf %{SOURCE0} -C %{name}-%{version}/python2 +%endif +mkdir -p %{name}-%{version}/python3 tar -xf %{SOURCE0} -C %{name}-%{version}/python3 cd %{name}-%{version} @@ -175,12 +177,12 @@ sed -i 's|systemctl daemon-reload|true|' python*/%{name}-%{version}/SConstruct # don't set RPATH sed -i 's|env.Prepend.*RPATH.*|pass #\0|' python*/%{name}-%{version}/SConstruct +# fix docdir path +sed -i 's|(\x27sharedir\x27), \"doc"|(\x27docdir\x27)|' 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}" @@ -211,7 +213,9 @@ for i in "${pyversions[@]}"; do libdir=%{_libdir} \ sbindir=%{_sbindir} \ mandir=%{_mandir} \ - docdir=%{_docdir} \ + docdir=%{_docdir}/%{name} \ + icondir=%{_datadir}/icons/hicolor/128x128/apps \ + python_shebang=%{_bindir}/${i} \ pkgconfigdir=%{_libdir}/pkgconfig \ udevdir=$(dirname %{_udevrulesdir}) \ target_python=${i} \ @@ -219,8 +223,7 @@ for i in "${pyversions[@]}"; do build # Fix python interpreter path. - sed -e "s,#!%{_bindir}/\(python[23]\?\|env \+python[23]\?\),#!%{_bindir}/${i},g" -i \ - gegps gpscat gpsfake xgps xgpsspeed gpsprof ubxtool zerk gps/*.py + sed -e "s,#!%{_bindir}/\(python[23]\?\|env \+python[23]\?\),#!%{_bindir}/${i},g" -i gps/*.py popd cnt=`expr $cnt + 1` @@ -235,7 +238,7 @@ export CPPFLAGS="%{optflags}" %if %{with python2} pushd %{name}-%{version}/python2/%{name}-%{version} -DESTDIR=%{buildroot} scons nostrip=True install +DESTDIR=%{buildroot} scons nostrip=True install systemd_install # Now delete all the installed files except the python2 files find %{buildroot} \( -not -type d -a -not -path "*/python2.*/*" \) -delete @@ -244,7 +247,7 @@ popd %endif pushd %{name}-%{version}/python3/%{name}-%{version} -DESTDIR=%{buildroot} scons nostrip=True install +DESTDIR=%{buildroot} scons nostrip=True install systemd_install install -d -m 755 %{buildroot}%{_udevdir} install -d -m 755 %{buildroot}%{_udevdir}/rules.d @@ -254,7 +257,6 @@ install -m 644 %{SOURCE1} %{buildroot}%{_udevdir}/rules.d/51-gpsd.rules install -m 755 %{SOURCE2} %{buildroot}%{_udevdir}/gpsd.sh install -m 644 %{SOURCE3} %{buildroot}%{_fillupdir} # install desktop entries -install -D -m 644 -t %{buildroot}%{_datadir}/icons/hicolor/128x128/apps/ packaging/X11/gpsd-logo.png install -D -m 644 -t %{buildroot}%{_datadir}/applications/ packaging/X11/xgps.desktop install -D -m 644 -t %{buildroot}%{_datadir}/applications/ packaging/X11/xgpsspeed.desktop install -D -m 644 systemd/gpsd.service %{buildroot}/%{_unitdir}/gpsd.service @@ -292,6 +294,8 @@ sed -i -e 's#Icon=.*/\([^/]\+\)\(\..\+\)#Icon=\1#' %{buildroot}%{_datadir}/appli %files %license %{name}-%{version}/python3/%{name}-%{version}/COPYING +%{_docdir}/%{name} +%exclude %{_docdir}/%{name}/{COPYING,build.adoc} %{_mandir}/man?/gpsd.* %{_mandir}/man?/gpsdctl.* %{_mandir}/man?/gpsctl.* @@ -309,6 +313,7 @@ sed -i -e 's#Icon=.*/\([^/]\+\)\(\..\+\)#Icon=\1#' %{buildroot}%{_datadir}/appli %files -n %{libgps} %{_libdir}/libgps.so.* +%{_libdir}/libgpsdpacket.so.* %files -n %{libQgps} %{_libdir}/libQgpsmm.so.* @@ -330,6 +335,7 @@ sed -i -e 's#Icon=.*/\([^/]\+\)\(\..\+\)#Icon=\1#' %{buildroot}%{_datadir}/appli %{_includedir}/gps.h %{_includedir}/libgpsmm.h %{_libdir}/libgps.so +%{_libdir}/libgpsdpacket.so %{_libdir}/pkgconfig/libgps.pc %{_libdir}/libQgpsmm.so %{_libdir}/libQgpsmm.prl