Hello community, here is the log from the commit of package gpsd for openSUSE:Factory checked in at 2019-10-07 13:38:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gpsd (Old) and /work/SRC/openSUSE:Factory/.gpsd.new.2352 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gpsd" Mon Oct 7 13:38:06 2019 rev:50 rq:733991 version:3.19 Changes: -------- --- /work/SRC/openSUSE:Factory/gpsd/gpsd.changes 2019-09-25 01:16:05.677831650 +0200 +++ /work/SRC/openSUSE:Factory/.gpsd.new.2352/gpsd.changes 2019-10-07 13:38:10.136816707 +0200 @@ -1,0 +2,7 @@ +Sat Sep 28 10:00:28 UTC 2019 - Christophe Giboudeaux <christo...@krop.fr> + +- Add 0001-Make-sure-Qgpsmm.pc-is-usable.patch to fix the bogus values + in qgpsmm.pc +- Update the URLs + +------------------------------------------------------------------- New: ---- 0001-Make-sure-Qgpsmm.pc-is-usable.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gpsd.spec ++++++ --- /var/tmp/diff_new_pack.BMbUBc/_old 2019-10-07 13:38:11.928811753 +0200 +++ /var/tmp/diff_new_pack.BMbUBc/_new 2019-10-07 13:38:11.928811753 +0200 @@ -26,13 +26,15 @@ 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}/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 ++++++ 0001-Make-sure-Qgpsmm.pc-is-usable.patch ++++++ >From 1ab2f417451c9dcb6501952b8842ce911ce055b9 Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux <christo...@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),
