rpms/newsbeuter
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update to upstream release 2.6

Browse Source
This commit is contained in:
Jamie Nguyen 2013-03-19 22:58:13 +00:00
parent 2eceee827e
commit 333a48b790
5 changed files with 12 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -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

90
newsbeuter-2.5-includes.patch
View File

@ -1,90 +0,0 @@
diff -u -r -U5 newsbeuter-2.5/src/controller.cpp newsbeuter-2.5.includes/src/controller.cpp
--- newsbeuter-2.5/src/controller.cpp 2012-01-06 09:41:13.000000000 -0500
+++ newsbeuter-2.5.includes/src/controller.cpp 2012-02-18 15:57:32.525947811 -0500
@@ -36,10 +36,11 @@
#include <sys/types.h>
#include <sys/wait.h>
#include <sys/stat.h>
#include <pwd.h>
+#include <unistd.h>
#include <ncurses.h>
#include <libxml/xmlversion.h>
#include <libxml/parser.h>
diff -u -r -U5 newsbeuter-2.5/src/google_api.cpp newsbeuter-2.5.includes/src/google_api.cpp
--- newsbeuter-2.5/src/google_api.cpp 2012-01-06 09:41:13.000000000 -0500
+++ newsbeuter-2.5.includes/src/google_api.cpp 2012-02-18 15:28:32.287929217 -0500
@@ -7,10 +7,12 @@
#include <config.h>
#include <utils.h>
#include <curl/curl.h>
+#include <unistd.h>
+
#define GREADER_LOGIN "https://www.google.com/accounts/ClientLogin"
#define GREADER_API_PREFIX "http://www.google.com/reader/api/0/"
#define GREADER_FEED_PREFIX "http://www.google.com/reader/atom/"
#define GREADER_SUBSCRIPTION_LIST GREADER_API_PREFIX "subscription/list"
diff -u -r -U5 newsbeuter-2.5/src/pb_controller.cpp newsbeuter-2.5.includes/src/pb_controller.cpp
--- newsbeuter-2.5/src/pb_controller.cpp 2012-01-06 09:41:13.000000000 -0500
+++ newsbeuter-2.5.includes/src/pb_controller.cpp 2012-02-18 15:57:48.241947978 -0500
@@ -10,10 +10,11 @@
#include <sys/stat.h>
#include <sys/types.h>
#include <pwd.h>
#include <cstdlib>
#include <signal.h>
+#include <unistd.h>
#include <keymap.h>
#include <configcontainer.h>
#include <colormanager.h>
#include <exceptions.h>
diff -u -r -U5 newsbeuter-2.5/src/queueloader.cpp newsbeuter-2.5.includes/src/queueloader.cpp
--- newsbeuter-2.5/src/queueloader.cpp 2012-01-06 09:41:13.000000000 -0500
+++ newsbeuter-2.5.includes/src/queueloader.cpp 2012-02-18 15:57:59.472948099 -0500
@@ -5,10 +5,11 @@
#include <logger.h>
#include <fstream>
#include <cstring>
#include <config.h>
#include <libgen.h>
+#include <unistd.h>
using namespace newsbeuter;
namespace podbeuter {
diff -u -r -U5 newsbeuter-2.5/src/reloadthread.cpp newsbeuter-2.5.includes/src/reloadthread.cpp
--- newsbeuter-2.5/src/reloadthread.cpp 2012-01-06 09:41:13.000000000 -0500
+++ newsbeuter-2.5.includes/src/reloadthread.cpp 2012-02-18 15:21:21.137924605 -0500
@@ -1,8 +1,10 @@
#include <reloadthread.h>
#include <logger.h>
+#include <unistd.h>
+
namespace newsbeuter {
reloadthread::reloadthread(controller * c, configcontainer * cf) : ctrl(c), oldtime(0), waittime_sec(0), suppressed_first(false), cfg(cf) {
LOG(LOG_INFO,"reloadthread: waiting %u seconds between reloads",waittime_sec);
}
diff -u -r -U5 newsbeuter-2.5/src/utils.cpp newsbeuter-2.5.includes/src/utils.cpp
--- newsbeuter-2.5/src/utils.cpp 2012-01-06 09:41:13.000000000 -0500
+++ newsbeuter-2.5.includes/src/utils.cpp 2012-02-18 15:01:55.076912171 -0500
@@ -8,10 +8,11 @@
#include <iconv.h>
#include <errno.h>
#include <pwd.h>
#include <libgen.h>
#include <sys/utsname.h>
+#include <unistd.h>
#include <sstream>
#include <locale>
#include <cwchar>
#include <cstring>

4
newsbeuter-2.5-json-boolean-include.patch
View File

@ -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;

14
newsbeuter.spec
View File

@ -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@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

2
sources
View File

@ -1 +1 @@
bb8cd3f2a3693de4c16be28c869a1f75 newsbeuter-2.5.tar.gz
4a36627c5fabca6b2718a0ac78e6666f newsbeuter-2.6.tar.gz