use python3 scons and fix build requirements for xgps

This commit is contained in:
Miroslav Lichvar 2018-10-09 11:07:25 +02:00
parent 41bdb9e524
commit c72607e884

View File

@ -15,7 +15,8 @@ Source0: https://download-mirror.savannah.gnu.org/releases/gpsd/%{name}-%{versio
Source11: gpsd.sysconfig
BuildRequires: dbus-devel dbus-glib-devel ncurses-devel xmlto python3-devel
BuildRequires: scons desktop-file-utils bluez-libs-devel pps-tools-devel /usr/bin/c++
BuildRequires: python3-scons python3-gobject python3-cairo
BuildRequires: desktop-file-utils bluez-libs-devel pps-tools-devel /usr/bin/c++
BuildRequires: systemd
%if %{with_qt}
BuildRequires: qt-devel
@ -131,7 +132,7 @@ export CCFLAGS="%{optflags}"
export LINKFLAGS="%{__global_ldflags}"
# breaks with %{_smp_mflags}
scons \
scons-3 \
dbus_export=yes \
systemd=yes \
%if %{with_qt}
@ -165,7 +166,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 install systemd_install udev-install
DESTDIR=%{buildroot} scons-3 install systemd_install udev-install
# use the old name for udev rules
mv %{buildroot}%{_udevrulesdir}/{25,99}-gpsd.rules