From 09f428be8679a4c8bf2082533c4ba6e63ed1165802f9bcb7015c1c9bc388e43b Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Mon, 20 Nov 2017 14:58:31 +0000 Subject: [PATCH] Accepting request 543894 from home:pluskalm:branches:Application:Geo - Update to version 3.17: * Repair support for non-NMEA devices requring active probing (e.g. Garmin USB GPSes). * Fix a SiRF driver bug that occasionally confused NTP. * Support for Spectratime iSync GRClok and LNRClok oscillators. * gpxlogger can reconnect when the GPS loses the fix. * xgps and xgpsspeed moved to python-gi, getting shut of the deprecated pygtk2 bindings. * Default mode for xgpsspeed is now the more interesting nautical display. * gpsmon includes the hostname with the device display. * gpsprof now has centimeter precision. - Add gpsd-python3.patch to fix building with python3 - Refresh gpsd-fix-shebang.patch OBS-URL: https://build.opensuse.org/request/show/543894 OBS-URL: https://build.opensuse.org/package/show/Application:Geo/gpsd?expand=0&rev=107 --- gpsd-3.16.tar.gz | 3 --- gpsd-3.16.tar.gz.sig | Bin 536 -> 0 bytes gpsd-3.17.tar.gz | 3 +++ gpsd-3.17.tar.gz.sig | Bin 0 -> 536 bytes gpsd-fix-shebang.patch | 6 +++--- gpsd-python3.patch | 47 +++++++++++++++++++++++++++++++++++++++++ gpsd.changes | 18 ++++++++++++++++ gpsd.spec | 14 +++++++++--- 8 files changed, 82 insertions(+), 9 deletions(-) delete mode 100644 gpsd-3.16.tar.gz delete mode 100644 gpsd-3.16.tar.gz.sig create mode 100644 gpsd-3.17.tar.gz create mode 100644 gpsd-3.17.tar.gz.sig create mode 100644 gpsd-python3.patch diff --git a/gpsd-3.16.tar.gz b/gpsd-3.16.tar.gz deleted file mode 100644 index f48b0e7..0000000 --- a/gpsd-3.16.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:03579af13a4d3fe0c5b79fa44b5f75c9f3cac6749357f1d99ce5d38c09bc2029 -size 8587490 diff --git a/gpsd-3.16.tar.gz.sig b/gpsd-3.16.tar.gz.sig deleted file mode 100644 index b0c1c7859d967fc2b8f2c75755ee24679248cd8a730c1ec42d061cd9eb1c60ec..0000000000000000000000000000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 536 zcmV+z0_XjS0u=)V09KF=RP4wgkBn?{jR68_2oL{g^hi$KKMjW@kS=)~W-B%9d0PjE zPPsu}@QVwELJo}|(UC`g+>+%3hyDXw6Az=Lu;QezgdVmJzFAm|Ju$u{)TncAK|(UF zf7K^MZZd^S4QEK@0ihJNiJ*)syEs+TFGIo*!sOTji(lHyC&j*W@zpuHj=Fq%D>*!4KI6UrSjUgtUwA`)N1 zBWucF-+iCUJLMoIh{lpytx>72#3Emlf&05;R!~G{fp^WxuOp@@!4sL5M)f-zhR_HU zp03rkZi$&fpggq4*X~y)W)=&=PPiU~{)<72Bj|#OT#3HqPRyNW;;$~)*Azx*u`{~} z9xI7}>UE%GW|Ll+9iKuwH)?C$KVqK=QFbecwgd~7P`UnQ$DmA=KjDphOhwbD=fELq zE)|IDSe~JZ#dHgxhp-N%`}6K)!YphXWMW`54Rjrx^`T^XjZ9$z^)7B-vh21^vWAx# z=^+E3-f!htRy%?yJoYcQB#O{y0a^9v%8@^31o|1Jh1AA|#f(`N2+sHzi5NcV-lpY~ zLjoH@J1~t58Ay8}&uH(M`7umIgtpLmRf?bN6)C{3)FOGifwjtl@BQ0wc*oU>T&&0N a;waS^lUT@tu8tXbkMv|@yIf7146z5>)d3O! diff --git a/gpsd-3.17.tar.gz b/gpsd-3.17.tar.gz new file mode 100644 index 0000000..dbcd669 --- /dev/null +++ b/gpsd-3.17.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:68e0dbecfb5831997f8b3d6ba48aed812eb465d8c0089420ab68f9ce4d85e77a +size 8755304 diff --git a/gpsd-3.17.tar.gz.sig b/gpsd-3.17.tar.gz.sig new file mode 100644 index 0000000000000000000000000000000000000000000000000000000000000000..d20409e218bddcf8d4d2ad1f2f970463598f895baf788ab12c8dbbc926448ce8 GIT binary patch literal 536 zcmV+z0_XjS0u=)V09mm!M(oHSkBn?{jR694ln?$bV{4i!^EUYIPwU2-b3G5H$wGc- z`x~)y%rZN^qR^=J=g9`c#n>nRKR-@EW6n9cmxxM`Qty%OAuA9Q`(W^RrXVHmc&LVm z;gz0EgCko?F-A_IMCl2AdPGRet`Trf)$XTdVk+thYRID3CDEO8VhUCf$2b=V?44u? zmjjeC?o}FPcu`s0L}hN=Cz4cvzG};^Z9H)u6n8En80MI-K8ix62S~>KUb|E|^7MEcLPnMdD5sxEwYqX4__`~`vMfLr7|%o;>}ap;uWP58vM$%Zbm zc81TMHhj%moohNDMeyf{rmiRst^NE^i{czvMZZa2>7|S4=N@G0_a4#i&N*n(U={7o>EeZ^!2SoBqhU))tYhLz|4`R^;wzX@pw|utd3Nr+7b_^m zzN}b)AQ?VOd(0uKY)^ttL1!c)K*Oo8A&-0XgEwuHvvA8uB&P~R+3jQj`U6p1_1&<< ztB0}EIXspyI&;p#XeG4U-s>ypq_ru>LUH^e06Mm2NtMC?X`k8xB0OEZ8txBRYmQ-8Zc|7o9 a&9M0OY4(F1vNi;&#zOdJsfa=BSIR-C;SH() literal 0 HcmV?d00001 diff --git a/gpsd-fix-shebang.patch b/gpsd-fix-shebang.patch index c850097..e92239d 100644 --- a/gpsd-fix-shebang.patch +++ b/gpsd-fix-shebang.patch @@ -1,7 +1,7 @@ -Index: gpsd-3.13/gps/gps.py +Index: gpsd-3.17/gps/gps.py =================================================================== ---- gpsd-3.13.orig/gps/gps.py -+++ gpsd-3.13/gps/gps.py +--- gpsd-3.17.orig/gps/gps.py ++++ gpsd-3.17/gps/gps.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python diff --git a/gpsd-python3.patch b/gpsd-python3.patch new file mode 100644 index 0000000..ddc9d7e --- /dev/null +++ b/gpsd-python3.patch @@ -0,0 +1,47 @@ +Index: gpsd-3.17/SConstruct +=================================================================== +--- gpsd-3.17.orig/SConstruct ++++ gpsd-3.17/SConstruct +@@ -23,6 +23,13 @@ + # * Out-of-directory builds: see http://www.scons.org/wiki/UsingBuildDir + # * Coveraging mode: gcc "-coverage" flag requires a hack + # for building the python bindings ++# * Python 3 compatibility in this recipe ++ ++# Since SCons 3.0.0 forces print_function on us, it needs to be unconditional. ++# This is recognized to be a bug in SCons, but we need to live with it for now, ++# and we'll need this for eventual Python 3 compatibility, anyway. ++# Python requires this to precede any non-comment code. ++from __future__ import print_function + + # Release identification begins here + gpsd_version = "3.17" +@@ -375,7 +382,7 @@ if env.GetOption("silent"): + + def announce(msg): + if not env.GetOption("silent"): +- print msg ++ print(msg) + + # DESTDIR environment variable means user prefix the installation root. + DESTDIR = os.environ.get('DESTDIR', '') +@@ -1546,8 +1553,8 @@ def substituter(target, source, env): + content = content.replace(s, t) + m = re.search("@[A-Z]+@", content) + if m and m.group(0) not in map(lambda x: x[0], substmap): +- print >>sys.stderr, "Unknown subst token %s in %s." \ +- % (m.group(0), sfp.name) ++ print("Unknown subst token %s in %s." % (m.group(0), sfp.name), ++ file=sys.stderr) + tfp = open(str(target[0]), "w") + tfp.write(content) + tfp.close() +@@ -2190,7 +2197,7 @@ def validation_list(target, source, env) + if '-head' not in page: + fp = open(page) + if "Valid HTML" in fp.read(): +- print os.path.join(website, os.path.basename(page)) ++ print(os.path.join(website, os.path.basename(page))) + fp.close() + Utility("validation-list", [www], validation_list) + diff --git a/gpsd.changes b/gpsd.changes index 8d0e2b0..b08e9a1 100644 --- a/gpsd.changes +++ b/gpsd.changes @@ -1,3 +1,21 @@ +------------------------------------------------------------------- +Mon Nov 20 13:48:01 UTC 2017 - mpluskal@suse.com + +- Update to version 3.17: + * Repair support for non-NMEA devices requring active probing + (e.g. Garmin USB GPSes). + * Fix a SiRF driver bug that occasionally confused NTP. + * Support for Spectratime iSync GRClok and LNRClok oscillators. + * gpxlogger can reconnect when the GPS loses the fix. + * xgps and xgpsspeed moved to python-gi, + getting shut of the deprecated pygtk2 bindings. + * Default mode for xgpsspeed is now the more interesting nautical + display. + * gpsmon includes the hostname with the device display. + * gpsprof now has centimeter precision. +- Add gpsd-python3.patch to fix building with python3 +- Refresh gpsd-fix-shebang.patch + ------------------------------------------------------------------- Mon Nov 13 13:12:40 UTC 2017 - mpluskal@suse.com diff --git a/gpsd.spec b/gpsd.spec index b7a60b1..1989780 100644 --- a/gpsd.spec +++ b/gpsd.spec @@ -16,11 +16,12 @@ # -%define libgps libgps22 -%define libQgps libQgpsmm22 +%define sover +%define libgps libgps%{sover} +%define libQgps libQgpsmm%{sover} %define _udevdir %(pkg-config --variable udevdir udev) Name: gpsd -Version: 3.16 +Version: 3.17 Release: 0 Summary: Service daemon for mediating access to a GPS License: BSD-3-Clause @@ -33,6 +34,7 @@ Source3: sysconfig.gpsd Source98: http://download-mirror.savannah.gnu.org/releases/gpsd/%{name}-%{version}.tar.gz.sig Source99: %{name}.keyring Patch0: gpsd-fix-shebang.patch +Patch1: gpsd-python3.patch BuildRequires: chrpath BuildRequires: fdupes BuildRequires: gcc-c++ @@ -141,6 +143,7 @@ can run on a serial terminal or terminal emulator. %prep %setup -q %patch0 -p1 +%patch1 -p1 # don't set RPATH sed -i 's|env.Prepend.*RPATH.*|pass #\0|' SConstruct @@ -160,9 +163,11 @@ install -d -m 755 %{buildroot}%{_udevdir} install -d -m 755 %{buildroot}%{_udevdir}/rules.d install -d -m 755 %{buildroot}%{_localstatedir}/adm/fillup-templates install -d -m 755 %{buildroot}%{_datadir}/applications +install -d -m 755 %{buildroot}%{python_sitearch} install -m 644 %{SOURCE1} %{buildroot}%{_udevdir}/rules.d/51-gpsd.rules install -m 755 %{SOURCE2} %{buildroot}%{_udevdir}/gpsd.sh install -m 644 %{SOURCE3} %{buildroot}%{_localstatedir}/adm/fillup-templates +mv -f %{buildroot}%{python_sitelib}/* %{buildroot}%{python_sitearch} if [ -f %{buildroot}%{python_sitearch}/*.egg-info ] ; then rm -f %{buildroot}%{python_sitearch}/*.egg-info fi @@ -269,6 +274,8 @@ sed -i -e 's#Icon=.*/\([^/]\+\)\(\..\+\)#Icon=\1#' %{buildroot}%{_datadir}/appli %{_mandir}/man?/gpsmon.* %{_mandir}/man?/gps2udp.* %{_mandir}/man?/ntpshmmon.* +%{_mandir}/man?/ppscheck.* +%{_mandir}/man?/gpxlogger.* %{_bindir}/gegps %{_bindir}/xgps %{_bindir}/xgpsspeed @@ -279,6 +286,7 @@ sed -i -e 's#Icon=.*/\([^/]\+\)\(\..\+\)#Icon=\1#' %{buildroot}%{_datadir}/appli %{_bindir}/gps2udp %{_bindir}/gpxlogger %{_bindir}/ntpshmmon +%{_bindir}/ppscheck %{_datadir}/applications/*.desktop %{_datadir}/icons/hicolor/*/apps/*