From 3d209092e40d5a80d4b0c961198315b5758cef2c8788b3ae92d5ebc03f859dd1 Mon Sep 17 00:00:00 2001
From: Marius Kittler <marius.kittler@suse.com>
Date: Sun, 26 Sep 2021 09:35:10 +0000
Subject: [PATCH] Accepting request 921483 from
 home:fusionfuture:branches:network

- Use /var/lib/syncthing-relaysrv in strelaysrv.service (boo#1190877).

OBS-URL: https://build.opensuse.org/request/show/921483
OBS-URL: https://build.opensuse.org/package/show/network/syncthing?expand=0&rev=223
---
 syncthing.changes | 5 +++++
 syncthing.spec    | 6 +++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/syncthing.changes b/syncthing.changes
index 17f8fa6..6258a46 100644
--- a/syncthing.changes
+++ b/syncthing.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sun Sep 26 08:51:40 UTC 2021 - Fusion Future <qydwhotmail@gmail.com>
+
+- Use /var/lib/syncthing-relaysrv in strelaysrv.service (boo#1190877).
+
 -------------------------------------------------------------------
 Tue Sep  7 12:24:57 UTC 2021 - Marius Kittler <marius.kittler@suse.com>
 
diff --git a/syncthing.spec b/syncthing.spec
index 197abba..aa990e4 100644
--- a/syncthing.spec
+++ b/syncthing.spec
@@ -74,7 +74,7 @@ cd ../src/github.com/syncthing/%{name}
 mv LICENSE AUTHORS CONDUCT.md CONTRIBUTING.md README.md "$st_dir"
 install -Dpm 0755 bin/%{name} %{buildroot}%{_bindir}/%{name}
 install -Dpm 0755 bin/strelaysrv %{buildroot}%{_bindir}/strelaysrv
-install -dm 0750 %{buildroot}/%{_localstatedir}/lib/strelaysrv
+install -dm 0750 %{buildroot}/%{_localstatedir}/lib/syncthing-relaysrv
 install -Dpm 0644 cmd/strelaysrv/etc/linux-systemd/strelaysrv.service \
   %{buildroot}%{_unitdir}/strelaysrv.service
 sed -i '/Service\]/a EnvironmentFile=-\/etc\/default/strelaysrv'    \
@@ -87,7 +87,7 @@ sed -i 's/^User=.*/User=strelaysrv/'    \
   %{buildroot}%{_unitdir}/strelaysrv.service
 sed -i 's/^Group=.*/Group=strelaysrv/'    \
   %{buildroot}%{_unitdir}/strelaysrv.service
-sed -i 's,^ReadWritePaths=.*,ReadWritePaths=/var/lib/strelaysrv,'    \
+sed -i 's,^ReadWritePaths=.*,ReadWritePaths=/var/lib/syncthing-relaysrv,'    \
   %{buildroot}%{_unitdir}/strelaysrv.service
 install -Dpm 0644 etc/linux-systemd/system/%{name}@.service        \
   %{buildroot}%{_unitdir}/%{name}@.service
@@ -149,6 +149,6 @@ getent passwd strelaysrv >/dev/null || \
 %license LICENSE
 %{_bindir}/strelaysrv
 %{_unitdir}/strelaysrv.service
-%dir %attr(750,strelaysrv,strelaysrv) %{_localstatedir}/lib/strelaysrv
+%dir %attr(750,strelaysrv,strelaysrv) %{_localstatedir}/lib/syncthing-relaysrv
 
 %changelog