From cdbb3dd43aaf12577eb942769f0719dab09a2fcd81af105032673431decc639c Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Mon, 26 Nov 2018 08:50:36 +0000 Subject: [PATCH 1/3] Accepting request 651645 from home:mnhauke - Update to version 3.18.1 * Fix some installation issues. * A few minor updates to ubxtool and driver_ubx. * Add contrib/skyview2svg - Update to version 3.18.0 * Add ECEF support to ievermore, italk,Skytraq, SiRF, U-blox drivers. * Add ECEF support to JSON, cgps and xgps. * Add GREIS (Javad) driver from Virgin Orbit. * Add CLI tools zerk and ubxtool to manage JAVAD and u-blox GPS. * Add gnssid:svid to satellite_t, cgps and xgps. PRN will die. * Add gnssid:svid to JSON, cgps and xgps. * Add stricter version checking (more to todo). * More and better regression tests. * Better Python dependency checking, at build time and runtime. * Fix several buffer issues. * New polar plots, and improved statistice, in gpsprof. * gpsd master/slave mode works, first time ever. * All isnan() changed to !isfinite(), fixing many bugs. * Client-side Python libraries may automatically reconnect * Too many other bug fixes and improvements to mention. * Over 1,000 commits from 46 different commiters. - Update to version 3.17.0 * 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 OBS-URL: https://build.opensuse.org/request/show/651645 OBS-URL: https://build.opensuse.org/package/show/Application:Geo/gpsd?expand=0&rev=122 --- gpsd-3.17.tar.gz | 3 - gpsd-3.17.tar.gz.sig | Bin 536 -> 0 bytes gpsd-3.18.1.tar.gz | 3 + gpsd-3.18.1.tar.gz.sig | Bin 0 -> 566 bytes gpsd-python3.patch | 159 ------------------------------- gpsd.changes | 43 +++++++++ gpsd.keyring | 209 ++++++++++++++++++++++++++--------------- gpsd.spec | 27 +++--- 8 files changed, 195 insertions(+), 249 deletions(-) delete mode 100644 gpsd-3.17.tar.gz delete mode 100644 gpsd-3.17.tar.gz.sig create mode 100644 gpsd-3.18.1.tar.gz create mode 100644 gpsd-3.18.1.tar.gz.sig delete mode 100644 gpsd-python3.patch diff --git a/gpsd-3.17.tar.gz b/gpsd-3.17.tar.gz deleted file mode 100644 index dbcd669..0000000 --- a/gpsd-3.17.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -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 deleted file mode 100644 index d20409e218bddcf8d4d2ad1f2f970463598f895baf788ab12c8dbbc926448ce8..0000000000000000000000000000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 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() diff --git a/gpsd-3.18.1.tar.gz b/gpsd-3.18.1.tar.gz new file mode 100644 index 0000000..ca9fba1 --- /dev/null +++ b/gpsd-3.18.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5cb1e6d880ec9a52c62492dd0e3d77451b7c7ad625895bd652f6354215aec23e +size 9031595 diff --git a/gpsd-3.18.1.tar.gz.sig b/gpsd-3.18.1.tar.gz.sig new file mode 100644 index 0000000000000000000000000000000000000000000000000000000000000000..7c1b3ffc5ccc390fd57fa9d8793e2cac32655dc5b9d481d4bafef4becf3da546 GIT binary patch literal 566 zcmV-60?GY}0y6{v0SEvc79j)-iH%47uTZ90D6zCIYsKC!=xRO%0$a*)o&X975H4%Q z-Y)2BJ};OL|5DJ<5GOq~<>U=P0h9fqv7bQsYHjee1?V(uh|qab@~rT6BE_eb8Bsyd z2cVA8pPeIvurABva8=s%qp6_apB!=x0Di~pTJk!JJJrnXxH`i&fw`bz-O4A=3Z-22 zDfZQH0?h$Pd{X(d5?F9qYTBwz?$A9v6eV~Cs=Ei}uDJ^^k2s_8Ev!lox3ZM>49as%o&=aQ z^%yV0alvSNbCRW-OcdJ%iyY7@bpp{zHX&xa)aZK&q-pk5P1w_7+@Pb+F3p|27~tP` znG#HA6{Iiicjod$%95)_CR1dMydq67-CvI>5iM?yb(!3b<^4Y*@!Dkzo b) - (a < b) - - Help("""Arguments may be a mixture of switches and targets in any order. - Switches apply to the entire build regardless of where they are in the order. -@@ -843,9 +853,9 @@ else: - "dbus_export": ["libdbus-1"], - } - -- keys = map(lambda x: (x[0], x[2]), boolopts) \ -- + map(lambda x: (x[0], x[2]), nonboolopts) \ -- + map(lambda x: (x[0], x[2]), pathopts) -+ keys = list(map(lambda x: (x[0], x[2]), boolopts)) \ -+ + list(map(lambda x: (x[0], x[2]), nonboolopts)) \ -+ + list(map(lambda x: (x[0], x[2]), pathopts)) - keys.sort() - for (key, help) in keys: - value = env[key] -@@ -946,7 +956,7 @@ if helping: - - # If helping just get usable config info from the local Python - target_python_path = '' -- py_config_text = str(eval(PYTHON_CONFIG_CALL)) -+ Py_config_text = str(eval(PYTHON_CONFIG_CALL)) - python_libdir = str(eval(PYTHON_LIBDIR_CALL)) - - else: -@@ -982,7 +992,7 @@ else: - if env['python']: # May have been turned off by error - env['PYTHON'] = target_python_path - env['ENV']['PYTHON'] = target_python_path # For regress-driver -- py_config_vars = ast.literal_eval(py_config_text) -+ py_config_vars = ast.literal_eval(py_config_text.decode()) - py_config_vars = [[] if x is None else x for x in py_config_vars] - python_config = dict(zip(PYTHON_CONFIG_NAMES, py_config_vars)) - -@@ -1371,7 +1381,7 @@ else: - - python_objects = {} - python_compiled_libs = {} -- for ext, sources in python_extensions.iteritems(): -+ for ext, sources in python_extensions.items(): - python_objects[ext] = [] - for src in sources: - python_objects[ext].append( -@@ -1401,7 +1411,7 @@ Platform: UNKNOWN - python_egg_info = python_env.Textfile(target="gps-%s.egg-info" - % (gpsd_version, ), - source=python_egg_info_source) -- python_built_extensions = python_compiled_libs.values() -+ python_built_extensions = list(python_compiled_libs.values()) - python_targets = python_built_extensions + [python_egg_info] - - env.Command(target="packet_names.h", source="packet_states.h", action=""" -@@ -1546,8 +1556,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() -@@ -1604,14 +1614,14 @@ if env['xgps']: - "xgpsspeed.1": "gps.xml", - "xgps.1": "gps.xml", - }) --all_manpages = base_manpages.keys() + python_manpages.keys() -+all_manpages = list(base_manpages.keys()) + list(python_manpages.keys()) - - man_env = env.Clone() - if man_env.GetOption('silent'): - man_env['SPAWN'] = filtered_spawn # Suppress stderr chatter - manpage_targets = [] - if manbuilder: -- for (man, xml) in base_manpages.items() + python_manpages.items(): -+ for (man, xml) in list(base_manpages.items()) + list(python_manpages.items()): - manpage_targets.append(man_env.Man(source=xml, target=man)) - - # Where it all comes together -@@ -1692,7 +1702,7 @@ if qt_env: - - - maninstall = [] --for manpage in base_manpages.keys() + python_manpages.keys(): -+for manpage in list(base_manpages.keys()) + list(python_manpages.keys()): - if not manbuilder and not os.path.exists(manpage): - continue - section = manpage.split(".")[1] -@@ -2177,7 +2187,7 @@ htmlpages = Split(''' - www/writing-a-driver.html - ''') - --webpages = htmlpages + asciidocs + map(lambda f: f[:-3], glob.glob("www/*.in")) -+webpages = htmlpages + asciidocs + list(map(lambda f: f[:-3], glob.glob("www/*.in"))) - - www = env.Alias('www', webpages) - -@@ -2190,7 +2200,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 f2a65ff..42766a3 100644 --- a/gpsd.changes +++ b/gpsd.changes @@ -1,3 +1,46 @@ +------------------------------------------------------------------- +Sun Nov 25 16:07:56 UTC 2018 - mardnh@gmx.de + +- Update to version 3.18.1 + * Fix some installation issues. + * A few minor updates to ubxtool and driver_ubx. + * Add contrib/skyview2svg + +- Update to version 3.18.0 + * Add ECEF support to ievermore, italk,Skytraq, SiRF, U-blox drivers. + * Add ECEF support to JSON, cgps and xgps. + * Add GREIS (Javad) driver from Virgin Orbit. + * Add CLI tools zerk and ubxtool to manage JAVAD and u-blox GPS. + * Add gnssid:svid to satellite_t, cgps and xgps. PRN will die. + * Add gnssid:svid to JSON, cgps and xgps. + * Add stricter version checking (more to todo). + * More and better regression tests. + * Better Python dependency checking, at build time and runtime. + * Fix several buffer issues. + * New polar plots, and improved statistice, in gpsprof. + * gpsd master/slave mode works, first time ever. + * All isnan() changed to !isfinite(), fixing many bugs. + * Client-side Python libraries may automatically reconnect + * Too many other bug fixes and improvements to mention. + * Over 1,000 commits from 46 different commiters. + +- Update to version 3.17.0 + * 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. + +- Remove patch: + * gpsd-python3.patch (not longer needed) +- Update gpsd.keyring (old key 8C6C738D got superseeded by 0C898D47 ) + ------------------------------------------------------------------- Thu Jun 28 07:57:08 UTC 2018 - mpluskal@suse.com diff --git a/gpsd.keyring b/gpsd.keyring index 81de6d6..72fea76 100644 --- a/gpsd.keyring +++ b/gpsd.keyring @@ -1,77 +1,138 @@ -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: GnuPG v2 -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 -=e67Z +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 +icEaoyw0scVSdkO2WnmjhA== +=XpTO -----END PGP PUBLIC KEY BLOCK----- diff --git a/gpsd.spec b/gpsd.spec index 5468c4a..10e4e2b 100644 --- a/gpsd.spec +++ b/gpsd.spec @@ -16,12 +16,12 @@ # -%define sover 23 -%define libgps libgps%{sover} -%define libQgps libQgpsmm%{sover} +%define sover 24 +%define libgps libgps%{sover} +%define libQgps libQgpsmm%{sover} %define _udevdir %(pkg-config --variable udevdir udev) Name: gpsd -Version: 3.17 +Version: 3.18.1 Release: 0 Summary: Service daemon for mediating access to a GPS License: BSD-3-Clause @@ -33,7 +33,6 @@ Source2: udev.gpsd Source3: sysconfig.gpsd Source98: http://download-mirror.savannah.gnu.org/releases/gpsd/%{name}-%{version}.tar.gz.sig Source99: %{name}.keyring -Source100: gpsd-python3.patch BuildRequires: chrpath BuildRequires: fdupes BuildRequires: gcc-c++ @@ -41,6 +40,9 @@ BuildRequires: hicolor-icon-theme BuildRequires: libcap-devel BuildRequires: ncurses-devel BuildRequires: pkgconfig +BuildRequires: python3-cairo-devel +BuildRequires: python3-gobject-devel +BuildRequires: python3-pyserial BuildRequires: scons >= 2.3.0 BuildRequires: systemd-rpm-macros BuildRequires: update-desktop-files @@ -138,6 +140,7 @@ Requires: python3-cairo Requires: python3-gobject Requires: python3-gobject-Gdk Requires: python3-gpsd +Requires: python3-serial %description clients xgps is a simple test client for gpsd with an X interface. It displays @@ -157,16 +160,10 @@ 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 - sed -i 's|systemd_dir =.*|systemd_dir = '\'%{_unitdir}\''|' python*/%{name}-%{version}/SConstruct +sed -i 's|systemd_dir =.*|systemd_dir = '\'%{_unitdir}\''|' python*/%{name}-%{version}/SConstruct # don't try reloading systemd when installing in the build root sed -i 's|systemctl daemon-reload|true|' python*/%{name}-%{version}/SConstruct @@ -211,7 +208,7 @@ do # Fix python interpreter path. sed -e "s,#!%{_bindir}/\(python[23]\?\|env \+python[23]\?\),#!%{_bindir}/${pyversions[i]},g" -i \ - gegps gpscat gpsfake xgps xgpsspeed gpsprof gps/*.py + gegps gpscat gpsfake xgps xgpsspeed gpsprof ubxtool zerk gps/*.py popd done @@ -346,6 +343,8 @@ sed -i -e 's#Icon=.*/\([^/]\+\)\(\..\+\)#Icon=\1#' %{buildroot}%{_datadir}/appli %{_mandir}/man?/ntpshmmon.* %{_mandir}/man?/ppscheck.* %{_mandir}/man?/gpxlogger.* +%{_mandir}/man?/ubxtool.* +%{_mandir}/man?/zerk.* %{_bindir}/gegps %{_bindir}/xgps %{_bindir}/xgpsspeed @@ -357,6 +356,8 @@ sed -i -e 's#Icon=.*/\([^/]\+\)\(\..\+\)#Icon=\1#' %{buildroot}%{_datadir}/appli %{_bindir}/gpxlogger %{_bindir}/ntpshmmon %{_bindir}/ppscheck +%{_bindir}/ubxtool +%{_bindir}/zerk %{_datadir}/applications/*.desktop %{_datadir}/icons/hicolor/*/apps/* From 837d657667a1e37c324708094274b1f6a38a3cecc7e327a6e74d2a3b19273133 Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Wed, 12 Dec 2018 08:34:43 +0000 Subject: [PATCH 2/3] Accepting request 656930 from home:adkorte:branches:Application:Geo - Correct flag to disable stripping (nostrip=True) - Add gpsd-declaration-in-for-loop.patch to remove c99 construction (backport from upstream) - Upstream changed location of gpsd in systemd gpsd.service file (change it back to {_sbindir}) OBS-URL: https://build.opensuse.org/request/show/656930 OBS-URL: https://build.opensuse.org/package/show/Application:Geo/gpsd?expand=0&rev=123 --- gpsd-declaration-in-for-loop.patch | 19 +++++++++++++++++++ gpsd.changes | 9 +++++++++ gpsd.spec | 16 +++++++++++++--- 3 files changed, 41 insertions(+), 3 deletions(-) create mode 100644 gpsd-declaration-in-for-loop.patch diff --git a/gpsd-declaration-in-for-loop.patch b/gpsd-declaration-in-for-loop.patch new file mode 100644 index 0000000..6b483cd --- /dev/null +++ b/gpsd-declaration-in-for-loop.patch @@ -0,0 +1,19 @@ +--- gpsd-3.18.1.orig/driver_ubx.c ++++ gpsd-3.18.1/driver_ubx.c +@@ -813,6 +813,7 @@ + int8_t leapS; + uint8_t numMeas; + uint8_t recStat; ++ int i; + + if (16 > data_len) { + gpsd_log(&session->context->errout, LOG_WARN, +@@ -830,7 +831,7 @@ + "UBX_RXM_RAWX: rcvTow %f week %u leapS %d numMeas %u recStat %d\n", + rcvTow, week, leapS, numMeas, recStat); + +- for (int i = 0; i < numMeas; i++) { ++ for (i = 0; i < numMeas; i++) { + int off = 32 * i; + double prMes = getled64((const char *)buf, off + 16); + double cpMes = getled64((const char *)buf, off + 24); diff --git a/gpsd.changes b/gpsd.changes index 42766a3..89c3d7e 100644 --- a/gpsd.changes +++ b/gpsd.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Mon Dec 10 19:12:14 UTC 2018 - Arjen de Korte + +- Correct flag to disable stripping (nostrip=True) +- Add gpsd-declaration-in-for-loop.patch to remove c99 construction + (backport from upstream) +- Upstream changed location of gpsd in systemd gpsd.service file + (change it back to {_sbindir}) + ------------------------------------------------------------------- Sun Nov 25 16:07:56 UTC 2018 - mardnh@gmx.de diff --git a/gpsd.spec b/gpsd.spec index 10e4e2b..1390d14 100644 --- a/gpsd.spec +++ b/gpsd.spec @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -33,6 +33,7 @@ Source2: udev.gpsd Source3: sysconfig.gpsd Source98: http://download-mirror.savannah.gnu.org/releases/gpsd/%{name}-%{version}.tar.gz.sig Source99: %{name}.keyring +Source100: gpsd-declaration-in-for-loop.patch BuildRequires: chrpath BuildRequires: fdupes BuildRequires: gcc-c++ @@ -160,6 +161,12 @@ 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 @@ -171,6 +178,9 @@ 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 gpsd path +sed -i 's|ExecStart=.*/gpsd|ExecStart=%{_sbindir}/gpsd|' python*/%{name}-%{version}/systemd/gpsd.service + %build # The SCons description does not handle CXXFLAGS correctly, pass C++ flags also in CFLAGS export CFLAGS="%{optflags}" @@ -221,7 +231,7 @@ export CPPFLAGS="%{optflags}" # Install python2 first pushd %{name}-%{version}/python2/%{name}-%{version} -DESTDIR=%{buildroot} scons strip=False install +DESTDIR=%{buildroot} scons nostrip=True install # Now delete all the installed files except the python2 files find %{buildroot} \( -not -type d -a -not -path "*/python2.*/*" \) -delete @@ -229,7 +239,7 @@ find %{buildroot} \( -not -type d -a -not -path "*/python2.*/*" \) -delete popd pushd %{name}-%{version}/python3/%{name}-%{version} -DESTDIR=%{buildroot} scons strip=False install +DESTDIR=%{buildroot} scons nostrip=True install install -d -m 755 %{buildroot}%{_udevdir} install -d -m 755 %{buildroot}%{_udevdir}/rules.d From 2fc4434df0ec7bee860e8d564a938a8753f00922fbcfe367865877f1624111a1 Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Wed, 12 Dec 2018 08:35:28 +0000 Subject: [PATCH 3/3] OBS-URL: https://build.opensuse.org/package/show/Application:Geo/gpsd?expand=0&rev=124 --- gpsd.changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gpsd.changes b/gpsd.changes index 89c3d7e..806b337 100644 --- a/gpsd.changes +++ b/gpsd.changes @@ -3,7 +3,7 @@ Mon Dec 10 19:12:14 UTC 2018 - Arjen de Korte - Correct flag to disable stripping (nostrip=True) - Add gpsd-declaration-in-for-loop.patch to remove c99 construction - (backport from upstream) + (backport from upstream), fixes building for Leap-42.3 - Upstream changed location of gpsd in systemd gpsd.service file (change it back to {_sbindir})