From 8631b37bbb62be7cfd644104cc45d219bd9d51e3 Mon Sep 17 00:00:00 2001
From: Miroslav Lichvar <mlichvar@redhat.com>
Date: Wed, 11 Jan 2023 12:08:07 +0100
Subject: [PATCH] update to 3.25

---
 .gitignore        |  1 +
 gpsd-soname.patch | 12 ------------
 gpsd.spec         | 10 ++++------
 sources           |  2 +-
 4 files changed, 6 insertions(+), 19 deletions(-)
 delete mode 100644 gpsd-soname.patch

diff --git a/.gitignore b/.gitignore
index 86ee295..fb6a1aa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,3 +22,4 @@
 /gpsd-3.23.tar.gz
 /gpsd-3.23.1.tar.gz
 /gpsd-3.24.tar.gz
+/gpsd-3.25.tar.gz
diff --git a/gpsd-soname.patch b/gpsd-soname.patch
deleted file mode 100644
index d49ea2d..0000000
--- a/gpsd-soname.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-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 ee765f7..712f9dd 100644
--- a/gpsd.spec
+++ b/gpsd.spec
@@ -3,7 +3,7 @@
 %global with_qt 1
 
 Name:           gpsd
-Version:        3.24
+Version:        3.25
 Release:        3%{?dist}
 Epoch:          1
 Summary:        Service daemon for mediating access to a GPS
@@ -15,8 +15,6 @@ 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            
@@ -110,7 +108,6 @@ 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
@@ -137,6 +134,7 @@ scons \
 	libdir=%{_libdir} \
 	sbindir=%{_sbindir} \
 	mandir=%{_mandir} \
+	mibdir=%{_docdir}/gpsd \
 	docdir=%{_docdir}/gpsd \
 	pkgconfigdir=%{_libdir}/pkgconfig \
 	icondir=%{_datadir}/gpsd \
@@ -222,7 +220,7 @@ rm -rf %{buildroot}%{_docdir}/gpsd
 %{_mandir}/man1/ntpshmmon.1*
 
 %files libs
-%{_libdir}/libgps.so.291*
+%{_libdir}/libgps.so.30*
 
 %files -n python3-%{name}
 %{_libdir}/libgpsdpacket.so*
@@ -240,7 +238,7 @@ rm -rf %{buildroot}%{_docdir}/gpsd
 
 %if %{with_qt}
 %files qt
-%{_libdir}/libQgpsmm.so.29*
+%{_libdir}/libQgpsmm.so.30*
 
 %files qt-devel
 %{_libdir}/libQgpsmm.so
diff --git a/sources b/sources
index 7fa7417..6e72aca 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (gpsd-3.24.tar.gz) = 250bae709e19ac10421d5a537e68dcdf4c025071c152cf3c84a2f6977615bd7e445a45f3b1e5f3b64123fad3c11e1ec256bae5afc1b869f499b187116f8b028b
+SHA512 (gpsd-3.25.tar.gz) = 0684cbd30defa1a328898589e1d61b2431462a774aff56c588bd00c1fbd92ac94cf6fc1f2b981debac78c34ab09fa24f48ed6334f3ecd09e6b8f5faa92ae1085