diff --git a/.gitignore b/.gitignore index d725eb2..fd2be35 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /syncthing-gtk-0.9.2.5.tar.gz /syncthing-gtk-0.9.2.6.tar.gz +/syncthing-gtk-0.9.3.tar.gz diff --git a/00-fix-type-errors.patch b/00-fix-type-errors.patch new file mode 100644 index 0000000..b2e71b2 --- /dev/null +++ b/00-fix-type-errors.patch @@ -0,0 +1,31 @@ +From c4349587f1d5a352eacaa1551475f8d21f95145d Mon Sep 17 00:00:00 2001 +From: kozec +Date: Sun, 18 Feb 2018 20:41:03 +0100 +Subject: [PATCH] Fix: Additional errors logged when connection fails. Fixes + #423 + +--- + syncthing_gtk/daemon.py | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/syncthing_gtk/daemon.py b/syncthing_gtk/daemon.py +index 0f2b009..d694632 100644 +--- a/syncthing_gtk/daemon.py ++++ b/syncthing_gtk/daemon.py +@@ -1166,13 +1166,13 @@ def _split_headers(self, buffer): + code = int(headers[0].split(b" ")[1]) + if code == 401: + self._error(HTTPAuthException(buffer)) +- return ++ return None, None + elif code == 404: + self._error(HTTPCode(404, "Not found", buffer, headers)) +- return ++ return None, None + elif code != 200: + self._error(HTTPCode(code, response, buffer, headers)) +- return ++ return None, None + except Exception, e: + # That probably wasn't HTTP + import traceback diff --git a/sources b/sources index dc3be9a..b14f99b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (syncthing-gtk-0.9.2.6.tar.gz) = 9de58df4cb90971d4c1c48c3b0c59fa2485b519aa6d17c12faf33b394c52f3e42930bdeac750474a9115af3f1349509dcc6ae8862a08643bc8f10b8a8394deed +SHA512 (syncthing-gtk-0.9.3.tar.gz) = 7014250a782b78e1ef0898474620d56b08020e06e6af3ab646cb0f55228f16766d0f29d1e1de749b34d98255010f9fcffe8c3752c2f92f25a76e39e50e31fa81 diff --git a/syncthing-gtk.spec b/syncthing-gtk.spec index cfca16c..7743219 100644 --- a/syncthing-gtk.spec +++ b/syncthing-gtk.spec @@ -2,17 +2,23 @@ Name: syncthing-gtk Summary: Syncthing GTK+ GUI -Version: 0.9.2.6 -Release: 4%{?dist} +Version: 0.9.3 +Release: 1%{?dist} License: GPLv2 URL: https://github.com/syncthing/%{name} Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz Source1: %{name}.appdata.xml +# Upstream patch to fix some type errors +Patch0: 00-fix-type-errors.patch + BuildRequires: desktop-file-utils BuildRequires: libappstream-glib +BuildRequires: python2-bcrypt +BuildRequires: python2-dateutil BuildRequires: python2-devel +BuildRequires: python2-inotify BuildRequires: python2-setuptools BuildArch: noarch @@ -23,6 +29,7 @@ Requires: psmisc Requires: python2-bcrypt Requires: python2-dateutil Requires: python2-gobject +Requires: python2-inotify Recommends: syncthing >= 0.13 @@ -39,7 +46,7 @@ This package contains the GTK+ GUI for syncthing. %prep -%autosetup +%autosetup -p1 %build @@ -104,6 +111,9 @@ appstream-util validate-relax --nonet \ %changelog +* Tue Feb 20 2018 Fabio Valentini - 0.9.3-1 +- Update to version 0.9.3. + * Fri Feb 09 2018 Fedora Release Engineering - 0.9.2.6-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild