Compare commits
6 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
d92d9951e2 | ||
|
27bb142e1c | ||
|
|
18551420a2 | ||
|
|
e7a436a50b | ||
|
|
0b4ad53626 | ||
|
18fb33fa8d |
6
.gitignore
vendored
6
.gitignore
vendored
@ -1,8 +1,2 @@
|
||||
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
|
||||
/newsbeuter-2.7.tar.gz
|
||||
/newsbeuter-2.8.tar.gz
|
||||
/newsbeuter-2.9.tar.gz
|
||||
|
||||
@ -1,33 +0,0 @@
|
||||
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
|
||||
|
||||
@ -1,36 +0,0 @@
|
||||
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
|
||||
|
||||
@ -1,14 +0,0 @@
|
||||
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
|
||||
@ -1,53 +0,0 @@
|
||||
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;
|
||||
}
|
||||
160
newsbeuter.spec
160
newsbeuter.spec
@ -1,30 +1,15 @@
|
||||
Name: newsbeuter
|
||||
Version: 2.9
|
||||
Release: 12%{?dist}
|
||||
Version: 2.3
|
||||
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
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
|
||||
# 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
|
||||
BuildRequires: pkgconfig, gettext, stfl-devel, sqlite-devel, libcurl-devel, libxml2-devel, ncurses-devel
|
||||
Requires: stfl
|
||||
|
||||
%description
|
||||
@ -36,150 +21,37 @@ keyboard.
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%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 prefix=%{_prefix}
|
||||
# %%doc will be used in %%files to pull in the documentation
|
||||
rm -rf %{buildroot}/%{_datadir}/doc/%{name}
|
||||
rm -rf %{buildroot}
|
||||
make install DESTDIR=%{buildroot} prefix=%{_prefix}
|
||||
# %doc will be used in %files to pull in the documentation
|
||||
rm -rf %{buildroot}/%{_prefix}/share/doc/%{name}
|
||||
# remove executable permissions on man pages
|
||||
find %{buildroot}/%{_mandir} -type f -exec chmod -x '{}' ';'
|
||||
# remove exectuable permissions on contrib/ scripts
|
||||
find contrib/ -type f -exec chmod -x '{}' ';'
|
||||
find %{buildroot}/%{_prefix}/share/man -type f -exec chmod -x {} ';'
|
||||
%find_lang %{name}
|
||||
|
||||
|
||||
%clean
|
||||
rm -rf %{buildroot}
|
||||
|
||||
%files -f %{name}.lang
|
||||
%doc README doc/xhtml/newsbeuter.html doc/example-config
|
||||
%doc contrib/
|
||||
%license LICENSE
|
||||
%defattr(-,root,root,-)
|
||||
%doc README LICENSE doc/xhtml/newsbeuter.html doc/example-config
|
||||
%{_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
|
||||
|
||||
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.6-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
|
||||
|
||||
* Tue Mar 19 2013 Jamie Nguyen <jamielinux@fedoraproject.org> - 2.6-1
|
||||
- update to upstream release 2.6
|
||||
- remove redundant patch
|
||||
|
||||
* Fri Feb 22 2013 Jamie Nguyen <jamielinux@fedoraproject.org> - 2.5-5
|
||||
- apply newsbeuter-2.5-json-boolean-include.patch
|
||||
|
||||
* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.5-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
|
||||
|
||||
* Fri Jul 20 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.5-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
|
||||
|
||||
* Tue Feb 28 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.5-2
|
||||
- Rebuilt for c++ ABI breakage
|
||||
|
||||
* Fri Jan 13 2012 Ben Boeckel <mathstuf@gmail.com> - 2.5-1
|
||||
- Update to 2.5
|
||||
|
||||
* Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.4-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
|
||||
|
||||
* Thu Mar 10 2011 Ben Boeckel <mathstuf@gmail.com> - 2.4-1
|
||||
- Update to 2.4
|
||||
|
||||
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.3-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
|
||||
|
||||
* Fri Nov 05 2010 Thomas Janssen <thomasj@fedoraproject.org> 2.3-3
|
||||
- rebuild for new libxml2
|
||||
|
||||
* Wed Sep 29 2010 jkeating - 2.3-2
|
||||
- Rebuilt for gcc bug 634757
|
||||
|
||||
* Mon Sep 20 2010 Thomas Janssen <thomasj@fedoraproject.org> 2.3-1
|
||||
- newsbeuter 2.3
|
||||
- update to 2.3
|
||||
|
||||
* Tue May 18 2010 Thomas Janssen <thomasj@fedoraproject.org> 2.2-1
|
||||
- bugfix release
|
||||
|
||||
Loading…
Reference in New Issue
Block a user