Accepting request 486238 from home:scarabeus_iv:branches:Application:Geo

- Remove conditionals for 1210 and older (oldest codebase built is SLE12)
- run scons in multiple threads
- convert to pkgconfig dependencies

OBS-URL: https://build.opensuse.org/request/show/486238
OBS-URL: https://build.opensuse.org/package/show/Application:Geo/gpsd?expand=0&rev=103
This commit is contained in:
Martin Pluskal 2017-04-07 07:01:22 +00:00 committed by Git OBS Bridge
parent 8de9c5cc7e
commit 029c370316
2 changed files with 23 additions and 31 deletions

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Thu Apr 6 20:56:37 UTC 2017 - tchvatal@suse.com
- Remove conditionals for 1210 and older (oldest codebase built is SLE12)
- run scons in multiple threads
- convert to pkgconfig dependencies
-------------------------------------------------------------------
Tue Feb 28 19:21:14 UTC 2017 - stefan.bruens@rwth-aachen.de

View File

@ -27,38 +27,37 @@ License: BSD-3-Clause
Group: Hardware/Other
Url: http://www.catb.org/gpsd/
Source0: http://download-mirror.savannah.gnu.org/releases/gpsd/%{name}-%{version}.tar.gz
Source98: http://download-mirror.savannah.gnu.org/releases/gpsd/%{name}-%{version}.tar.gz.sig
Source1: rules.gpsd
Source2: udev.gpsd
Source3: sysconfig.gpsd
Source98: http://download-mirror.savannah.gnu.org/releases/gpsd/%{name}-%{version}.tar.gz.sig
Source99: %{name}.keyring
Patch0: gpsd-fix-shebang.patch
BuildRequires: bluez-devel
BuildRequires: chrpath
BuildRequires: dbus-1-glib-devel
BuildRequires: fdupes
BuildRequires: gcc-c++
BuildRequires: hicolor-icon-theme
BuildRequires: libcap-devel
BuildRequires: libqt4-devel >= 4.5.3
BuildRequires: libusb-1_0-devel
BuildRequires: ncurses-devel
%if 0%{?suse_version} > 1320 || 0%{?sle_version} >= 120200
BuildRequires: pps-tools-devel
%endif
BuildRequires: python-devel
BuildRequires: pkgconfig
BuildRequires: scons >= 2.0.1
BuildRequires: systemd-rpm-macros
BuildRequires: update-desktop-files
BuildRequires: xmlto
BuildRequires: pkgconfig(QtCore) >= 4.5.3
BuildRequires: pkgconfig(QtNetwork) >= 4.5.3
BuildRequires: pkgconfig(bluez)
BuildRequires: pkgconfig(dbus-1)
BuildRequires: pkgconfig(libusb-1.0)
BuildRequires: pkgconfig(python)
BuildRequires: pkgconfig(udev)
%if 0%{?suse_version} >= 1210
BuildRequires: systemd-rpm-macros
%systemd_requires
%endif
Requires: udev
Requires(pre): %fillup_prereq
Requires(pre): coreutils
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%{?systemd_requires}
%if 0%{?suse_version} > 1320 || 0%{?sle_version} >= 120200
BuildRequires: pps-tools-devel
%endif
%description
gpsd is a service daemon that mediates access to a GPS sensor connected
@ -149,9 +148,10 @@ sed -i 's|env.Prepend.*RPATH.*|pass #\0|' SConstruct
# The SCons description does not handle CXXFLAGS correctly, pass C++ flags also in CFLAGS
export CFLAGS="%{optflags} -fvisibility-inlines-hidden -std=gnu++98"
export CXXFLAGS="%{optflags} -fvisibility-inlines-hidden -std=gnu++98"
scons prefix=%{_prefix} libdir=%{_libdir} nostrip=True
scons prefix=%{_prefix} libdir=%{_libdir} nostrip=True %{?_smp_mflags}
%install
# The SCons description does not handle CXXFLAGS correctly, pass C++ flags also in CFLAGS
export CFLAGS="%{optflags} -fvisibility-inlines-hidden -std=gnu++98"
export CXXFLAGS="%{optflags} -fvisibility-inlines-hidden -std=gnu++98"
DESTDIR=%{buildroot} scons prefix=%{_prefix} libdir=%{_libdir} strip=False install
@ -170,12 +170,10 @@ chmod 755 %{buildroot}%{python_sitearch}/gps/gps.py
install -D -m 644 -t %{buildroot}%{_datadir}/icons/hicolor/128x128/apps/ packaging/X11/gpsd-logo.png
install -D -m 644 -t %{buildroot}%{_datadir}/applications/ packaging/X11/xgps.desktop
install -D -m 644 -t %{buildroot}%{_datadir}/applications/ packaging/X11/xgpsspeed.desktop
%if 0%{?suse_version} >= 1210
install -D -m 644 systemd/gpsd.service %{buildroot}/%{_unitdir}/gpsd.service
install -D -m 644 systemd/gpsd.socket %{buildroot}/%{_unitdir}/gpsd.socket
install -D -m 644 systemd/gpsdctl@.service %{buildroot}/%{_unitdir}/gpsdctl@.service
ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rcgpsd
%endif
# strip absolute path and suffix
sed -i -e 's#Icon=.*/\([^/]\+\)\(\..\+\)#Icon=\1#' %{buildroot}%{_datadir}/applications/xgps{,speed}.desktop
@ -185,35 +183,24 @@ sed -i -e 's#Icon=.*/\([^/]\+\)\(\..\+\)#Icon=\1#' %{buildroot}%{_datadir}/appli
%fdupes -s %{buildroot}
%pre
%if 0%{?suse_version} >= 1210
%service_add_pre gpsd.service gpsdctl@.service
%endif
%post
/sbin/ldconfig
%fillup_only -n gpsd
%if 0%{?suse_version} >= 1210
%service_add_post gpsd.service gpsdctl@.service
%udev_rules_update
%endif
%preun
%if 0%{?suse_version} >= 1210
%service_del_preun gpsd.service gpsdctl@.service
%endif
%postun
/sbin/ldconfig
%if 0%{?suse_version} >= 1210
%service_del_postun gpsd.service gpsdctl@.service
%endif
%post -n %{libgps} -p /sbin/ldconfig
%postun -n %{libgps} -p /sbin/ldconfig
%post -n %{libQgps} -p /sbin/ldconfig
%postun -n %{libQgps} -p /sbin/ldconfig
%files
@ -225,12 +212,10 @@ sed -i -e 's#Icon=.*/\([^/]\+\)\(\..\+\)#Icon=\1#' %{buildroot}%{_datadir}/appli
%{_mandir}/man?/gpsinit.*
%{_udevdir}/gpsd.sh
%{_udevdir}/rules.d/*
%if 0%{?suse_version} >= 1210
%{_unitdir}/gpsd.service
%{_unitdir}/gpsd.socket
%{_unitdir}/gpsdctl@.service
%{_sbindir}/rcgpsd
%endif
%{_sbindir}/gpsd
%{_sbindir}/gpsdctl
%{_bindir}/gpsctl
@ -276,7 +261,7 @@ sed -i -e 's#Icon=.*/\([^/]\+\)\(\..\+\)#Icon=\1#' %{buildroot}%{_datadir}/appli
%{_mandir}/man?/gps.*
%{_mandir}/man?/gegps.*
%{_mandir}/man?/cgps.*
%{_mandir}/man?/lcdgps.1.gz
%{_mandir}/man?/lcdgps.1.*
%{_mandir}/man?/xgps.*
%{_mandir}/man?/xgpsspeed.*
%{_mandir}/man?/gpspipe.*