packages/gpsd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!2 Upgrade to 3.25

Browse Source 
From: @misaka00251 
Reviewed-by: @leeffo 
Signed-off-by: @leeffo
This commit is contained in:
openeuler-ci-bot 2023-08-29 07:40:07 +00:00 committed by Gitee
commit 37eb8804d0
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
4 changed files with 70 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
gpsd-3.24.tar.gz
View File

Binary file not shown.

BIN
gpsd-3.25.tar.gz Normal file
View File

Binary file not shown.

12
gpsd-soname.patch
View File

@ -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,

121
gpsd.spec
View File

@ -1,9 +1,7 @@
%global _hardened_build 1
%global with_qt 1 %global with_qt 1
Name: gpsd Name: gpsd
Version: 3.24 Version: 3.25
Release: 1 Release: 1
Epoch: 1 Epoch: 1
Summary: Service daemon for mediating access to a GPS Summary: Service daemon for mediating access to a GPS
@ -14,34 +12,32 @@ Source0: https://download-mirror.savannah.gnu.org/releases/gpsd/%{name}-%
Source11: gpsd.sysconfig Source11: gpsd.sysconfig
# Compatibility patch # Compatibility patch
Patch1: gpsd-apistatus.patch Patch1: gpsd-apistatus.patch
Patch2: gpsd-soname.patch
BuildRequires: dbus-devel BuildRequires: gcc
BuildRequires: dbus-glib-devel BuildRequires: dbus-devel
BuildRequires: ncurses-devel BuildRequires: ncurses-devel
BuildRequires: xmlto BuildRequires: python3-devel
BuildRequires: python3-devel BuildRequires: python3-setuptools
BuildRequires: python-setuptools BuildRequires: gtk3-devel
BuildRequires: gtk3-devel BuildRequires: python3-scons
BuildRequires: python-scons BuildRequires: python3-gobject
BuildRequires: python3-gobject BuildRequires: python3-cairo
BuildRequires: python-cairo BuildRequires: python3-pyserial
BuildRequires: python3-pyserial BuildRequires: desktop-file-utils
BuildRequires: desktop-file-utils BuildRequires: bluez-libs-devel
BuildRequires: bluez-libs-devel BuildRequires: pps-tools-devel
BuildRequires: pps-tools-devel BuildRequires: systemd
BuildRequires: /usr/bin/c++
BuildRequires: systemd
%if %{with_qt} %if %{with_qt}
BuildRequires: gcc-c++
BuildRequires: qt-devel BuildRequires: qt-devel
%endif %endif
BuildRequires: libusb1-devel BuildRequires: libusb1-devel
Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release} Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release}
Requires: udev Requires: udev
%{?systemd_requires} %{?systemd_requires}
%description %description
gpsd is a service daemon that mediates access to a GPS sensor gpsd is a service daemon that mediates access to a GPS sensor
connected to the host computer by serial or USB interface, making its connected to the host computer by serial or USB interface, making its
data on the location/course/velocity of the sensor available to be data on the location/course/velocity of the sensor available to be
@ -49,27 +45,28 @@ queried on TCP port 2947 of the host computer. With gpsd, multiple
GPS client applications (such as navigational and war-driving software) GPS client applications (such as navigational and war-driving software)
can share access to a GPS without contention or loss of data. Also, can share access to a GPS without contention or loss of data. Also,
gpsd responds to queries with a format that is substantially easier to gpsd responds to queries with a format that is substantially easier to
parse than NMEA 0183. parse than NMEA 0183.
%package libs %package libs
Summary: Client libraries in C for talking to a running gpsd or GPS Summary: Client libraries in C for talking to a running gpsd or GPS
%description libs %description libs
This package contains the gpsd libraries that manage access This package contains the gpsd libraries that manage access
to a GPS for applications. to a GPS for applications.
%package -n python-%{name} %package -n python3-%{name}
Summary: Python libraries and modules for use with gpsd Summary: Python libraries and modules for use with gpsd
Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release} Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release}
Requires: python3-pyserial
%{?python_provide:%python_provide python3-%{name}} %{?python_provide:%python_provide python3-%{name}}
%description -n python-%{name} %description -n python3-%{name}
This package contains the python3 modules that manage access to a GPS for This package contains the python3 modules that manage access to a GPS for
applications. applications.
%package devel %package devel
Summary: Development files for the gpsd library Summary: Development files for the gpsd library
Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release} Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release}
%description devel %description devel
This package provides C header files for the gpsd shared libraries that This package provides C header files for the gpsd shared libraries that
@ -77,17 +74,17 @@ manage access to a GPS for applications
%if %{with_qt} %if %{with_qt}
%package qt %package qt
Summary: C++/Qt5 bindings for the gpsd library Summary: C++/Qt5 bindings for the gpsd library
Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release} Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release}
%description qt %description qt
This package provide C++ and Qt bindings for use with the libgps library from This package provide C++ and Qt bindings for use with the libgps library from
gpsd. gpsd.
%package qt-devel %package qt-devel
Summary: Development files for the C++/Qt5 bindings for the gpsd library Summary: Development files for the C++/Qt5 bindings for the gpsd library
Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release} Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release}
Requires: %{name}-qt%{?_isa} = %{epoch}:%{version}-%{release} Requires: %{name}-qt%{?_isa} = %{epoch}:%{version}-%{release}
%description qt-devel %description qt-devel
This package provides the development files for the C++ and Qt bindings for use This package provides the development files for the C++ and Qt bindings for use
@ -95,18 +92,28 @@ with the libgps library from gpsd.
%endif %endif
%package clients %package clients
Summary: Clients for gpsd Summary: Clients for gpsd
Requires: python-%{name} = %{epoch}:%{version}-%{release} Requires: python3-%{name} = %{epoch}:%{version}-%{release}
Requires: python-pyserial Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release}
Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release}
%description clients %description clients
This package contains various clients using gpsd. This package contains various clients using gpsd.
%package xclients
Summary: Graphical clients for gpsd
Requires: python3-%{name} = %{epoch}:%{version}-%{release}
Requires: python3-cairo
Requires: python3-gobject
Requires: gtk3
# split from clients package
Conflicts: gpsd-clients < 1:3.25-1
%description xclients
This package contains X clients using gpsd.
%prep %prep
%setup -q %setup -q
%patch1 -p1 -b .apistatus %patch1 -p1 -b .apistatus
%patch2 -p1 -b .soname
sed -i 's|systemctl daemon-reload|true|' SConscript sed -i 's|systemctl daemon-reload|true|' SConscript
@ -123,12 +130,13 @@ scons \
dbus_export=yes \ dbus_export=yes \
systemd=yes \ systemd=yes \
%if %{with_qt} %if %{with_qt}
libQgpsmm=yes \ qt=yes \
%else %else
libQgpsmm=no \ qt=no \
%endif %endif
debug=yes \ debug=yes \
leapfetch=no \ leapfetch=no \
manbuild=no \
prefix="" \ prefix="" \
sysconfdif=%{_sysconfdir} \ sysconfdif=%{_sysconfdir} \
bindir=%{_bindir} \ bindir=%{_bindir} \
@ -136,6 +144,7 @@ scons \
libdir=%{_libdir} \ libdir=%{_libdir} \
sbindir=%{_sbindir} \ sbindir=%{_sbindir} \
mandir=%{_mandir} \ mandir=%{_mandir} \
mibdir=%{_docdir}/gpsd \
docdir=%{_docdir}/gpsd \ docdir=%{_docdir}/gpsd \
pkgconfigdir=%{_libdir}/pkgconfig \ pkgconfigdir=%{_libdir}/pkgconfig \
icondir=%{_datadir}/gpsd \ icondir=%{_datadir}/gpsd \
@ -171,9 +180,14 @@ desktop-file-install \
--dir %{buildroot}%{_datadir}/applications \ --dir %{buildroot}%{_datadir}/applications \
packaging/X11/xgpsspeed.desktop packaging/X11/xgpsspeed.desktop
# Missed in scons install # Missed in scons install
%{__install} -p -m 0755 gpsinit %{buildroot}%{_sbindir} %{__install} -p -m 0755 gpsinit %{buildroot}%{_sbindir}
# Fix permissions
chmod 644 %{buildroot}%{python3_sitearch}/gps/gps.py
rm -f %{buildroot}%{_libdir}/libgpsdpacket.so
# If qt build was disabled, clean up the files that may have been installed # If qt build was disabled, clean up the files that may have been installed
# anyway # anyway
%if !%{with_qt} %if !%{with_qt}
@ -224,9 +238,9 @@ rm -rf %{buildroot}%{_docdir}/gpsd
%{_mandir}/man1/ntpshmmon.1* %{_mandir}/man1/ntpshmmon.1*
%files libs %files libs
%{_libdir}/libgps.so.29* %{_libdir}/libgps.so.30*
%files -n python-%{name} %files -n python3-%{name}
%{_libdir}/libgpsdpacket.so* %{_libdir}/libgpsdpacket.so*
%{python3_sitearch}/gps* %{python3_sitearch}/gps*
@ -242,7 +256,7 @@ rm -rf %{buildroot}%{_docdir}/gpsd
%if %{with_qt} %if %{with_qt}
%files qt %files qt
%{_libdir}/libQgpsmm.so.29* %{_libdir}/libQgpsmm.so.30*
%files qt-devel %files qt-devel
%{_libdir}/libQgpsmm.so %{_libdir}/libQgpsmm.so
@ -267,8 +281,6 @@ rm -rf %{buildroot}%{_docdir}/gpsd
%{_bindir}/gpssubframe %{_bindir}/gpssubframe
%{_bindir}/gpxlogger %{_bindir}/gpxlogger
%{_bindir}/lcdgps %{_bindir}/lcdgps
%{_bindir}/xgps
%{_bindir}/xgpsspeed
%{_bindir}/gpsfake %{_bindir}/gpsfake
%{_bindir}/ubxtool %{_bindir}/ubxtool
%{_bindir}/zerk %{_bindir}/zerk
@ -286,17 +298,24 @@ rm -rf %{buildroot}%{_docdir}/gpsd
%{_mandir}/man1/gpssubframe.1* %{_mandir}/man1/gpssubframe.1*
%{_mandir}/man1/gpxlogger.1* %{_mandir}/man1/gpxlogger.1*
%{_mandir}/man1/lcdgps.1* %{_mandir}/man1/lcdgps.1*
%{_mandir}/man1/xgps.1*
%{_mandir}/man1/xgpsspeed.1*
%{_mandir}/man1/cgps.1* %{_mandir}/man1/cgps.1*
%{_mandir}/man1/gpscat.1* %{_mandir}/man1/gpscat.1*
%{_mandir}/man1/gpsfake.1* %{_mandir}/man1/gpsfake.1*
%{_mandir}/man1/ubxtool.1* %{_mandir}/man1/ubxtool.1*
%{_mandir}/man1/zerk.1* %{_mandir}/man1/zerk.1*
%files xclients
%{_bindir}/xgps
%{_bindir}/xgpsspeed
%{_datadir}/applications/*.desktop %{_datadir}/applications/*.desktop
%dir %{_datadir}/gpsd %dir %{_datadir}/gpsd
%{_datadir}/gpsd/gpsd-logo.png %{_datadir}/gpsd/gpsd-logo.png
%{_mandir}/man1/xgps.1*
%{_mandir}/man1/xgpsspeed.1*
%changelog %changelog
* Tue Aug 29 2023 misaka00251 <liuxin@iscas.ac.cn> - 1:3.25-1
- Upgrade to 3.25
* Fri Jul 15 2022 misaka00251 <misaka00251@misakanet.cn> - 1:3.24-1 * Fri Jul 15 2022 misaka00251 <misaka00251@misakanet.cn> - 1:3.24-1
- Init package - Init package