Revert "Use scons-3 for rhel8"

This reverts commit bb2ee18205.
This commit is contained in:
Fabian Affolter 2020-01-23 17:16:36 +01:00
parent 0f817f16cd
commit 6f2b1c43cf
No known key found for this signature in database
GPG Key ID: E23CD2DD36A4397F

View File

@ -1,14 +1,11 @@
%global _hardened_build 1 %global _hardened_build 1
%global srcname gpsd
%if 0%{?fedora} || 0%{?rhel} <= 7
%global with_qt 1 %global with_qt 1
%else
%global with_qt 0
%endif
Name: gpsd Name: %{srcname}
Version: 3.20 Version: 3.19
Release: 1%{?dist}.1 Release: 4%{?dist}
Summary: Service daemon for mediating access to a GPS Summary: Service daemon for mediating access to a GPS
License: BSD License: BSD
@ -16,20 +13,9 @@ URL: http://catb.org/gpsd/
Source0: https://download-mirror.savannah.gnu.org/releases/gpsd/%{name}-%{version}.tar.gz Source0: https://download-mirror.savannah.gnu.org/releases/gpsd/%{name}-%{version}.tar.gz
Source11: gpsd.sysconfig Source11: gpsd.sysconfig
BuildRequires: dbus-devel BuildRequires: dbus-devel dbus-glib-devel ncurses-devel xmlto python3-devel
BuildRequires: dbus-glib-devel BuildRequires: python3-scons python3-gobject python3-cairo python3-pyserial
BuildRequires: ncurses-devel BuildRequires: desktop-file-utils bluez-libs-devel pps-tools-devel /usr/bin/c++
BuildRequires: xmlto
BuildRequires: python3-devel
BuildRequires: gtk3-devel
BuildRequires: python3-scons
BuildRequires: python3-gobject
BuildRequires: python3-cairo
BuildRequires: python3-pyserial
BuildRequires: desktop-file-utils
BuildRequires: bluez-libs-devel
BuildRequires: pps-tools-devel
BuildRequires: /usr/bin/c++
BuildRequires: systemd BuildRequires: systemd
%if %{with_qt} %if %{with_qt}
BuildRequires: qt-devel BuildRequires: qt-devel
@ -59,12 +45,12 @@ Summary: Client libraries in C for talking to a running gpsd or GPS
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 python3-%{name} %package -n python3-%{srcname}
Summary: Python libraries and modules for use with gpsd Summary: Python libraries and modules for use with gpsd
Requires: %{name}-libs%{?_isa} = %{version}-%{release} Requires: %{name}-libs%{?_isa} = %{version}-%{release}
%{?python_provide:%python_provide python3-%{name}} %{?python_provide:%python_provide python3-%{srcname}}
%description -n python3-%{name} %description -n python3-%{srcname}
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, and commonly useful python applications for use with gpsd. applications, and commonly useful python applications for use with gpsd.
@ -97,9 +83,9 @@ with the libgps library from gpsd.
%package clients %package clients
Summary: Clients for gpsd Summary: Clients for gpsd
Requires: python3-%{name} = %{version}-%{release} Requires: python3-%{srcname} = %{version}-%{release}
Requires: python3-pyserial Requires: python3-pyserial
Requires: %{name}-libs%{?_isa} = %{version}-%{release} Requires: %{srcname}-libs%{?_isa} = %{version}-%{release}
%description clients %description clients
xgps is a simple test client for gpsd with an X interface. It displays xgps is a simple test client for gpsd with an X interface. It displays
@ -117,6 +103,7 @@ can run on a serial terminal or terminal emulator.
gpsfake can feed data from files to simulate data coming from many gpsfake can feed data from files to simulate data coming from many
different gps devices. different gps devices.
%prep %prep
%setup -q %setup -q
@ -141,7 +128,7 @@ export CCFLAGS="%{optflags}"
export LINKFLAGS="%{__global_ldflags}" export LINKFLAGS="%{__global_ldflags}"
# breaks with %{_smp_mflags} # breaks with %{_smp_mflags}
scons-3 \ scons \
dbus_export=yes \ dbus_export=yes \
systemd=yes \ systemd=yes \
%if %{with_qt} %if %{with_qt}
@ -169,12 +156,13 @@ scons-3 \
sed -e "s,#!/usr/bin/\(python[23]\?\|env \+python[23]\?\),#!/usr/bin/python3,g" -i \ 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 gegps gpscat gpsfake xgps xgpsspeed gpsprof gps/*.py ubxtool zerk
%install %install
# avoid rebuilding # avoid rebuilding
export CCFLAGS="%{optflags}" export CCFLAGS="%{optflags}"
export LINKFLAGS="%{__global_ldflags}" 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 # use the old name for udev rules
mv %{buildroot}%{_udevrulesdir}/{25,99}-gpsd.rules mv %{buildroot}%{_udevrulesdir}/{25,99}-gpsd.rules
@ -223,8 +211,7 @@ desktop-file-install \
%endif %endif
%files %files
%doc README.adoc NEWS %doc README COPYING
%license COPYING
%config(noreplace) %{_sysconfdir}/sysconfig/%{name} %config(noreplace) %{_sysconfdir}/sysconfig/%{name}
%{_sbindir}/gpsd %{_sbindir}/gpsd
%{_sbindir}/gpsdctl %{_sbindir}/gpsdctl
@ -248,7 +235,7 @@ desktop-file-install \
%files libs %files libs
%{_libdir}/libgps.so.25* %{_libdir}/libgps.so.25*
%files -n python3-%{name} %files -n python3-%{srcname}
%{_bindir}/gpsprof %{_bindir}/gpsprof
%{_mandir}/man1/gpsprof.1* %{_mandir}/man1/gpsprof.1*
%{python3_sitearch}/gps* %{python3_sitearch}/gps*
@ -256,7 +243,7 @@ desktop-file-install \
%exclude %{python3_sitearch}/gps/__pycache__/fake* %exclude %{python3_sitearch}/gps/__pycache__/fake*
%files devel %files devel
%doc TODO HACKING %doc TODO
%{_libdir}/libgps.so %{_libdir}/libgps.so
%{_libdir}/pkgconfig/libgps.pc %{_libdir}/pkgconfig/libgps.pc
%{_includedir}/gps.h %{_includedir}/gps.h
@ -313,13 +300,8 @@ desktop-file-install \
%{python3_sitearch}/gps/fake* %{python3_sitearch}/gps/fake*
%{python3_sitearch}/gps/__pycache__/fake* %{python3_sitearch}/gps/__pycache__/fake*
%changelog %changelog
* Tue Jan 21 2020 Fabian Affolter <mail@fabian-affolter.ch> - 3.20-1.1
- Update to latest upstream release 3.20
* Tue Dec 17 2019 Troy Dawson <tdawson@redhat.com> - 3.19-4.1
- Use scons-3 for rhel8
* Thu Oct 03 2019 Miro Hrončok <mhroncok@redhat.com> - 3.19-4 * Thu Oct 03 2019 Miro Hrončok <mhroncok@redhat.com> - 3.19-4
- Rebuilt for Python 3.8.0rc1 (#1748018) - Rebuilt for Python 3.8.0rc1 (#1748018)