From ceea18de3e3d13acb8373f8281f97df475fb4892 Mon Sep 17 00:00:00 2001
From: Yanko Kaneti <yaneti@declera.com>
Date: Oct 30 2015 22:25:26 +0000
Subject: Update to 1.10.17. Fixes various dialog UI issues with recent gtk+


---

diff --git a/.gitignore b/.gitignore
index 851a682..de4abdc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,3 +26,4 @@ liferea-1.6.4.tar.gz
 /liferea-1.10.14.tar.bz2
 /liferea-1.10.15.tar.bz2
 /liferea-1.10.16.tar.bz2
+/liferea-1.10.17.tar.bz2
diff --git a/0001-Fix-dialog-ui-load-with-latest-gtkbuilder.patch b/0001-Fix-dialog-ui-load-with-latest-gtkbuilder.patch
deleted file mode 100644
index a0f565a..0000000
--- a/0001-Fix-dialog-ui-load-with-latest-gtkbuilder.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 7d7d58a4dbb8d27013ac6021255e3f026755c8ed Mon Sep 17 00:00:00 2001
-From: Yanko Kaneti <yaneti@declera.com>
-Date: Mon, 3 Aug 2015 11:27:36 +0300
-Subject: [PATCH] Fix dialog ui load with latest gtkbuilder
-
-With recent gtk3 loading the feed preferences dialog fails with:
-/usr/share/liferea/liferea.ui:519:65 Object with ID liststore6 not found
-Add liststore6 to the explicit objects loaded.
----
- src/ui/liferea_dialog.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/ui/liferea_dialog.c b/src/ui/liferea_dialog.c
-index 19a52e4..1b0e63b 100644
---- a/src/ui/liferea_dialog.c
-+++ b/src/ui/liferea_dialog.c
-@@ -113,7 +113,7 @@ liferea_dialog_new (const gchar *filename, gchar *name)
- 	gchar	*objs[] = { "adjustment1", "adjustment2", "adjustment3",
- 			    "adjustment4", "adjustment5", "adjustment6",
- 			    "liststore1", "liststore2", "liststore3",
--			    "liststore4", "liststore5",
-+			    "liststore4", "liststore5", "liststore6",
- 			    "refreshIntervalSpinButton", name, NULL };
- 
- 	ld = LIFEREA_DIALOG (g_object_new (LIFEREA_DIALOG_TYPE, NULL));
--- 
-2.5.0
-
diff --git a/liferea.spec b/liferea.spec
index 9278283..f84057a 100644
--- a/liferea.spec
+++ b/liferea.spec
@@ -1,16 +1,13 @@
 Name:           liferea
 Epoch:          1
-Version:        1.10.16
-Release:        2%{?dist}
+Version:        1.10.17
+Release:        1%{?dist}
 Summary:        An RSS/RDF feed reader
 
 License:        GPLv2+
 URL:            http://lzone.de/liferea/
 Source0:        https://github.com/lwindolf/%{name}/releases/download/v%{version}/%{name}-%{version}.tar.bz2
 
-# https://github.com/lwindolf/liferea/pull/227
-Patch1: 0001-Fix-dialog-ui-load-with-latest-gtkbuilder.patch
-
 BuildRequires:  webkitgtk3-devel
 BuildRequires:  intltool
 BuildRequires:  libxslt-devel
@@ -30,7 +27,6 @@ browse through their items, and show their contents.
 
 %prep
 %setup -q -n %{name}-%{version}
-%patch1 -p1
 iconv -f iso8859-1 -t utf-8 man/pl/liferea.1 > man/pl/liferea.1.conv && \
 mv -f man/pl/liferea.1.conv man/pl/liferea.1
 
@@ -86,6 +82,9 @@ fi
 
 
 %changelog
+* Sat Oct 31 2015 Yanko Kaneti <yaneti@declera.com> - 1:1.10.17-1
+- Update to 1.10.17. Fixes various dialog UI issues with recent gtk+
+
 * Mon Oct 26 2015 Yanko Kaneti <yaneti@declera.com> - 1:1.10.16-2
 - Pick up upstream fix for pref dialog crash (#1275106)
 
diff --git a/sources b/sources
index 9d513db..debe346 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6bbb6aed103d305498a1dafaaf032d18  liferea-1.10.16.tar.bz2
+7dfe37ecb7c1c5e2207551ede7c9df66  liferea-1.10.17.tar.bz2