diff --git a/syncthing.changes b/syncthing.changes index 4466a7e..1d03335 100644 --- a/syncthing.changes +++ b/syncthing.changes @@ -24,6 +24,8 @@ Thu Sep 14 05:05:45 UTC 2017 - sor.alexei@meowr.ru gh#syncthing/syncthing#4305). * Fix a crash related to a nil reference in ignore handling (gh#syncthing/syncthing#4300). +- Stop requiring golang.org/x/net/context. + ------------------------------------------------------------------- Fri Jul 21 13:30:37 UTC 2017 - sor.alexei@meowr.ru diff --git a/syncthing.spec b/syncthing.spec index c069e2f..ea16156 100644 --- a/syncthing.spec +++ b/syncthing.spec @@ -30,12 +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 +Syncthing replaces proprietary synch and cloud services with something open, trustworthy and decentralised. Your data is your data alone and you deserve to choose where it is stored, if it is shared with some third party and how it's transmitted over the @@ -50,9 +47,6 @@ 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/