SHA256
1
0
forked from pool/gpsd

Accepting request 619549 from Application:Geo

- Fix requires for gpsd-clients
- Cleanup spec file a bit

- Require python3 versions for packages importing python modules, all
  scripts use python3 as interpreter.

OBS-URL: https://build.opensuse.org/request/show/619549
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gpsd?expand=0&rev=47
This commit is contained in:
Dominique Leuenberger 2018-07-04 21:52:23 +00:00 committed by Git OBS Bridge
commit 9e8ee73c42
2 changed files with 25 additions and 17 deletions

View File

@ -1,3 +1,15 @@
-------------------------------------------------------------------
Thu Jun 28 07:57:08 UTC 2018 - mpluskal@suse.com
- Fix requires for gpsd-clients
- Cleanup spec file a bit
-------------------------------------------------------------------
Fri Jun 15 16:03:49 UTC 2018 - stefan.bruens@rwth-aachen.de
- Require python3 versions for packages importing python modules, all
scripts use python3 as interpreter.
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Dec 1 15:05:22 UTC 2017 - mimi.vx@gmail.com Fri Dec 1 15:05:22 UTC 2017 - mimi.vx@gmail.com

View File

@ -1,7 +1,7 @@
# #
# spec file for package gpsd # spec file for package gpsd
# #
# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -20,17 +20,13 @@
%define libgps libgps%{sover} %define libgps libgps%{sover}
%define libQgps libQgpsmm%{sover} %define libQgps libQgpsmm%{sover}
%define _udevdir %(pkg-config --variable udevdir udev) %define _udevdir %(pkg-config --variable udevdir udev)
#Compat macro for new _fillupdir macro introduced in Nov 2017
%if ! %{defined _fillupdir}
%define _fillupdir %{_localstatedir}/adm/fillup-templates
%endif
Name: gpsd Name: gpsd
Version: 3.17 Version: 3.17
Release: 0 Release: 0
Summary: Service daemon for mediating access to a GPS Summary: Service daemon for mediating access to a GPS
License: BSD-3-Clause License: BSD-3-Clause
Group: Hardware/Other Group: Hardware/Other
Url: http://www.catb.org/gpsd/ URL: http://www.catb.org/gpsd/
Source0: http://download-mirror.savannah.gnu.org/releases/gpsd/%{name}-%{version}.tar.gz Source0: http://download-mirror.savannah.gnu.org/releases/gpsd/%{name}-%{version}.tar.gz
Source1: rules.gpsd Source1: rules.gpsd
Source2: udev.gpsd Source2: udev.gpsd
@ -91,8 +87,8 @@ Requires: %{libQgps}
Requires: %{libgps} Requires: %{libgps}
Requires: %{name} = %{version} Requires: %{name} = %{version}
Requires: pkgconfig Requires: pkgconfig
Requires: python-curses Requires: python3-curses
Requires: python-gpsd = %{version} Requires: python3-gpsd = %{version}
%description devel %description devel
This package provides C header files for the gpsd shared libraries that This package provides C header files for the gpsd shared libraries that
@ -136,10 +132,12 @@ This package provides python3 modules and tools for the gpsd shared libraries.
You will need to have gpsd installed for it to work. You will need to have gpsd installed for it to work.
%package clients %package clients
Summary: Clients for gpsd with an X interface Summary: Example clients for gpsd
Group: Hardware/Other Group: Hardware/Other
Requires: python-gpsd Requires: python3-cairo
Requires: python-gtk Requires: python3-gobject
Requires: python3-gobject-Gdk
Requires: python3-gpsd
%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
@ -212,7 +210,7 @@ do
build build
# Fix python interpreter path. # Fix python interpreter path.
sed -e "s,#!/usr/bin/\(python[23]\?\|env \+python[23]\?\),#!%{_bindir}/${pyversions[i]},g" -i \ sed -e "s,#!%{_bindir}/\(python[23]\?\|env \+python[23]\?\),#!%{_bindir}/${pyversions[i]},g" -i \
gegps gpscat gpsfake xgps xgpsspeed gpsprof gps/*.py gegps gpscat gpsfake xgps xgpsspeed gpsprof gps/*.py
popd popd
@ -252,9 +250,6 @@ install -D -m 644 systemd/gpsd.socket %{buildroot}/%{_unitdir}/gpsd.socket
install -D -m 644 systemd/gpsdctl@.service %{buildroot}/%{_unitdir}/gpsdctl@.service install -D -m 644 systemd/gpsdctl@.service %{buildroot}/%{_unitdir}/gpsdctl@.service
ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rcgpsd ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rcgpsd
# Use correct python2 paths
sed -i "s|env python|python2|g" %{buildroot}%{_bindir}/*
%fdupes -s %{buildroot}%{_mandir} %fdupes -s %{buildroot}%{_mandir}
# strip absolute path and suffix # strip absolute path and suffix
@ -284,7 +279,8 @@ sed -i -e 's#Icon=.*/\([^/]\+\)\(\..\+\)#Icon=\1#' %{buildroot}%{_datadir}/appli
%postun -n %{libQgps} -p /sbin/ldconfig %postun -n %{libQgps} -p /sbin/ldconfig
%files %files
%doc %{name}-%{version}/python3/%{name}-%{version}/README %{name}-%{version}/python3/%{name}-%{version}/COPYING %license %{name}-%{version}/python3/%{name}-%{version}/COPYING
%doc %{name}-%{version}/python3/%{name}-%{version}/README
%{_mandir}/man?/gpsd.* %{_mandir}/man?/gpsd.*
%{_mandir}/man?/gpsdctl.* %{_mandir}/man?/gpsdctl.*
%{_mandir}/man?/gpsctl.* %{_mandir}/man?/gpsctl.*
@ -341,7 +337,7 @@ sed -i -e 's#Icon=.*/\([^/]\+\)\(\..\+\)#Icon=\1#' %{buildroot}%{_datadir}/appli
%{_mandir}/man?/gps.* %{_mandir}/man?/gps.*
%{_mandir}/man?/gegps.* %{_mandir}/man?/gegps.*
%{_mandir}/man?/cgps.* %{_mandir}/man?/cgps.*
%{_mandir}/man?/lcdgps.1.* %{_mandir}/man?/lcdgps.*
%{_mandir}/man?/xgps.* %{_mandir}/man?/xgps.*
%{_mandir}/man?/xgpsspeed.* %{_mandir}/man?/xgpsspeed.*
%{_mandir}/man?/gpspipe.* %{_mandir}/man?/gpspipe.*