From dc04b5eb80ea012ff0c8b3a2606d8186852e1caae69f4472b1be90732f4e00fb Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Tue, 19 Jun 2018 07:31:28 +0000 Subject: [PATCH 1/3] 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 From bc6e0007c4ae823d1fd58d60f47289f1159ed9396f531a71a9c89b8613089d4b Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Mon, 25 Jun 2018 06:58:43 +0000 Subject: [PATCH 2/3] Accepting request 618745 from home:StefanBruens:branches:Application:Geo - Correct Requires for gpsd-clients subpackage OBS-URL: https://build.opensuse.org/request/show/618745 OBS-URL: https://build.opensuse.org/package/show/Application:Geo/gpsd?expand=0&rev=119 --- gpsd.changes | 5 +++++ gpsd.spec | 6 ++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/gpsd.changes b/gpsd.changes index a7a5fca..f38398d 100644 --- a/gpsd.changes +++ b/gpsd.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sun Jun 24 02:58:04 UTC 2018 - stefan.bruens@rwth-aachen.de + +- Correct Requires for gpsd-clients subpackage + ------------------------------------------------------------------- Fri Jun 15 16:03:49 UTC 2018 - stefan.bruens@rwth-aachen.de diff --git a/gpsd.spec b/gpsd.spec index 18b957d..b418f6e 100644 --- a/gpsd.spec +++ b/gpsd.spec @@ -137,10 +137,12 @@ This package provides python3 modules and tools for the gpsd shared libraries. You will need to have gpsd installed for it to work. %package clients -Summary: Clients for gpsd with an X interface +Summary: Example clients for gpsd Group: Hardware/Other +Requires: python3-cairo Requires: python3-gpsd -Requires: python3-gtk +Requires: python3-gobject +Requires: python3-gobject-gdk %description clients xgps is a simple test client for gpsd with an X interface. It displays From 765d0f366136b115394197e071bd777374fb3f93c384fb11c61c5e258aaa1f9f Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Thu, 28 Jun 2018 08:03:45 +0000 Subject: [PATCH 3/3] - Fix requires for gpsd-clients - Cleanup spec file a bit OBS-URL: https://build.opensuse.org/package/show/Application:Geo/gpsd?expand=0&rev=120 --- gpsd.changes | 7 +++---- gpsd.spec | 20 ++++++++------------ 2 files changed, 11 insertions(+), 16 deletions(-) diff --git a/gpsd.changes b/gpsd.changes index f38398d..f2a65ff 100644 --- a/gpsd.changes +++ b/gpsd.changes @@ -1,15 +1,14 @@ ------------------------------------------------------------------- -Sun Jun 24 02:58:04 UTC 2018 - stefan.bruens@rwth-aachen.de +Thu Jun 28 07:57:08 UTC 2018 - mpluskal@suse.com -- Correct Requires for gpsd-clients subpackage +- 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. -- 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 b418f6e..5468c4a 100644 --- a/gpsd.spec +++ b/gpsd.spec @@ -1,7 +1,7 @@ # # 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 # remain the property of their copyright owners, unless otherwise agreed @@ -20,17 +20,13 @@ %define libgps libgps%{sover} %define libQgps libQgpsmm%{sover} %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 Version: 3.17 Release: 0 Summary: Service daemon for mediating access to a GPS License: BSD-3-Clause 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 Source1: rules.gpsd Source2: udev.gpsd @@ -45,7 +41,6 @@ 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 @@ -140,9 +135,9 @@ You will need to have gpsd installed for it to work. Summary: Example clients for gpsd Group: Hardware/Other Requires: python3-cairo -Requires: python3-gpsd Requires: python3-gobject -Requires: python3-gobject-gdk +Requires: python3-gobject-Gdk +Requires: python3-gpsd %description clients xgps is a simple test client for gpsd with an X interface. It displays @@ -215,7 +210,7 @@ do build # 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 popd @@ -284,7 +279,8 @@ sed -i -e 's#Icon=.*/\([^/]\+\)\(\..\+\)#Icon=\1#' %{buildroot}%{_datadir}/appli %postun -n %{libQgps} -p /sbin/ldconfig %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?/gpsdctl.* %{_mandir}/man?/gpsctl.* @@ -341,7 +337,7 @@ sed -i -e 's#Icon=.*/\([^/]\+\)\(\..\+\)#Icon=\1#' %{buildroot}%{_datadir}/appli %{_mandir}/man?/gps.* %{_mandir}/man?/gegps.* %{_mandir}/man?/cgps.* -%{_mandir}/man?/lcdgps.1.* +%{_mandir}/man?/lcdgps.* %{_mandir}/man?/xgps.* %{_mandir}/man?/xgpsspeed.* %{_mandir}/man?/gpspipe.*