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

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:03579af13a4d3fe0c5b79fa44b5f75c9f3cac6749357f1d99ce5d38c09bc2029
-size 8587490

gpsd-3.17.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:68e0dbecfb5831997f8b3d6ba48aed812eb465d8c0089420ab68f9ce4d85e77a
+size 8755304

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.17.orig/gps/gps.py
-+++ gpsd-3.13/gps/gps.py
++++ gpsd-3.17/gps/gps.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/python

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)
+ 

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
 

gpsd.spec

@@ -16,11 +16,12 @@
 #
 
 
-%define		libgps libgps22
+%define   sover
-%define		libQgps libQgpsmm22
+%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/*