update to 3.22
This commit is contained in:
Miroslav Lichvar
parent
8706b63ec9
commit
da97ecdcf3
1
.gitignore
vendored
1
.gitignore
vendored
@ -18,3 +18,4 @@
|
||||
/gpsd-3.18.1.tar.gz
|
||||
/gpsd-3.19.tar.gz
|
||||
/gpsd-3.20.tar.gz
|
||||
/gpsd-3.22.tar.gz
|
||||
|
||||
@ -1,12 +0,0 @@
|
||||
diff -up gpsd-3.20/SConstruct.soname gpsd-3.20/SConstruct
|
||||
--- gpsd-3.20/SConstruct.soname 2020-06-18 10:55:31.886824453 +0200
|
||||
+++ gpsd-3.20/SConstruct 2020-06-18 10:55:37.154839300 +0200
|
||||
@@ -65,7 +65,7 @@ import SCons
|
||||
# package version
|
||||
gpsd_version = "3.20"
|
||||
# client library version
|
||||
-libgps_version_current = 25
|
||||
+libgps_version_current = 26
|
||||
libgps_version_revision = 0
|
||||
libgps_version_age = 0
|
||||
libgps_version = "%d.%d.%d" % (libgps_version_current, libgps_version_age,
|
||||
47
gpsd.spec
47
gpsd.spec
@ -3,7 +3,7 @@
|
||||
%global with_qt 1
|
||||
|
||||
Name: gpsd
|
||||
Version: 3.20
|
||||
Version: 3.22
|
||||
Release: 2%{?dist}
|
||||
Epoch: 1
|
||||
Summary: Service daemon for mediating access to a GPS
|
||||
@ -13,8 +13,6 @@ URL: http://catb.org/gpsd/
|
||||
Source0: https://download-mirror.savannah.gnu.org/releases/gpsd/%{name}-%{version}.tar.gz
|
||||
Source11: gpsd.sysconfig
|
||||
|
||||
Patch1: gpsd-soname.patch
|
||||
|
||||
BuildRequires: dbus-devel
|
||||
BuildRequires: dbus-glib-devel
|
||||
BuildRequires: ncurses-devel
|
||||
@ -118,23 +116,9 @@ different gps devices.
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch1 -p1 -b .soname
|
||||
|
||||
# fix paths in systemd unit files
|
||||
sed -i 's|/usr/local/sbin|%{_sbindir}|' systemd/*.service
|
||||
|
||||
# set gpsd revision string to include package revision
|
||||
sed -i 's|^revision=.*REVISION.*$|revision='\'\
|
||||
'#define REVISION "%{version}-%{release}'\"\'\| SConstruct
|
||||
|
||||
# fix systemd path
|
||||
sed -i 's|systemd_dir =.*|systemd_dir = '\'%{_unitdir}\''|' SConstruct
|
||||
|
||||
# don't try reloading systemd when installing in the build root
|
||||
sed -i 's|systemctl daemon-reload|true|' SConstruct
|
||||
|
||||
# don't set RPATH
|
||||
sed -i 's|env.Prepend.*RPATH.*|pass #\0|' SConstruct
|
||||
sed -i 's|systemctl daemon-reload|true|' SConscript
|
||||
|
||||
%build
|
||||
export CCFLAGS="%{optflags}"
|
||||
@ -158,17 +142,16 @@ scons \
|
||||
libdir=%{_libdir} \
|
||||
sbindir=%{_sbindir} \
|
||||
mandir=%{_mandir} \
|
||||
docdir=%{_docdir} \
|
||||
docdir=%{_docdir}/gpsd \
|
||||
pkgconfigdir=%{_libdir}/pkgconfig \
|
||||
icondir=%{_datadir}/gpsd \
|
||||
udevdir=$(dirname %{_udevrulesdir}) \
|
||||
unitdir=%{_unitdir} \
|
||||
target_python=python3 \
|
||||
python_shebang=%{python3} \
|
||||
python_libdir=%{python3_sitearch} \
|
||||
build
|
||||
|
||||
# Fix python interpreter path.
|
||||
sed -e "s,#!/usr/bin/\(python[23]\?\|env \+python[23]\?\),#!/usr/bin/python3,g" -i \
|
||||
gegps gpscat gpsfake xgps xgpsspeed gpsprof gps/*.py ubxtool zerk
|
||||
|
||||
%install
|
||||
# avoid rebuilding
|
||||
export CCFLAGS="%{optflags}"
|
||||
@ -191,10 +174,6 @@ desktop-file-install \
|
||||
--dir %{buildroot}%{_datadir}/applications \
|
||||
packaging/X11/xgpsspeed.desktop
|
||||
|
||||
# Install logo icon for .desktop files
|
||||
%{__install} -d -m 0755 %{buildroot}%{_datadir}/gpsd
|
||||
%{__install} -p -m 0644 packaging/X11/gpsd-logo.png %{buildroot}%{_datadir}/gpsd/gpsd-logo.png
|
||||
|
||||
# Missed in scons install
|
||||
%{__install} -p -m 0755 gpsinit %{buildroot}%{_sbindir}
|
||||
|
||||
@ -206,6 +185,8 @@ desktop-file-install \
|
||||
%{buildroot}%{_mandir}/man3/libQgpsmm.3*
|
||||
%endif
|
||||
|
||||
rm -rf %{buildroot}%{_docdir}/gpsd
|
||||
|
||||
%post
|
||||
%systemd_post gpsd.service gpsd.socket
|
||||
|
||||
@ -246,11 +227,12 @@ desktop-file-install \
|
||||
%{_mandir}/man1/ntpshmmon.1*
|
||||
|
||||
%files libs
|
||||
%{_libdir}/libgps.so.26*
|
||||
%{_libdir}/libgps.so.28*
|
||||
|
||||
%files -n python3-%{name}
|
||||
%{_bindir}/gpsprof
|
||||
%{_mandir}/man1/gpsprof.1*
|
||||
%{_libdir}/libgpsdpacket.so*
|
||||
%{python3_sitearch}/gps*
|
||||
%exclude %{python3_sitearch}/gps/fake*
|
||||
%exclude %{python3_sitearch}/gps/__pycache__/fake*
|
||||
@ -264,11 +246,10 @@ desktop-file-install \
|
||||
%{_mandir}/man3/libgps.3*
|
||||
%{_mandir}/man3/libgpsmm.3*
|
||||
%{_mandir}/man5/gpsd_json.5*
|
||||
%{_mandir}/man5/srec.5*
|
||||
|
||||
%if %{with_qt}
|
||||
%files qt
|
||||
%{_libdir}/libQgpsmm.so.26*
|
||||
%{_libdir}/libQgpsmm.so.28*
|
||||
|
||||
%files qt-devel
|
||||
%{_libdir}/libQgpsmm.so
|
||||
@ -282,9 +263,12 @@ desktop-file-install \
|
||||
%{_bindir}/gegps
|
||||
%{_bindir}/gps2udp
|
||||
%{_bindir}/gpscat
|
||||
%{_bindir}/gpscsv
|
||||
%{_bindir}/gpsdecode
|
||||
%{_bindir}/gpspipe
|
||||
%{_bindir}/gpsplot
|
||||
%{_bindir}/gpsrinex
|
||||
%{_bindir}/gpssubframe
|
||||
%{_bindir}/gpxlogger
|
||||
%{_bindir}/lcdgps
|
||||
%{_bindir}/xgps
|
||||
@ -295,9 +279,12 @@ desktop-file-install \
|
||||
%{_mandir}/man1/gegps.1*
|
||||
%{_mandir}/man1/gps.1*
|
||||
%{_mandir}/man1/gps2udp.1*
|
||||
%{_mandir}/man1/gpscsv.1*
|
||||
%{_mandir}/man1/gpsdecode.1*
|
||||
%{_mandir}/man1/gpspipe.1*
|
||||
%{_mandir}/man1/gpsplot.1*
|
||||
%{_mandir}/man1/gpsrinex.1*
|
||||
%{_mandir}/man1/gpssubframe.1*
|
||||
%{_mandir}/man1/gpxlogger.1*
|
||||
%{_mandir}/man1/lcdgps.1*
|
||||
%{_mandir}/man1/xgps.1*
|
||||
|
||||
2
sources
2
sources
@ -1 +1 @@
|
||||
SHA512 (gpsd-3.20.tar.gz) = 557ef5e5f3b511da4fc441f4bb2e0cd2e23c2981e8b3ce2999973767a04fde070d3ec6f14af60d0e471320078e9f4d1144e5796e7927975ecfbd55fc97f470a9
|
||||
SHA512 (gpsd-3.22.tar.gz) = 4ed08e92b17f8f1bcef6be66f7bb232994d419d1638af0d435a5b03800dcde070accdecb707ea27cceebd333ab597fd0b3a77f405542b488626cb4f1efbe856b
|
||||
|
||||
Loading…
Reference in New Issue
Block a user