- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>

.gitignore

@@ -4,3 +4,5 @@ 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
+/newsbeuter-2.9.tar.gz

newsbeuter-2.5-json-boolean-include.patch

@@ -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 <nion@debian.org>
-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;
- 

newsbeuter-2.8-Add-solarized-light-colorscheme.patch

@@ -0,0 +1,33 @@
+From dca71f9bc1c48bfdef339a9c27fada9882b2c10c Mon Sep 17 00:00:00 2001
+From: Jamie Nguyen <j@jamielinux.com>
+Date: Fri, 5 Dec 2014 15:22:31 +0000
+Subject: [PATCH 2/2] Add solarized-light colorscheme
+
+---
+ contrib/colorschemes/solarized-light | 14 ++++++++++++++
+ 1 file changed, 14 insertions(+)
+ create mode 100644 contrib/colorschemes/solarized-light
+
+diff --git a/contrib/colorschemes/solarized-light b/contrib/colorschemes/solarized-light
+new file mode 100644
+index 0000000..52b88ea
+--- /dev/null
++++ b/contrib/colorschemes/solarized-light
+@@ -0,0 +1,14 @@
++# solarized color scheme for newsbeuter <http://www.newsbeuter.org/>
++# more on solarized: http://ethanschoonover.com/solarized
++
++color   article             default   default
++color   background          default   default
++color   info                default   white
++color   listfocus           white     yellow
++color   listfocus_unread    default   yellow
++color   listnormal          default   default
++color   listnormal_unread   black     default
++
++highlight article "^(Title):.*$"         blue    default
++highlight article "https?://[^ ]+"       red     default
++highlight article "\\[image\\ [0-9]+\\]" green   default
+-- 
+2.1.0
+

newsbeuter-2.8-Improve-solarized-dark-colorscheme.patch

@@ -0,0 +1,36 @@
+From 26701fe66aa7d2efc17042e2ec7004e4b0aee233 Mon Sep 17 00:00:00 2001
+From: Jamie Nguyen <j@jamielinux.com>
+Date: Fri, 5 Dec 2014 15:22:13 +0000
+Subject: [PATCH 1/2] Improve solarized-dark colorscheme
+
+---
+ contrib/colorschemes/solarized-dark | 16 +++++++++++-----
+ 1 file changed, 11 insertions(+), 5 deletions(-)
+
+diff --git a/contrib/colorschemes/solarized-dark b/contrib/colorschemes/solarized-dark
+index d6cbb0d..4e9dc57 100644
+--- a/contrib/colorschemes/solarized-dark
++++ b/contrib/colorschemes/solarized-dark
+@@ -1,8 +1,14 @@
+ # solarized color scheme for newsbeuter <http://www.newsbeuter.org/>
+ # more on solarized: http://ethanschoonover.com/solarized
+ 
+-color listnormal color244 color234
+-color listfocus  color166 color235 
+-color info       color136 color235 
+-color background color244 color234
+-color article    color244 color234
++color   article             default   default
++color   background          default   default
++color   info                default   black
++color   listfocus           black     yellow
++color   listfocus_unread    default   yellow
++color   listnormal          default   default
++color   listnormal_unread   white     default
++
++highlight article "^(Title):.*$"         blue    default
++highlight article "https?://[^ ]+"       red     default
++highlight article "\\[image\\ [0-9]+\\]" green   default
+-- 
+2.1.0
+

newsbeuter-2.9-ncurses6.patch

@@ -0,0 +1,14 @@
+diff -u -r -U5 --no-dereference newsbeuter-2.9/config.sh newsbeuter-2.9.ncurses6/config.sh
+--- newsbeuter-2.9/config.sh	2015-08-23 10:38:43.468631663 -0400
++++ newsbeuter-2.9.ncurses6/config.sh	2015-08-23 10:38:01.000000000 -0400
+@@ -108,9 +108,9 @@
+ ( check_pkg "json" "" 0.11 || check_pkg "json-c" "" 0.11 ) || fail "json-c"
+ 
+ if [ `uname -s` = "Darwin" ]; then
+ 	check_custom "ncurses5.4" "ncurses5.4-config" || fail "ncurses5.4"
+ elif [ `uname -s` != "OpenBSD" ]; then
+-	check_custom "ncursesw5" "ncursesw5-config" ||  fail "ncursesw"
++	check_custom "ncursesw6" "ncursesw6-config" ||  fail "ncursesw"
+ fi
+ check_ssl_implementation
+ all_aboard_the_fail_boat

newsbeuter-2.9_json-c_013.patch

@@ -0,0 +1,53 @@
+Index: newsbeuter-2.9/src/feedhq_api.cpp
+===================================================================
+--- newsbeuter-2.9.orig/src/feedhq_api.cpp
++++ newsbeuter-2.9/src/feedhq_api.cpp
+@@ -132,7 +132,7 @@ std::vector<tagged_feedurl> feedhq_api::
+ 	// TODO: parse result
+ 
+ 	struct json_object * reply = json_tokener_parse(result.c_str());
+-	if (is_error(reply)) {
++	if (reply == NULL) {
+ 		LOG(LOG_ERROR, "feedhq_api::get_subscribed_urls: failed to parse response as JSON.");
+ 		return urls;
+ 	}
+Index: newsbeuter-2.9/src/oldreader_api.cpp
+===================================================================
+--- newsbeuter-2.9.orig/src/oldreader_api.cpp
++++ newsbeuter-2.9/src/oldreader_api.cpp
+@@ -134,7 +134,7 @@ std::vector<tagged_feedurl> oldreader_ap
+ 	// TODO: parse result
+ 
+ 	struct json_object * reply = json_tokener_parse(result.c_str());
+-	if (is_error(reply)) {
++	if (reply == NULL) {
+ 		LOG(LOG_ERROR, "oldreader_api::get_subscribed_urls: failed to parse response as JSON.");
+ 		return urls;
+ 	}
+Index: newsbeuter-2.9/src/ttrss_api.cpp
+===================================================================
+--- newsbeuter-2.9.orig/src/ttrss_api.cpp
++++ newsbeuter-2.9/src/ttrss_api.cpp
+@@ -113,19 +113,19 @@ struct json_object * ttrss_api::run_op(c
+ 	LOG(LOG_DEBUG, "ttrss_api::run_op(%s,...): post=%s reply = %s", op.c_str(), req_data.c_str(), result.c_str());
+ 
+ 	struct json_object * reply = json_tokener_parse(result.c_str());
+-	if (is_error(reply)) {
++	if (reply == NULL) {
+ 		LOG(LOG_ERROR, "ttrss_api::run_op: reply failed to parse: %s", result.c_str());
+ 		return NULL;
+ 	}
+ 
+ 	struct json_object * status = json_object_object_get(reply, "status");
+-	if (is_error(status)) {
++	if (status == NULL) {
+ 		LOG(LOG_ERROR, "ttrss_api::run_op: no status code");
+ 		return NULL;
+ 	}
+ 
+ 	struct json_object * content = json_object_object_get(reply, "content");
+-	if (is_error(content)) {
++	if (content == NULL) {
+ 		LOG(LOG_ERROR, "ttrss_api::run_op: no content part in answer from server");
+ 		return NULL;
+ 	}

newsbeuter.spec

@@ -1,20 +1,27 @@
 Name:           newsbeuter
-Version:        2.7
+Version:        2.9
-Release:        1%{?dist}
+Release:        12%{?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
-# https://code.google.com/p/newsbeuter/issues/detail?id=303
-Patch0:         newsbeuter-2.5-json-boolean-include.patch
 
+# https://github.com/akrennmair/newsbeuter/pull/157
+# The included colorscheme is suboptimal.
+Patch0:         %{name}-2.8-Improve-solarized-dark-colorscheme.patch
+Patch1:         %{name}-2.8-Add-solarized-light-colorscheme.patch
+
+Patch2:         %{name}-2.9-ncurses6.patch
+Patch3:         %{name}-2.9_json-c_013.patch
+
+BuildRequires:  gcc-c++
 BuildRequires:  gettext
 BuildRequires:  json-c-devel
 BuildRequires:  libcurl-devel
 BuildRequires:  libxml2-devel
 BuildRequires:  ncurses-devel
+BuildRequires:  perl-interpreter
 BuildRequires:  pkgconfig
 BuildRequires:  sqlite-devel
 BuildRequires:  stfl-devel
@@ -29,32 +36,108 @@ keyboard.
 
 %prep
 %setup -q
-%patch0 -p1 -b .json-boolean-include
+%patch0 -p1 -b .improve-solarized-dark
+%patch1 -p1 -b .add-solarized-light
+%if 0%{?fedora} > 23
+%patch2 -p1 -b .ncurses6
+%endif
+%if 0%{?fedora} >= 28
+%patch3 -p1 -b .json-c_013
+%endif
 
 
 %build
 export CXXFLAGS="%{optflags}"
+export LDFLAGS="%{?__global_ldflags}"
 ./config.sh
 make %{?_smp_mflags} prefix=%{_prefix}
 
 
 %install
-make install DESTDIR=%{buildroot} prefix=%{_prefix}
+%make_install prefix=%{_prefix}
-# %doc will be used in %files to pull in the documentation
+# %%doc will be used in %%files to pull in the documentation
-rm -rf %{buildroot}/%{_prefix}/share/doc/%{name}
+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 '{}' ';'
+# remove exectuable permissions on contrib/ scripts
+find contrib/ -type f -exec chmod -x '{}' ';'
 %find_lang %{name}
 
 
 %files -f %{name}.lang
-%defattr(-,root,root,-)
+%doc README doc/xhtml/newsbeuter.html doc/example-config
-%doc README LICENSE doc/xhtml/newsbeuter.html doc/example-config
+%doc contrib/
+%license LICENSE
 %{_mandir}/man1/*
 %{_bindir}/*
 
 
 %changelog
+* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.9-12
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.9-11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.9-10
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Tue Mar 06 2018 Björn Esser <besser82@fedoraproject.org> - 2.9-9
+- Rebuilt for libjson-c.so.4 (json-c v0.13.1)
+
+* Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.9-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Sun Dec 10 2017 Björn Esser <besser82@fedoraproject.org> - 2.9-7
+- Rebuilt for libjson-c.so.3
+
+* Sun Dec 10 2017 Björn Esser <besser82@fedoraproject.org> - 2.9-6
+- Fix build by adding BR: perl-interpreter
+
+* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.9-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
+
+* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.9-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.9-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
+* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 2.9-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
+* Sun Aug 23 2015 Ben Boeckel <mathstuf@gmail.com> - 2.9-1
+- update to 2.9
+- use %%license macro
+- backup patched files
+- use ncurses6
+
+* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.8-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
+* Sat May 02 2015 Kalev Lember <kalevlember@gmail.com> - 2.8-7
+- Rebuilt for GCC 5 C++11 ABI change
+
+* Fri Dec 05 2014 Jamie Nguyen <jamielinux@fedoraproject.org> - 2.8-6
+- add solarized-light colorscheme
+
+* Thu Dec 04 2014 Jamie Nguyen <jamielinux@fedoraproject.org> - 2.8-5
+- remove executable permissions from contrib/ scripts
+- improve solarized dark colorscheme
+
+* Thu Dec 04 2014 Jamie Nguyen <jamielinux@fedoraproject.org> - 2.8-4
+- include contrib/ folder
+
+* Sun Aug 17 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.8-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+
+* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.8-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
+* Wed Mar 26 2014 Jamie Nguyen <jamielinux@fedoraproject.org> - 2.8-1
+- update to upstream release 2.8
+- remove redundant patch (merged upstream)
+
 * Tue Sep 03 2013 Jamie Nguyen <jamielinux@fedoraproject.org> - 2.7-1
 - update to upstream release 2.7
 

sources

@@ -1 +1 @@
-cc8d43e8957875608d3b77679f437af6  newsbeuter-2.7.tar.gz
+9cf332dc7e591023147bda7add430835  newsbeuter-2.9.tar.gz