From e4ae38aac2c05858d8e9cb4df0e6d18d870fc6c4 Mon Sep 17 00:00:00 2001 From: Miroslav Lichvar Date: Wed, 4 May 2022 15:55:43 +0200 Subject: [PATCH] update to 3.24 --- .gitignore | 1 + gpsd-apistatus.patch | 6 +++--- gpsd-soname.patch | 12 ++++++++++++ gpsd.spec | 7 +++++-- sources | 2 +- 5 files changed, 22 insertions(+), 6 deletions(-) create mode 100644 gpsd-soname.patch diff --git a/.gitignore b/.gitignore index e06e2e6..86ee295 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,4 @@ /gpsd-3.22.tar.gz /gpsd-3.23.tar.gz /gpsd-3.23.1.tar.gz +/gpsd-3.24.tar.gz diff --git a/gpsd-apistatus.patch b/gpsd-apistatus.patch index e44fee9..5380585 100644 --- a/gpsd-apistatus.patch +++ b/gpsd-apistatus.patch @@ -11,6 +11,6 @@ index 55b9aa621..e5935304d 100644 +#define STATUS_FIX STATUS_GPS +#define STATUS_DGPS_FIX STATUS_DGPS + - double ept; /* Expected time uncertainty, seconds */ - double latitude; /* Latitude in degrees (valid if mode >= 2) */ - double epy; /* Latitude position uncertainty, meters */ + double ept; // Expected time uncertainty, seconds + double latitude; // Latitude in degrees (valid if mode >= 2) + double epy; // Latitude position uncertainty, meters diff --git a/gpsd-soname.patch b/gpsd-soname.patch new file mode 100644 index 0000000..d49ea2d --- /dev/null +++ b/gpsd-soname.patch @@ -0,0 +1,12 @@ +diff -up gpsd-3.24/SConscript.soname gpsd-3.24/SConscript +--- gpsd-3.24/SConscript.soname 2022-05-04 15:50:30.809931444 +0200 ++++ gpsd-3.24/SConscript 2022-05-04 16:15:14.022203240 +0200 +@@ -221,7 +221,7 @@ api_version_major = 3 + api_version_minor = 15 + + # client library version +-libgps_version_current = 29 ++libgps_version_current = 291 + libgps_version_revision = 1 + libgps_version_age = 0 + libgps_version = "%d.%d.%d" % (libgps_version_current, libgps_version_age, diff --git a/gpsd.spec b/gpsd.spec index 24d9f4c..4358604 100644 --- a/gpsd.spec +++ b/gpsd.spec @@ -3,7 +3,7 @@ %global with_qt 1 Name: gpsd -Version: 3.23.1 +Version: 3.24 Release: 3%{?dist} Epoch: 1 Summary: Service daemon for mediating access to a GPS @@ -15,6 +15,8 @@ Source11: gpsd.sysconfig # Add old status names to gps.h for compatibility Patch1: gpsd-apistatus.patch +# Change soname to mark ABI break +Patch2: gpsd-soname.patch BuildRequires: dbus-devel BuildRequires: dbus-glib-devel @@ -108,6 +110,7 @@ This package contains various clients using gpsd. %prep %setup -q %patch1 -p1 -b .apistatus +%patch2 -p1 -b .soname # don't try reloading systemd when installing in the build root sed -i 's|systemctl daemon-reload|true|' SConscript @@ -219,7 +222,7 @@ rm -rf %{buildroot}%{_docdir}/gpsd %{_mandir}/man1/ntpshmmon.1* %files libs -%{_libdir}/libgps.so.29* +%{_libdir}/libgps.so.291* %files -n python3-%{name} %{_libdir}/libgpsdpacket.so* diff --git a/sources b/sources index d886508..7fa7417 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gpsd-3.23.1.tar.gz) = fccfac363103282581e4ea8236ce40e4600a01f02489c1aaec721a13deac556bac046a3b76f8a5e21fe8c736056e872d8c7f2e4ed2d38a164323dd9738f00388 +SHA512 (gpsd-3.24.tar.gz) = 250bae709e19ac10421d5a537e68dcdf4c025071c152cf3c84a2f6977615bd7e445a45f3b1e5f3b64123fad3c11e1ec256bae5afc1b869f499b187116f8b028b