Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package ocli for openSUSE:Factory checked in at 2021-10-29 22:34:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ocli (Old) and /work/SRC/openSUSE:Factory/.ocli.new.1890 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ocli" Fri Oct 29 22:34:27 2021 rev:5 rq:928118 version:0.9.0 Changes: -------- --- /work/SRC/openSUSE:Factory/ocli/ocli.changes 2020-11-08 20:59:48.548230772 +0100 +++ /work/SRC/openSUSE:Factory/.ocli.new.1890/ocli.changes 2021-10-29 22:35:35.079712747 +0200 @@ -1,0 +2,6 @@ +Mon Oct 25 22:05:54 UTC 2021 - Martin Hauke <[email protected]> + +- Add patch: + * 0001-FIX-adapted-for-gpsd-3.23.1.patch + +------------------------------------------------------------------- New: ---- 0001-FIX-adapted-for-gpsd-3.23.1.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ocli.spec ++++++ --- /var/tmp/diff_new_pack.gyBi3C/_old 2021-10-29 22:35:35.479712899 +0200 +++ /var/tmp/diff_new_pack.gyBi3C/_new 2021-10-29 22:35:35.483712900 +0200 @@ -1,8 +1,8 @@ # # spec file for package ocli # -# Copyright (c) 2020 SUSE LLC -# Copyright (c) 2020, Martin Hauke <[email protected]> +# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2020-2021, Martin Hauke <[email protected]> # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -27,6 +27,7 @@ Source: https://github.com/owntracks/%{name}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz Patch0: 0001-FIX-adapted-for-gpsd-3.20.patch Patch1: 0001-FIX-adapted-for-gpsd-3.21.patch +Patch2: 0001-FIX-adapted-for-gpsd-3.23.1.patch BuildRequires: gpsd-devel BuildRequires: mosquitto-devel Provides: owntracks-cli-publisher @@ -41,6 +42,7 @@ %setup -q %patch0 -p1 %patch1 -p1 +%patch2 -p1 %build export CFLAGS="%{optflags}" ++++++ 0001-FIX-adapted-for-gpsd-3.23.1.patch ++++++ >From 52dcf57f14c771c3d90c82ada688de7767e06ba6 Mon Sep 17 00:00:00 2001 From: Tuukka Pasanen <[email protected]> Date: Thu, 14 Oct 2021 11:27:05 +0300 Subject: [PATCH] [FIX] adapted for gpsd >= 3.23.1 As ifdef to make this compile wiht gpsd 3.23.1 by changind status defines * Change STATUS_NO_FIX to STATUS_UNK to avoid confusion with fix mode. * Change STATUS_FIX to STATUS_GPS to avoid confusion with fix mode. * Change STATUS_DGPS_FIX to STATUS_DGPS to avoid confusion with fix mode. --- owntracks-cli-publisher.c | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/owntracks-cli-publisher.c b/owntracks-cli-publisher.c index 7c60d40..e695f8f 100644 --- a/owntracks-cli-publisher.c +++ b/owntracks-cli-publisher.c @@ -399,9 +399,17 @@ static void conditionally_log_fix(struct udata *ud, struct gps_data_t *gpsdata) #else switch (gpsdata->status) { #endif - case STATUS_FIX: +#ifdef STATUS_FIX + case STATUS_FIX: +#endif +#ifdef STATUS_GPS + case STATUS_GPS: +#endif #ifdef STATUS_DGPS_FIX - case STATUS_DGPS_FIX: + case STATUS_DGPS_FIX: +#endif +#ifdef STATUS_DGPS + case STATUS_DGPS: #endif switch (gpsdata->fix.mode) { case MODE_2D: @@ -436,7 +444,12 @@ static void conditionally_log_fix(struct udata *ud, struct gps_data_t *gpsdata) } break; - case STATUS_NO_FIX: +#ifdef STATUS_NO_FIX + case STATUS_NO_FIX: +#endif +#ifdef STATUS_UNK + case STATUS_UNK: +#endif if (ud->verbose) { fprintf(stderr, ".. no fix\n"); } -- 2.33.1
