Accepting request 733841 from home:cgiboudeaux:branches:Application:Geo

- Add 0001-Make-sure-Qgpsmm.pc-is-usable.patch to fix the bogus values
  in qgpsmm.pc
- Update the URLs

OBS-URL: https://build.opensuse.org/request/show/733841
OBS-URL: https://build.opensuse.org/package/show/Application:Geo/gpsd?expand=0&rev=128

0001-Make-sure-Qgpsmm.pc-is-usable.patch

@@ -0,0 +1,44 @@
+From 1ab2f417451c9dcb6501952b8842ce911ce055b9 Mon Sep 17 00:00:00 2001
+From: Christophe Giboudeaux <christophe@krop.fr>
+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),

gpsd.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Sat Sep 28 10:00:28 UTC 2019 - Christophe Giboudeaux <christophe@krop.fr>
+
+- Add 0001-Make-sure-Qgpsmm.pc-is-usable.patch to fix the bogus values
+  in qgpsmm.pc
+- Update the URLs
+
 -------------------------------------------------------------------
 Tue Sep 17 17:09:20 UTC 2019 - suse+build@de-korte.org
 

gpsd.spec

@@ -26,13 +26,15 @@ Release:        0
 Summary:        Service daemon for mediating access to a GPS
 License:        BSD-3-Clause
 Group:          Hardware/Other
-URL:            http://www.catb.org/gpsd/
-Source0:        http://download-mirror.savannah.gnu.org/releases/gpsd/%{name}-%{version}.tar.gz
+URL:            https://gpsd.gitlab.io/gpsd/
+Source0:        https://download-mirror.savannah.gnu.org/releases/gpsd/%{name}-%{version}.tar.gz
 Source1:        rules.gpsd
 Source2:        udev.gpsd
 Source3:        sysconfig.gpsd
-Source98:       http://download-mirror.savannah.gnu.org/releases/gpsd/%{name}-%{version}.tar.gz.sig
+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++
@@ -160,6 +162,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