From ce9470bb9f1aab63255bbd8ce0435508c8603799 Mon Sep 17 00:00:00 2001 From: Jamie Nguyen Date: Wed, 26 Mar 2014 17:28:07 +0000 Subject: [PATCH] Update to upstrem release 2.8 --- .gitignore | 1 + newsbeuter-2.5-json-boolean-include.patch | 29 ----------------------- newsbeuter.spec | 15 ++++++------ sources | 2 +- 4 files changed, 10 insertions(+), 37 deletions(-) delete mode 100644 newsbeuter-2.5-json-boolean-include.patch diff --git a/.gitignore b/.gitignore index b8634ae..50cd104 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ newsbeuter-2.2.tar.gz /newsbeuter-2.5.tar.gz /newsbeuter-2.6.tar.gz /newsbeuter-2.7.tar.gz +/newsbeuter-2.8.tar.gz diff --git a/newsbeuter-2.5-json-boolean-include.patch b/newsbeuter-2.5-json-boolean-include.patch deleted file mode 100644 index fad88d2..0000000 --- a/newsbeuter-2.5-json-boolean-include.patch +++ /dev/null @@ -1,29 +0,0 @@ -Description: propagate boolean json type -Apparently the libjson project decided to rename their boolean type to -json_bool... -Author: Nico Golde -Bug-Debian: http://bugs.debian.org/689225 - ---- -The information above should follow the Patch Tagging Guidelines, please -checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here -are templates for supplementary fields that you might want to add: - -Origin: vendor -Bug: http://bugs.debian.org/689225 -Bug-Debian: http://bugs.debian.org/689225 -Forwarded: - -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 -@@ -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")); -- 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 e3ef6e8..07e6452 100644 --- a/newsbeuter.spec +++ b/newsbeuter.spec @@ -1,5 +1,5 @@ Name: newsbeuter -Version: 2.7 +Version: 2.8 Release: 1%{?dist} Summary: Configurable text-based feed reader @@ -7,8 +7,6 @@ Group: Applications/Internet License: MIT URL: http://newsbeuter.org/ Source0: http://newsbeuter.org/downloads/%{name}-%{version}.tar.gz -# https://code.google.com/p/newsbeuter/issues/detail?id=303 -Patch0: newsbeuter-2.5-json-boolean-include.patch BuildRequires: gettext BuildRequires: json-c-devel @@ -29,7 +27,6 @@ keyboard. %prep %setup -q -%patch0 -p1 -b .json-boolean-include %build @@ -40,10 +37,10 @@ make %{?_smp_mflags} prefix=%{_prefix} %install make install DESTDIR=%{buildroot} prefix=%{_prefix} -# %doc will be used in %files to pull in the documentation -rm -rf %{buildroot}/%{_prefix}/share/doc/%{name} +# %%doc will be used in %%files to pull in the documentation +rm -rf %{buildroot}/%{_datadir}/doc/%{name} # remove executable permissions on man pages -find %{buildroot}/%{_prefix}/share/man -type f -exec chmod -x {} ';' +find %{buildroot}/%{_mandir} -type f -exec chmod -x {} ';' %find_lang %{name} @@ -55,6 +52,10 @@ find %{buildroot}/%{_prefix}/share/man -type f -exec chmod -x {} ';' %changelog +* Wed Mar 26 2014 Jamie Nguyen - 2.8-1 +- update to upstream release 2.8 +- remove redundant patch (merged upstream) + * Tue Sep 03 2013 Jamie Nguyen - 2.7-1 - update to upstream release 2.7 diff --git a/sources b/sources index 843eac5..d5d75d6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -cc8d43e8957875608d3b77679f437af6 newsbeuter-2.7.tar.gz +5d8f1a5eed700beccfeb512ae003613d newsbeuter-2.8.tar.gz