Merge pull request #2 from djam/syncthing:rosa2016.1

Backports. Update to 1.6.1

.abf.yml

@@ -1,2 +1,3 @@
 sources:
+  syncthing-1.6.1.tar.gz: 73f456b8248ef4fc82dd59a455d5a3b41f33500f
   syncthing-source-v1.3.0.tar.gz: 3034b64191fc6fca6ad407551ca5ce6c1a50d579

syncthing.spec

@@ -11,18 +11,17 @@
 %endif
 
 Name:		syncthing
-Version:	1.3.0
+Version:	1.6.1
 Release:	1
 Summary:	Syncthing
 License:	MIT
 URL:		http://syncthing.net/
-Source0:	https://github.com/%{name}/%{name}/releases/download/v%{version}/%{name}-source-v%{version}.tar.gz
-Source1:	syncthing@.service
+Source0:	https://github.com/syncthing/syncthing/archive/v%{version}/%{name}-%{version}.tar.gz
 Source10:	%{name}
 Group:		Networking/Other
 BuildRequires:  systemd
 BuildRequires:	procps
-BuildRequires:	go >= 1.7
+BuildRequires:	go >= 1.10
 BuildRequires:	git
 BuildRequires:  upx
 
@@ -40,10 +39,11 @@ transmitted over the Internet.
 Using syncthing, that control is returned to you.
 
 %prep
-%setup -q -n %{name}
+%setup -q
 
 %build
-./build.sh
+go run build.go -version v%{version}
+#./build.sh -version v%{version}
 upx bin/%{name}
 
 %install
@@ -52,6 +52,10 @@ rm -rf %{buildroot}
 install -d %{buildroot}{%{_bindir},%{_unitdir},%{_sbindir},%{_mandir}/man1/%{name}}
 
 install -pm 0755 bin/syncthing %{buildroot}%{_bindir}
+
+# repair unit
+sed -i '/MemoryDenyWriteExecute/d'  etc/linux-systemd/system/%{name}@.service
+
 install -pm 0644 etc/linux-systemd/system/%{name}@.service %{buildroot}%{_unitdir}
 install -Dm0644 man/* %{buildroot}%{_mandir}/man1/%{name}
 

syncthing@.service

@@ -1,12 +0,0 @@
-[Unit]
-Description=Syncthing
-
-[Service]
-Type=simple
-User=%I
-Environment=STNORESTART=yes
-ExecStart=/usr/bin/syncthing
-Restart=on-failure
-
-[Install]
-WantedBy=multi-user.target