[newsbeuter] Update to upstream release 2.6

[Jamie Nguyen]

commit 333a48b790e403fc789e8d5dd7562303249d795f
Author: Jamie Nguyen <j at jamielinux.com>
Date:   Tue Mar 19 22:58:13 2013 +0000

    Update to upstream release 2.6

 .gitignore                                |    1 +
 newsbeuter-2.5-includes.patch             |   90 -----------------------------
 newsbeuter-2.5-json-boolean-include.patch |    4 +-
 newsbeuter.spec                           |   14 +++--
 sources                                   |    2 +-
 5 files changed, 12 insertions(+), 99 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index f3ea83f..af82a68 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ newsbeuter-2.2.tar.gz
 /newsbeuter-2.3.tar.gz
 /newsbeuter-2.4.tar.gz
 /newsbeuter-2.5.tar.gz
+/newsbeuter-2.6.tar.gz
diff --git a/newsbeuter-2.5-json-boolean-include.patch b/newsbeuter-2.5-json-boolean-include.patch
index 7c34b5b..fad88d2 100644
--- a/newsbeuter-2.5-json-boolean-include.patch
+++ b/newsbeuter-2.5-json-boolean-include.patch
@@ -18,11 +18,11 @@ Index: newsbeuter-2.5/src/ttrss_api.cpp
 ===================================================================
 --- newsbeuter-2.5.orig/src/ttrss_api.cpp	2012-09-30 17:25:23.000000000 +0200
 +++ newsbeuter-2.5/src/ttrss_api.cpp	2012-09-30 17:43:24.000000000 +0200
-@@ -220,7 +220,7 @@
+@@ -219,7 +219,7 @@
  		const char * link = json_object_get_string(json_object_object_get(item_obj, "link"));
  		const char * content = json_object_get_string(json_object_object_get(item_obj, "content"));
  		time_t updated = (time_t)json_object_get_int(json_object_object_get(item_obj, "updated"));
--		boolean unread = json_object_get_boolean(json_object_object_get(item_obj, "unread"));
+-		bool unread = json_object_get_boolean(json_object_object_get(item_obj, "unread"));
 +		json_bool unread = json_object_get_boolean(json_object_object_get(item_obj, "unread"));
  
  		rsspp::item item;
diff --git a/newsbeuter.spec b/newsbeuter.spec
index 65a7ac1..b0b6078 100644
--- a/newsbeuter.spec
+++ b/newsbeuter.spec
@@ -1,15 +1,14 @@
 Name:           newsbeuter
-Version:        2.5
-Release:        5%{?dist}
+Version:        2.6
+Release:        1%{?dist}
 Summary:        Configurable text-based feed reader
 
 Group:          Applications/Internet
 License:        MIT
 URL:            http://newsbeuter.org/
 Source0:        http://newsbeuter.org/downloads/%{name}-%{version}.tar.gz
-Patch0:         newsbeuter-2.5-includes.patch
 # https://code.google.com/p/newsbeuter/issues/detail?id=303
-Patch1:         newsbeuter-2.5-json-boolean-include.patch
+Patch0:         newsbeuter-2.5-json-boolean-include.patch
 
 BuildRequires:  gettext
 BuildRequires:  json-c-devel
@@ -30,8 +29,7 @@ keyboard.
 
 %prep
 %setup -q
-%patch0 -p1 -b .includes
-%patch1 -p1 -b .json-boolean-include
+%patch0 -p1 -b .json-boolean-include
 
 
 %build
@@ -57,6 +55,10 @@ find %{buildroot}/%{_prefix}/share/man -type f -exec chmod -x {} ';'
 
 
 %changelog
+* Tue Mar 19 2013 Jamie Nguyen <jamielinux at fedoraproject.org> - 2.6-1
+- update to upstream release 2.6
+- remove redundant patch
+
 * Fri Feb 22 2013 Jamie Nguyen <jamielinux at fedoraproject.org> - 2.5-5
 - apply newsbeuter-2.5-json-boolean-include.patch
 
diff --git a/sources b/sources
index 37d4125..e540cd8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-bb8cd3f2a3693de4c16be28c869a1f75  newsbeuter-2.5.tar.gz
+4a36627c5fabca6b2718a0ac78e6666f  newsbeuter-2.6.tar.gz