From 3fdc0065e9b20692ba3765aa662c23a6c3ef40ff Mon Sep 17 00:00:00 2001
From: Yanko Kaneti <yaneti@declera.com>
Date: Jul 24 2018 09:42:09 +0000
Subject: Update to 1.12.4. Drop patch


---

diff --git a/.gitignore b/.gitignore
index 7516fd6..704c98e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -35,3 +35,4 @@ liferea-1.6.4.tar.gz
 /liferea-1.12.1.tar.bz2
 /liferea-1.12.2.tar.bz2
 /liferea-1.12.3.tar.bz2
+/liferea-1.12.4.tar.bz2
diff --git a/0001-Fixes-245-246-unread-count-of-vfolder.patch b/0001-Fixes-245-246-unread-count-of-vfolder.patch
deleted file mode 100644
index 0277f97..0000000
--- a/0001-Fixes-245-246-unread-count-of-vfolder.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From f4d3f2ac17b0ef5bd8e5642e88d33b04f29348d9 Mon Sep 17 00:00:00 2001
-From: leiaz <leiaz@free.fr>
-Date: Fri, 25 May 2018 21:05:57 +0200
-Subject: [PATCH] Fixes #245, #246: unread count of vfolder
-
-The workaround for #280 in 8923577a9573c74c3a412fab1dba01c6626b4434 was
-causing an infinite loop in `feedlist_unread_scan` (the assert that
-should have stopped it doesn't work because `scanState` is equal to
-`UNREAD_SCAN_FOUND_SELECTED` at that point).
-
-This is a different workaround to keep "Mark all as read" enabled for
-vfolders.
----
- src/ui/itemview.c |  3 ++-
- src/vfolder.c     | 10 ++++------
- 2 files changed, 6 insertions(+), 7 deletions(-)
-
-diff --git a/src/ui/itemview.c b/src/ui/itemview.c
-index 4c8159a1..0d653f84 100644
---- a/src/ui/itemview.c
-+++ b/src/ui/itemview.c
-@@ -28,6 +28,7 @@
- #include "itemlist.h"
- #include "itemview.h"
- #include "node.h"
-+#include "vfolder.h"
- #include "ui/ui_common.h"
- #include "ui/enclosure_list_view.h"
- #include "ui/liferea_shell.h"
-@@ -327,7 +328,7 @@ itemview_update (void)
- 	}
- 
- 	if (itemview->priv->node)
--		liferea_shell_update_allitems_actions (0 != itemview->priv->node->itemCount, 0 != itemview->priv->node->unreadCount);
-+		liferea_shell_update_allitems_actions (0 != itemview->priv->node->itemCount, (0 != itemview->priv->node->unreadCount) || IS_VFOLDER (itemview->priv->node));
- }
- 
- void
-diff --git a/src/vfolder.c b/src/vfolder.c
-index 1113235d..9d2d6821 100644
---- a/src/vfolder.c
-+++ b/src/vfolder.c
-@@ -253,13 +253,11 @@ static void vfolder_save (nodePtr node) { }
- static void
- vfolder_update_counters (nodePtr node) 
- {
--	/* There is no unread handling for search folders for performance reasons.
--	   Still the unread count controls menu/toolbar sensitivity. So as a
--	   workaround (see github#280) we set the number to 1 and rely on it
--	   being rendered nowhere (currently we always render the item counter
--	   for search folders in the feed list treeview) */
-+	/* There is no unread handling for search folders for performance
-+	 * reasons.So set everything to 0 here and don't bother with GUI
-+	 * updates... */
- 	node->needsUpdate = TRUE;
--	node->unreadCount = 1;
-+	node->unreadCount = 0;
- 	node->itemCount = db_search_folder_get_item_count (node->id);
- }
- 
--- 
-2.18.0.rc1
-
diff --git a/liferea.spec b/liferea.spec
index 34a0b1f..a138592 100644
--- a/liferea.spec
+++ b/liferea.spec
@@ -1,16 +1,13 @@
 Name:           liferea
 Epoch:          1
-Version:        1.12.3
-Release:        4%{?dist}
+Version:        1.12.4
+Release:        1%{?dist}
 Summary:        An RSS/RDF feed reader
 
 License:        GPLv2+
 URL:            http://lzone.de/liferea/
 Source0:        https://github.com/lwindolf/liferea/releases/download/v%{version}/liferea-%{version}.tar.bz2
 
-# https://github.com/lwindolf/liferea/pull/647
-Patch1: 0001-Fixes-245-246-unread-count-of-vfolder.patch
-
 BuildRequires:  webkit2gtk3-devel
 BuildRequires:  intltool
 BuildRequires:  libxslt-devel
@@ -72,6 +69,9 @@ desktop-file-validate ${RPM_BUILD_ROOT}/%{_datadir}/applications/net.sourceforge
 
 
 %changelog
+* Tue Jul 24 2018 Yanko Kaneti <yaneti@declera.com> - 1:1.12.4-1
+- Update to 1.12.4. Drop patch
+
 * Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.12.3-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
 
diff --git a/sources b/sources
index fe2993c..08aa632 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (liferea-1.12.3.tar.bz2) = 574dd13502fee81e81e88a0fa3a57028af2d2bfcfed5a132468a2be9257a886c7cbf958883c230deb6dbf952912ecc92631396ef6b5c353315833e0541db1208
+SHA512 (liferea-1.12.4.tar.bz2) = 99c98bed548e4e126882a6f05f50149dbdd9655154c224cdefda5caf996c4eb79ae75dda4df23aa4b3d3248a6aaab1b4589d83a429e1e94377ae73cb5b8e2098