Merge branch 'master' into epel8

This commit is contained in:
Fabian Affolter 2019-10-21 16:58:14 +02:00
commit fc4bcd57e4
No known key found for this signature in database
GPG Key ID: E23CD2DD36A4397F
3 changed files with 24 additions and 8 deletions

1
.gitignore vendored
View File

@ -16,3 +16,4 @@
/gpsd-3.17.tar.gz
/gpsd-3.18.tar.gz
/gpsd-3.18.1.tar.gz
/gpsd-3.19.tar.gz

View File

@ -4,8 +4,8 @@
%global with_qt 1
Name: %{srcname}
Version: 3.18.1
Release: 2%{?dist}
Version: 3.19
Release: 4%{?dist}
Summary: Service daemon for mediating access to a GPS
License: BSD
@ -128,7 +128,7 @@ export CCFLAGS="%{optflags}"
export LINKFLAGS="%{__global_ldflags}"
# breaks with %{_smp_mflags}
scons-3 \
scons \
dbus_export=yes \
systemd=yes \
%if %{with_qt}
@ -162,7 +162,7 @@ sed -e "s,#!/usr/bin/\(python[23]\?\|env \+python[23]\?\),#!/usr/bin/python3,g"
export CCFLAGS="%{optflags}"
export LINKFLAGS="%{__global_ldflags}"
DESTDIR=%{buildroot} scons-3 install systemd_install udev-install
DESTDIR=%{buildroot} scons install systemd_install udev-install
# use the old name for udev rules
mv %{buildroot}%{_udevrulesdir}/{25,99}-gpsd.rules
@ -202,7 +202,7 @@ desktop-file-install \
%postun
# Don't restart the service
%systemd_postun
%systemd_postun gpsd.service gpsd.socket
%ldconfig_scriptlets libs
@ -233,7 +233,7 @@ desktop-file-install \
%{_mandir}/man1/ntpshmmon.1*
%files libs
%{_libdir}/libgps.so.24*
%{_libdir}/libgps.so.25*
%files -n python3-%{srcname}
%{_bindir}/gpsprof
@ -255,7 +255,7 @@ desktop-file-install \
%if %{with_qt}
%files qt
%{_libdir}/libQgpsmm.so.24*
%{_libdir}/libQgpsmm.so.25*
%files qt-devel
%{_libdir}/libQgpsmm.so
@ -271,6 +271,7 @@ desktop-file-install \
%{_bindir}/gpscat
%{_bindir}/gpsdecode
%{_bindir}/gpspipe
%{_bindir}/gpsrinex
%{_bindir}/gpxlogger
%{_bindir}/lcdgps
%{_bindir}/xgps
@ -283,6 +284,7 @@ desktop-file-install \
%{_mandir}/man1/gps2udp.1*
%{_mandir}/man1/gpsdecode.1*
%{_mandir}/man1/gpspipe.1*
%{_mandir}/man1/gpsrinex.1*
%{_mandir}/man1/gpxlogger.1*
%{_mandir}/man1/lcdgps.1*
%{_mandir}/man1/xgps.1*
@ -300,6 +302,19 @@ desktop-file-install \
%changelog
* Thu Oct 03 2019 Miro Hrončok <mhroncok@redhat.com> - 3.19-4
- Rebuilt for Python 3.8.0rc1 (#1748018)
* Mon Aug 19 2019 Miro Hrončok <mhroncok@redhat.com> - 3.19-3
- Rebuilt for Python 3.8
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.19-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Tue Jul 02 2019 Miroslav Lichvar <mlichvar@redhat.com> - 3.19-1
- update to 3.19
- fix systemd scriptlet (#1716467)
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.18.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild

View File

@ -1 +1 @@
SHA512 (gpsd-3.18.1.tar.gz) = b381b177fcd29089a61aa11f5df2c67473720a6bbc5590ca1c4fda627331c407de01c62caceeddae780626b9a02392e9a770d52a143357e1babdcc2fbff0ed38
SHA512 (gpsd-3.19.tar.gz) = c9f9a9ff65759f852771ec4cf97ab15343c9176a149dd5ea6c2e2dc18b47aa7c7bf9ff1f2e8523121564d33a34ae6aa08169c5454847b4fe7848e616fd20a814