From f999f06857bbf10ee83b1a68a8d10574cf301eaec67ba759ec510569789920f5 Mon Sep 17 00:00:00 2001 From: Alexei Sorokin Date: Wed, 28 Jun 2017 22:08:10 +0000 Subject: [PATCH] - Update to version 0.14.31. OBS-URL: https://build.opensuse.org/package/show/network/syncthing?expand=0&rev=108 --- syncthing-source-v0.14.29.tar.gz | 3 --- syncthing-source-v0.14.29.tar.gz.asc | 11 ----------- syncthing-source-v0.14.31.tar.gz | 3 +++ syncthing-source-v0.14.31.tar.gz.asc | 11 +++++++++++ syncthing.changes | 24 ++++++++++++++++++++++++ syncthing.spec | 8 +++++++- 6 files changed, 45 insertions(+), 15 deletions(-) delete mode 100644 syncthing-source-v0.14.29.tar.gz delete mode 100644 syncthing-source-v0.14.29.tar.gz.asc create mode 100644 syncthing-source-v0.14.31.tar.gz create mode 100644 syncthing-source-v0.14.31.tar.gz.asc diff --git a/syncthing-source-v0.14.29.tar.gz b/syncthing-source-v0.14.29.tar.gz deleted file mode 100644 index 540762d..0000000 --- a/syncthing-source-v0.14.29.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:80b46dcbf18d287269ef658d54b341865ea6b34a92aa28588cedba29dab316bd -size 5590935 diff --git a/syncthing-source-v0.14.29.tar.gz.asc b/syncthing-source-v0.14.29.tar.gz.asc deleted file mode 100644 index f3abcac..0000000 --- a/syncthing-source-v0.14.29.tar.gz.asc +++ /dev/null @@ -1,11 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1 - -iQEcBAABCAAGBQJZLQ1XAAoJENJubtAAZUo+m/gH/AywZ0NXQQjFscS7BMx7SI+z -v7zMWJTuE2LEeYjHtV6YeFVK1Z97MKqwNtPAZz6Jb8EWnefcrRh0WHE/yyQ4T4+m -yZ4DwxrTEOL1TuK3cJzkZz6KE6naBXWGFsRQn6ypwnYAeCYb5MN71F2oVT70+EQI -kTToeZN0zFAVLFY97LtlTIkKCcfcSz22OXGYQ38tjqD49PRP+AZAm0OjCwXXP7hJ -aDEKOmDz/f0/dtXRF9E/ANUl9dnuCLKm+WSENK5VyKydPY9IOTVtOwRMKhyIX5dh -RvX5OPSCgeM8MUGlJdEx5K6U0mS1CL/5BM7EeDNt9Gm+jI32D4HIOuBWuyMD+BA= -=3Uza ------END PGP SIGNATURE----- diff --git a/syncthing-source-v0.14.31.tar.gz b/syncthing-source-v0.14.31.tar.gz new file mode 100644 index 0000000..f330a16 --- /dev/null +++ b/syncthing-source-v0.14.31.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:065bb38a5fbe951b41bc67f5a34653ebd92956e2a31e87322dfbdb12ff6f509b +size 7920962 diff --git a/syncthing-source-v0.14.31.tar.gz.asc b/syncthing-source-v0.14.31.tar.gz.asc new file mode 100644 index 0000000..4251bef --- /dev/null +++ b/syncthing-source-v0.14.31.tar.gz.asc @@ -0,0 +1,11 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1 + +iQEcBAABCAAGBQJZUgpdAAoJENJubtAAZUo+QW8H/0fcDvkDq/BWs+bqVULZdRdr +NH6jENGrNAJe7JdvQmXxPO/t0JdJY7Sx9BBOyqW7RZVGb7UJWR1AdpET6gRv4mJm +1vnNSTD0iei9t4pWEoCp+4jh4ebuPpL7LkWQHF4COcm3eVsYYkbYBUaPj+TmPpbr +AwFGY/0v7h/dFN7whS/uS2eh3dDYMyzdNzJBKl65epBaFNdws0sv0rIF4XzSAY/I +hNxGWoER9rD6vm/ycZa7iKwhSI2Gc+DCopkq5wJkNhR6krPWB/3p1iIkvg8zABQT +/W53Vnk4CK3TFrlooiEXkO+fQtTZ5HfYDtDpuZa8cGQSldUgtCdvjk4MleqvV8c= +=Bhgx +-----END PGP SIGNATURE----- diff --git a/syncthing.changes b/syncthing.changes index 56a63c9..726bdbe 100644 --- a/syncthing.changes +++ b/syncthing.changes @@ -1,3 +1,25 @@ +------------------------------------------------------------------- +Wed Jun 28 19:20:44 UTC 2017 - sor.alexei@meowr.ru + +- Update to version 0.14.31 (changes since 0.14.29): + * Correctly clear warning "path is a subdirectory of other + folder" in directory dialogue (gh#syncthing/syncthing#3433). + * Conflict copies filename now includes the ID of the last device + to change the file (gh#syncthing/syncthing#3524). + * Directories offered by other devices can now be ignored + (gh#syncthing/syncthing#3993). + * Changed device name takes effect with restart; device name is + not sent to unknown devices (gh#syncthing/syncthing#4164). + * Correctly show CPU usage when started with -no-restart option + (gh#syncthing/syncthing#4183). + * Icons and directory information in local device summary is + consistent with that in directories + (gh#syncthing/syncthing#4100). + * Fix a data race in KCP & STUN (gh#syncthing/syncthing#4177). + * Ignore patterns on newly accepted directories are no longer + erroneously inherited from an earlier added directory + (gh#syncthing/syncthing#4203). + ------------------------------------------------------------------- Wed Jun 7 20:12:23 UTC 2017 - sor.alexei@meowr.ru @@ -32,6 +54,8 @@ Wed May 24 12:01:32 UTC 2017 - sor.alexei@meowr.ru entries to disallow subnets (gh#syncthing/syncthing#4096). * Doing "Override changes" now uses less memory (gh#syncthing/syncthing#4112). +- Require golang.org/x/net/context on openSUSE older than + openSUSE Leap 15.x. ------------------------------------------------------------------- Wed Apr 26 15:49:18 UTC 2017 - sor.alexei@meowr.ru diff --git a/syncthing.spec b/syncthing.spec index 8294c30..fb9bca3 100644 --- a/syncthing.spec +++ b/syncthing.spec @@ -17,7 +17,7 @@ Name: syncthing -Version: 0.14.29 +Version: 0.14.31 Release: 0 Summary: FOSS Continuous File Synchronisation License: MPL-2.0 @@ -30,6 +30,9 @@ Source3: %{name}.firewall BuildRequires: go >= 1.5 BuildRequires: systemd BuildRequires: systemd-rpm-macros +%if 0%{?suse_version} <= 1320 +BuildRequires: golang-org-x-net-context +%endif %description Syncthing replaces proprietary sync and cloud services with @@ -47,6 +50,9 @@ cp -f %{SOURCE3} %{name}.firewall sed -i '/^RestartForceExitStatus=/d;s/^\(SuccessExitStatus=\).*$/\12/' \ etc/linux-systemd/system/syncthing@.service %endif +%if 0%{?suse_version} <= 1320 +find -type f -name '*.go' -exec sed -i 's|"context"|"golang.org/x/net/context"|' {} \; +%endif %build mkdir -p build/src/ build/vendor/