From dc04b5eb80ea012ff0c8b3a2606d8186852e1caae69f4472b1be90732f4e00fb Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Tue, 19 Jun 2018 07:31:28 +0000 Subject: [PATCH] Accepting request 617119 from home:StefanBruens:branches:Application:Geo - Require python3 versions for packages importing python modules, all scripts use python3 as interpreter. - Fix building on Leap 42.x, python2_sitearch is defined in python-rpm-macros OBS-URL: https://build.opensuse.org/request/show/617119 OBS-URL: https://build.opensuse.org/package/show/Application:Geo/gpsd?expand=0&rev=118 --- gpsd.changes | 8 ++++++++ gpsd.spec | 12 +++++------- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/gpsd.changes b/gpsd.changes index dd8a3cb..a7a5fca 100644 --- a/gpsd.changes +++ b/gpsd.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +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. +- Fix building on Leap 42.x, python2_sitearch is defined in + python-rpm-macros + ------------------------------------------------------------------- Fri Dec 1 15:05:22 UTC 2017 - mimi.vx@gmail.com diff --git a/gpsd.spec b/gpsd.spec index 379710d..18b957d 100644 --- a/gpsd.spec +++ b/gpsd.spec @@ -45,6 +45,7 @@ BuildRequires: hicolor-icon-theme BuildRequires: libcap-devel BuildRequires: ncurses-devel BuildRequires: pkgconfig +BuildRequires: python-rpm-macros BuildRequires: scons >= 2.3.0 BuildRequires: systemd-rpm-macros BuildRequires: update-desktop-files @@ -91,8 +92,8 @@ Requires: %{libQgps} Requires: %{libgps} Requires: %{name} = %{version} Requires: pkgconfig -Requires: python-curses -Requires: python-gpsd = %{version} +Requires: python3-curses +Requires: python3-gpsd = %{version} %description devel This package provides C header files for the gpsd shared libraries that @@ -138,8 +139,8 @@ You will need to have gpsd installed for it to work. %package clients Summary: Clients for gpsd with an X interface Group: Hardware/Other -Requires: python-gpsd -Requires: python-gtk +Requires: python3-gpsd +Requires: python3-gtk %description clients xgps is a simple test client for gpsd with an X interface. It displays @@ -252,9 +253,6 @@ 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 -# Use correct python2 paths -sed -i "s|env python|python2|g" %{buildroot}%{_bindir}/* - %fdupes -s %{buildroot}%{_mandir} # strip absolute path and suffix