Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package gpsd for openSUSE:Factory checked in at 2026-06-19 16:29:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gpsd (Old) and /work/SRC/openSUSE:Factory/.gpsd.new.1956 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gpsd" Fri Jun 19 16:29:58 2026 rev:70 rq:1360078 version:3.27.5 Changes: -------- --- /work/SRC/openSUSE:Factory/gpsd/gpsd.changes 2026-01-21 14:11:41.512670543 +0100 +++ /work/SRC/openSUSE:Factory/.gpsd.new.1956/gpsd.changes 2026-06-19 17:15:55.570805766 +0200 @@ -1,0 +2,11 @@ +Thu Jun 11 14:03:39 UTC 2026 - Matej Cepl <[email protected]> + +- Rewrite the SPEC file to build, remove Python 2 building, and + clean up. +- Needs more work to support building via wheels. +- Add update-desktop-files.patch and remove + `%suse_update_desktop_file` and dependency on + `update-desktop-files` package + (https://en.opensuse.org/openSUSE:Update-desktop-files_deprecation). + +------------------------------------------------------------------- New: ---- update-desktop-files.patch ----------(New B)---------- New:- Needs more work to support building via wheels. - Add update-desktop-files.patch and remove `%suse_update_desktop_file` and dependency on ----------(New E)---------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gpsd.spec ++++++ --- /var/tmp/diff_new_pack.ODvhNb/_old 2026-06-19 17:15:57.754880676 +0200 +++ /var/tmp/diff_new_pack.ODvhNb/_new 2026-06-19 17:15:57.754880676 +0200 @@ -20,7 +20,6 @@ %define libgps libgps%{sover} %define libQgps libQgpsmm%{sover} %define _udevdir %(pkg-config --variable udevdir udev) -%bcond_without python2 Name: gpsd Version: 3.27.5 Release: 0 @@ -36,6 +35,9 @@ Source99: %{name}.keyring Patch0: harden_gpsd.service.patch Patch1: [email protected] +# PATCH-FIX-UPSTREAM update-desktop-files.patch bugno [email protected] +# update .desktop files with SUSE fixes +Patch2: update-desktop-files.patch BuildRequires: chrpath BuildRequires: fdupes BuildRequires: gcc-c++ @@ -43,12 +45,13 @@ BuildRequires: libcap-devel BuildRequires: ncurses-devel BuildRequires: pkgconfig +BuildRequires: python-rpm-macros +BuildRequires: python3-base BuildRequires: python3-cairo-devel BuildRequires: python3-gobject-devel BuildRequires: python3-pyserial BuildRequires: scons >= 2.3.0 BuildRequires: systemd-rpm-macros -BuildRequires: update-desktop-files BuildRequires: xmlto BuildRequires: pkgconfig(Qt6Core) BuildRequires: pkgconfig(Qt6Network) @@ -57,9 +60,6 @@ BuildRequires: pkgconfig(dbus-1) BuildRequires: pkgconfig(gtk+-3.0) BuildRequires: pkgconfig(libusb-1.0) -%if %{with python2} -BuildRequires: pkgconfig(python2) -%endif BuildRequires: pkgconfig(python3) BuildRequires: pkgconfig(udev) Requires: udev @@ -131,17 +131,6 @@ This package provides the shared Qt library for gpsd and other GPS aware applications. -%package -n python2-gpsd -Summary: Client libraries in C and Python for talking to a running gpsd or GPS -Group: Development/Libraries/Python -Requires: %{name} = %{version} -Provides: python-gpsd = %{version}-%{release} -Obsoletes: python-gpsd < %{version}-%{release} - -%description -n python2-gpsd -This package provides python modules and tools for the gpsd shared libraries. -You will need to have gpsd installed for it to work. - %package -n python3-gpsd Summary: Client libraries in C and Python3 for talking to a running gpsd or GPS Group: Development/Libraries/Python @@ -174,20 +163,7 @@ can run on a serial terminal or terminal emulator. %prep -%if %{with python2} -mkdir -p %{name}-%{version}/python2 -tar -xf %{SOURCE0} -C %{name}-%{version}/python2 -pushd %{name}-%{version}/python2/%{name}-%{version} -%patch -P 0 -%patch -P 1 -popd -%endif -mkdir -p %{name}-%{version}/python3 -tar -xf %{SOURCE0} -C %{name}-%{version}/python3 -pushd %{name}-%{version}/python3/%{name}-%{version} -%patch -P 0 -%patch -P 1 -popd +%autosetup -p1 %build @@ -195,18 +171,10 @@ export CFLAGS="%{optflags}" export CXXFLAGS="%{optflags}" export CPPFLAGS="%{optflags}" -pyversions=( "python3" ) -pylibdir=( "%{python3_sitearch}" ) -%if %{with python2} -pyversions+=( "python2" ) -pylibdir+=( "%{python2_sitearch}") -%endif cnt=0 -for i in "${pyversions[@]}"; do - pushd %{name}-%{version}/${i}/%{name}-%{version} - # breaks with %{?_smp_mflags} - scons \ +# breaks with %{?_smp_mflags} +scons \ dbus_export=yes \ systemd=yes \ libQgpsmm=yes \ @@ -222,39 +190,25 @@ mandir=%{_mandir} \ docdir=%{_docdir}/%{name} \ icondir=%{_datadir}/icons/hicolor/128x128/apps \ - python_shebang=%{_bindir}/${i} \ + python_shebang=%{_bindir}/python%{python3_bin_suffix} \ pkgconfigdir=%{_libdir}/pkgconfig \ udevdir=$(dirname %{_udevrulesdir}) \ - target_python=${i} \ - python_libdir=${pylibdir[$cnt]} \ + target_python=python%{python3_bin_suffix} \ + python_libdir=%{python3_sitearch} \ unitdir=%{_unitdir} \ mibdir=%{_datadir}/snmp/mibs/%{name} \ build - # Fix python interpreter path. - sed -e "s,#!%{_bindir}/\(python[23]\?\|env \+python[23]\?\),#!%{_bindir}/${i},g" -i gps/*.py +# Fix python interpreter path. +sed -e "s,#!%{_bindir}/\(python[23]\?\|env \+python[23]\?\),#!%{_bindir}/python-%{python3_bin_suffix},g" -i gps/*.py - popd - cnt=`expr $cnt + 1` -done +cnt=`expr $cnt + 1` %install # The SCons description does not handle CXXFLAGS correctly, pass C++ flags also in CFLAGS export CFLAGS="%{optflags}" export CXXFLAGS="%{optflags}" export CPPFLAGS="%{optflags}" -# Install python2 first -%if %{with python2} -pushd %{name}-%{version}/python2/%{name}-%{version} - -DESTDIR=%{buildroot} scons nostrip=True install systemd_install - -# Now delete all the installed files except the python2 files -find %{buildroot} \( -not -type d -a -not -path "*/python2.*/*" \) -delete - -popd -%endif -pushd %{name}-%{version}/python3/%{name}-%{version} DESTDIR=%{buildroot} scons nostrip=True install systemd_install @@ -272,14 +226,9 @@ %fdupes -s %{buildroot}%{_mandir} -# strip absolute path and suffix -sed -i -e 's#Icon=.*/\([^/]\+\)\(\..\+\)#Icon=\1#' %{buildroot}%{_datadir}/applications/xgps{,speed}.desktop -%suse_update_desktop_file -r xgpsspeed System Monitor -%suse_update_desktop_file -r xgps System Monitor - -%python3_fix_shebang -%if %{suse_version} >= 1600 -%python_expand %python3_fix_shebang_path %{buildroot}%{$python_sitearch}/gps/* +%{python3_fix_shebang} +%if 0%{?suse_version} >= 1600 +%python3_fix_shebang_path %{buildroot}%{python3_sitearch}/gps/* %endif %pre @@ -287,7 +236,7 @@ %post %if 0%{?suse_version} > 1500 -%ldconfig +%{ldconfig} %else /sbin/ldconfig %endif @@ -300,7 +249,7 @@ %postun %if 0%{?suse_version} > 1500 -%ldconfig +%{ldconfig} %else /sbin/ldconfig %endif @@ -317,7 +266,7 @@ %endif %files -%license %{name}-%{version}/python3/%{name}-%{version}/COPYING +%license COPYING %{_docdir}/%{name} %exclude %{_docdir}/%{name}/{COPYING,build.adoc} %{_mandir}/man1/gpsctl.1%{?ext_man} @@ -343,7 +292,7 @@ %{_libdir}/libQgpsmm.so.* %files devel -%doc %{name}-%{version}/python3/%{name}-%{version}/TODO +%doc TODO %{_mandir}/man1/gpscat.1%{?ext_man} %{_mandir}/man1/gpsfake.1%{?ext_man} %{_mandir}/man1/gpsdebuginfo.1%{?ext_man} @@ -369,12 +318,6 @@ %{_libdir}/libQgpsmm.prl %{_libdir}/pkgconfig/Qgpsmm.pc -%if %{with python2} -%files -n python2-gpsd -%{python_sitearch}/gps/ -%{python_sitearch}/gps-%{version}.* -%endif - %files -n python3-gpsd %{python3_sitearch}/gps/ %{python3_sitearch}/gps-%{version}.* ++++++ harden_gpsd.service.patch ++++++ --- /var/tmp/diff_new_pack.ODvhNb/_old 2026-06-19 17:15:57.802882323 +0200 +++ /var/tmp/diff_new_pack.ODvhNb/_new 2026-06-19 17:15:57.806882460 +0200 @@ -1,8 +1,12 @@ -Index: systemd/gpsd.service.in +--- + systemd/gpsd.service.in | 12 ++++++++++++ + 1 file changed, 12 insertions(+) + +Index: gpsd-3.27.5/systemd/gpsd.service.in =================================================================== ---- systemd/gpsd.service.in -+++ systemd/gpsd.service.in -@@ -5,6 +5,18 @@ Requires=gpsd.socket +--- gpsd-3.27.5.orig/systemd/gpsd.service.in 2023-01-10 23:38:26.000000000 +0100 ++++ gpsd-3.27.5/systemd/gpsd.service.in 2026-06-11 11:37:56.930368279 +0200 +@@ -5,6 +5,18 @@ After=chronyd.service [Service] @@ -17,7 +21,7 @@ +ProtectKernelLogs=true +ProtectControlGroups=true +RestrictRealtime=true -+# end of automatic additions ++# end of automatic additions Type=forking EnvironmentFile=-/etc/default/gpsd EnvironmentFile=-/etc/sysconfig/gpsd ++++++ [email protected] ++++++ --- /var/tmp/diff_new_pack.ODvhNb/_old 2026-06-19 17:15:57.814882734 +0200 +++ /var/tmp/diff_new_pack.ODvhNb/_new 2026-06-19 17:15:57.822883009 +0200 @@ -1,8 +1,12 @@ -Index: systemd/[email protected] +--- + systemd/[email protected] | 12 ++++++++++++ + 1 file changed, 12 insertions(+) + +Index: gpsd-3.27.5/systemd/[email protected] =================================================================== ---- systemd/[email protected] -+++ systemd/[email protected] -@@ -5,6 +5,18 @@ BindsTo=dev-%i.device +--- gpsd-3.27.5.orig/systemd/[email protected] 2023-01-10 23:38:26.000000000 +0100 ++++ gpsd-3.27.5/systemd/[email protected] 2026-06-11 11:38:00.627176696 +0200 +@@ -5,6 +5,18 @@ After=dev-%i.device [Service] @@ -17,7 +21,7 @@ +ProtectKernelLogs=true +ProtectControlGroups=true +RestrictRealtime=true -+# end of automatic additions ++# end of automatic additions Type=oneshot Environment="GPSD_SOCKET=@RUNDIR@/gpsd.sock" EnvironmentFile=-/etc/default/gpsd ++++++ update-desktop-files.patch ++++++ --- packaging/X11/xgps.desktop.in | 5 +++-- packaging/X11/xgpsspeed.desktop.in | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) Index: gpsd-3.27.5/packaging/X11/xgps.desktop.in =================================================================== --- gpsd-3.27.5.orig/packaging/X11/xgps.desktop.in 2023-01-10 23:38:26.000000000 +0100 +++ gpsd-3.27.5/packaging/X11/xgps.desktop.in 2026-06-11 11:38:03.229500189 +0200 @@ -4,7 +4,8 @@ GenericName=GPS information Comment=Display GPS information from a gpsd daemon Exec=xgps -Icon=@ICONPATH@/gpsd-logo.png +Icon=gpsd-logo Terminal=false Type=Application -Categories=Application;Maps;Utility; +Categories=System;Monitor; + Index: gpsd-3.27.5/packaging/X11/xgpsspeed.desktop.in =================================================================== --- gpsd-3.27.5.orig/packaging/X11/xgpsspeed.desktop.in 2023-01-10 23:38:26.000000000 +0100 +++ gpsd-3.27.5/packaging/X11/xgpsspeed.desktop.in 2026-06-11 11:38:03.229778223 +0200 @@ -4,7 +4,8 @@ GenericName=GPS speedometer Comment=Display GPS speed from a gpsd daemon Exec=xgpsspeed -Icon=@ICONPATH@/gpsd-logo.png +Icon=gpsd-logo Terminal=false Type=Application -Categories=Application;Maps;Utility; +Categories=System;Monitor; +
