From 235f7752b70d9bbe5c4294dbb1d0e15b8fd17ee53e3605929d235951729b2996 Mon Sep 17 00:00:00 2001
From: Alexei Sorokin <sor.alexei@meowr.ru>
Date: Mon, 11 Jan 2016 09:13:46 +0000
Subject: [PATCH] - Update to 0.12.12.

OBS-URL: https://build.opensuse.org/package/show/network/syncthing?expand=0&rev=49
---
 syncthing-source-v0.12.11.tar.gz |  3 ---
 syncthing-source-v0.12.12.tar.gz |  3 +++
 syncthing.changes                | 15 +++++++++++++++
 syncthing.spec                   |  8 +++++---
 4 files changed, 23 insertions(+), 6 deletions(-)
 delete mode 100644 syncthing-source-v0.12.11.tar.gz
 create mode 100644 syncthing-source-v0.12.12.tar.gz

diff --git a/syncthing-source-v0.12.11.tar.gz b/syncthing-source-v0.12.11.tar.gz
deleted file mode 100644
index 81f38e8..0000000
--- a/syncthing-source-v0.12.11.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:390a2c4c80566e00a0923e3f9116b4253336168320a7e9930555785e831830ee
-size 4798209
diff --git a/syncthing-source-v0.12.12.tar.gz b/syncthing-source-v0.12.12.tar.gz
new file mode 100644
index 0000000..2581cd5
--- /dev/null
+++ b/syncthing-source-v0.12.12.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ce5df981dd7940c8000aa7f7221b3f81789eea4934cfc92db805664bfdafb19f
+size 4800942
diff --git a/syncthing.changes b/syncthing.changes
index de59ca1..d2341a0 100644
--- a/syncthing.changes
+++ b/syncthing.changes
@@ -1,3 +1,18 @@
+-------------------------------------------------------------------
+Mon Jan 11 07:46:12 UTC 2016 - sor.alexei@meowr.ru
+
+- Update to 0.12.12:
+  * Update kardianos/osext.
+  * Change default max conflicts to 10.
+  * Do not conflict copy conflict copies.
+  * Do not allow in use CSRF tokens to expire.
+  * Add relaying to main settings dialog.
+  * Do not resolve destination address until we need to.
+  * More fine grained locking in discovery cache.
+  * Add STNODEFAULTFOLDER envvar to skip default directory
+    creation on new install.
+- Remove Go marcos usage for now.
+
 -------------------------------------------------------------------
 Thu Jan  7 18:53:07 UTC 2016 - sor.alexei@meowr.ru
 
diff --git a/syncthing.spec b/syncthing.spec
index eec2499..7ae325d 100644
--- a/syncthing.spec
+++ b/syncthing.spec
@@ -17,7 +17,7 @@
 
 
 Name:           syncthing
-Version:        0.12.11
+Version:        0.12.12
 Release:        0
 Summary:        FOSS Continuous File Synchronisation
 License:        MPL-2.0
@@ -46,8 +46,10 @@ sed -i '/^RestartForceExitStatus=/d;s/^\(SuccessExitStatus=\).*$/\12/' \
 %endif
 
 %build
-%goprep github.com/%{name}/%{name}
-go run build.go $BUILDFLAGS -no-upgrade
+export GOPATH="$PWD/build"
+mkdir -p build/src/github.com/%{name}/%{name}
+ls | sed '/^build$/d' | xargs cp -at build/src/github.com/%{name}/%{name}
+go run build.go -no-upgrade
 
 %install
 install -Dm 0755 bin/%{name} %{buildroot}%{_bindir}/%{name}