Accepting request 921015 from home:adkorte:branches:Application:Geo

- Don't use gpsd version in patches (will break with every update)
  % harden_gpsd.service.patch
  % harden_gpsdctl@.service.patch

OBS-URL: https://build.opensuse.org/request/show/921015
OBS-URL: https://build.opensuse.org/package/show/Application:Geo/gpsd?expand=0&rev=143

gpsd.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Sep 22 17:29:34 UTC 2021 - Arjen de Korte <suse+build@de-korte.org>
+
+- Don't use gpsd version in patches (will break with every update)
+  % harden_gpsd.service.patch
+  % harden_gpsdctl@.service.patch
+
 -------------------------------------------------------------------
 Wed Sep 22 07:07:20 UTC 2021 - Arjen de Korte <suse+build@de-korte.org>
 

gpsd.spec

@@ -165,12 +165,17 @@ can run on a serial terminal or terminal emulator.
 %if %{with python2}
 mkdir -p %{name}-%{version}/python2
 tar -xf %{SOURCE0} -C %{name}-%{version}/python2
+pushd %{name}-%{version}/python2/%{name}-%{version}
+%patch0
+%patch1
+popd
 %endif
 mkdir -p %{name}-%{version}/python3
 tar -xf %{SOURCE0} -C %{name}-%{version}/python3
-cd %{name}-%{version}
-%patch0 -p1
-%patch1 -p1
+pushd %{name}-%{version}/python3/%{name}-%{version}
+%patch0
+%patch1
+popd
 
 %build
 # LTO fails on aarch64 (version 3.22, May 2021)

harden_gpsd.service.patch

@@ -1,7 +1,7 @@
-Index: gpsd/gpsd-3.23/systemd/gpsd.service.in
+Index: systemd/gpsd.service.in
 ===================================================================
---- foo.old/python3/gpsd-3.23/systemd/gpsd.service.in
-+++ foo/python3/gpsd-3.23/systemd/gpsd.service.in
+--- systemd/gpsd.service.in
++++ systemd/gpsd.service.in
 @@ -5,6 +5,18 @@ Requires=gpsd.socket
  After=chronyd.service
  

harden_gpsdctl@.service.patch

@@ -1,7 +1,7 @@
-Index: gpsd-3.23/systemd/gpsdctl@.service.in
+Index: systemd/gpsdctl@.service.in
 ===================================================================
---- foo.old/python3/gpsd-3.23/systemd/gpsdctl@.service.in
-+++ foo/python3/gpsd-3.23/systemd/gpsdctl@.service.in
+--- systemd/gpsdctl@.service.in
++++ systemd/gpsdctl@.service.in
 @@ -5,6 +5,18 @@ BindsTo=dev-%i.device
  After=dev-%i.device