[rss2email] Add a few patches from Debian package:
Michael Schwendt
mschwendt at fedoraproject.org
Mon Mar 4 16:56:20 UTC 2013
commit 7ead0f3d18cbe18536ddee91d51f35b58ca77b06
Author: Michael Schwendt <mschwendt at fedoraproject.org>
Date: Mon Mar 4 17:56:17 2013 +0100
Add a few patches from Debian package:
0003-Setup-the-correct-version-number-in-rss2email.py.patch
0006-Prefer-utf8-in-CHARSET_LIST.patch
0008-Fix-encoding-of-From-and-To-headers.patch.diff
- Merge a few update for the manual page.
- Minor spec clean-up to remove superfluous items.
...he-correct-version-number-in-rss2email.py.patch | 23 ++++++++++++
0006-Prefer-utf8-in-CHARSET_LIST.patch | 33 +++++++++++++++++
rss2email-r2e.1 | 25 ++++++++++++--
rss2email.spec | 37 +++++++++++++-------
4 files changed, 102 insertions(+), 16 deletions(-)
---
diff --git a/0003-Setup-the-correct-version-number-in-rss2email.py.patch b/0003-Setup-the-correct-version-number-in-rss2email.py.patch
new file mode 100644
index 0000000..a2f2269
--- /dev/null
+++ b/0003-Setup-the-correct-version-number-in-rss2email.py.patch
@@ -0,0 +1,23 @@
+From: Etienne Millon <etienne.millon at gmail.com>
+Date: Fri, 26 Aug 2011 19:05:15 +0200
+Subject: Setup the correct version number in rss2email.py
+
+This version is 2.71, but __version__ incorrectly states that it is 2.70.
+This number is used in the User-Agent string and in error messages.
+---
+ rss2email.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/rss2email.py b/rss2email.py
+index 0dc2d04..7696d99 100755
+--- a/rss2email.py
++++ b/rss2email.py
+@@ -15,7 +15,7 @@ Usage:
+ opmlexport
+ opmlimport filename
+ """
+-__version__ = "2.70"
++__version__ = "2.71"
+ __author__ = "Lindsey Smith (lindsey at allthingsrss.com)"
+ __copyright__ = "(C) 2004 Aaron Swartz. GNU GPL 2 or 3."
+ ___contributors__ = ["Dean Jackson", "Brian Lalor", "Joey Hess",
diff --git a/0006-Prefer-utf8-in-CHARSET_LIST.patch b/0006-Prefer-utf8-in-CHARSET_LIST.patch
new file mode 100644
index 0000000..a390ad9
--- /dev/null
+++ b/0006-Prefer-utf8-in-CHARSET_LIST.patch
@@ -0,0 +1,33 @@
+From: Etienne Millon <etienne.millon at gmail.com>
+Date: Mon, 20 Feb 2012 15:28:52 +0100
+Subject: Prefer utf8 in CHARSET_LIST
+
+Bug-Debian: http://bugs.debian.org/659920
+---
+ config.py.example | 2 +-
+ rss2email.py | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/config.py.example b/config.py.example
+index cdd760b..ee2e004 100755
+--- a/config.py.example
++++ b/config.py.example
+@@ -91,4 +91,4 @@ PROXY=""
+
+ # To most correctly encode emails with international characters, we iterate through the list below and use the first character set that works
+ # Eventually (and theoretically) ISO-8859-1 and UTF-8 are our catch-all failsafes
+-CHARSET_LIST='US-ASCII', 'BIG5', 'ISO-2022-JP', 'ISO-8859-1', 'UTF-8'
++CHARSET_LIST='US-ASCII', 'ISO-8859-1', 'UTF-8', 'BIG5', 'ISO-2022-JP'
+diff --git a/rss2email.py b/rss2email.py
+index 9735b28..69998db 100755
+--- a/rss2email.py
++++ b/rss2email.py
+@@ -108,7 +108,7 @@ PROXY=""
+
+ # To most correctly encode emails with international characters, we iterate through the list below and use the first character set that works
+ # Eventually (and theoretically) ISO-8859-1 and UTF-8 are our catch-all failsafes
+-CHARSET_LIST='US-ASCII', 'BIG5', 'ISO-2022-JP', 'ISO-8859-1', 'UTF-8'
++CHARSET_LIST='US-ASCII', 'ISO-8859-1', 'UTF-8', 'BIG5', 'ISO-2022-JP'
+
+ from email.MIMEText import MIMEText
+ from email.Header import Header
diff --git a/rss2email-r2e.1 b/rss2email-r2e.1
index b54dcbf..1ce5bd7 100644
--- a/rss2email-r2e.1
+++ b/rss2email-r2e.1
@@ -1,4 +1,4 @@
-.TH R2E 1a
+.TH R2E 1
.SH NAME
r2e \- receive RSS feeds by email
.SH SYNOPSIS
@@ -22,6 +22,13 @@ For a quick start with r2e, try these steps:
.P
The last command should eventually be put into your crontab, if you
want things be sent you automatically.
+.P
+It is possible to use authenticated feeds using the following syntax:
+.P
+.RS
+.nf
+.BI "r2e add " http://user:password@example.com/feed
+.RE
.SH ACTIONS
.TP
.B new [youremail]
@@ -33,11 +40,11 @@ Subscribe to a feed. The first option is the URL of the feed.
The optional second option is the email address to send new items to.
Repeat for each feed you want to subscribe to.
.TP
-.B run [--no-send] [num]
+.B run [\-\-no\-send] [num]
Scan the feeds and send emails for new items. This can be run in a cron
job.
.P
-The --no-send option stops r2e from sending any email. This can be
+The \-\-no\-send option stops r2e from sending any email. This can be
useful the first time you run it, as otherwise it would send every
available story.
.P
@@ -52,6 +59,18 @@ List all your currently subscribed feeds.
.TP
.B delete n
Delete a feed, using its number from the list command.
+.TP
+.B pause n
+Temporarily ignore a feed. A paused feed won't be updated at all.
+.TP
+.B unpause n
+Re-enable updates from a feed.
+.TP
+.B opmlimport url
+Import feeds from an OPML file.
+.TP
+.B opmlexport
+Export feeds to standard output, as an OPML file.
.SH "CONFIGURATION"
The program's behavior can be controlled via the ~/.rss2email/config.py
config file. The file is a python file, so variables are set using a syntax
diff --git a/rss2email.spec b/rss2email.spec
index d21bea8..1550999 100644
--- a/rss2email.spec
+++ b/rss2email.spec
@@ -1,6 +1,6 @@
Name: rss2email
Version: 2.71
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: Deliver news from RSS feeds to your SMTP server as text or HTML mail
Group: Applications/Internet
@@ -10,8 +10,9 @@ Source0: http://www.allthingsrss.com/rss2email/rss2email-%{version}.tar.g
# Fedora variant of the "r2e" shell-wrapper script to run rss2email.py
# in its home directory.
Source3: rss2email-r2e
-# man page taken from
-# http://ftp.debian.org/debian/pool/main/r/rss2email/rss2email_2.60-3.diff.gz
+# man page taken from
+# http://ftp.de.debian.org/debian/pool/main/r/rss2email/rss2email_2.71-2.debian.tar.gz
+# but with a few modifications and fixes
Source4: rss2email-r2e.1
# Let rss2email also look for ${HOME}/.rss2email/config.py
@@ -19,6 +20,11 @@ Source4: rss2email-r2e.1
# Problem and intended purpose of the patch reported upstream.
Patch0: rss2email-2.70-config-location.patch
+# Patches included in Debian package.
+Patch1003: 0003-Setup-the-correct-version-number-in-rss2email.py.patch
+Patch1006: 0006-Prefer-utf8-in-CHARSET_LIST.patch
+Patch1008: 0008-Fix-encoding-of-From-and-To-headers.patch.diff
+
BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -45,9 +51,8 @@ See the manual page r2e for details on how to set up rss2email.
%prep
-#setup -q
-
# 2.71 tarball contains bad file permissions
+# even for the top dir
%setup -q -c -n %{name}-fakeroot
chmod +x *
chmod +rw * -R
@@ -58,15 +63,17 @@ chmod -x CHANGELOG readme* config*
cat %{SOURCE3} | sed -e 's!@datadir@!%{_datadir}!' > r2e
%patch0 -p1 -b .config-location
+%patch1003 -p1 -b .correct-version-number
+%patch1006 -p1 -b .prefer-utf8-in-charset-list
+%patch1008 -p1 -b .fix-encoding-of-from-and-to-headers
+
sed -i -e 's/\r//' CHANGELOG rss2email.py config.py.example
%build
-echo nothing to build
%install
-rm -rf $RPM_BUILD_ROOT
mkdir -p \
$RPM_BUILD_ROOT%{_bindir}/ \
$RPM_BUILD_ROOT%{_datadir}/%{name}/ \
@@ -79,18 +86,22 @@ install -p -m 0644 %{SOURCE4} $RPM_BUILD_ROOT%{_mandir}/man1/r2e.1
install -p -m 0644 config.py.example $RPM_BUILD_ROOT%{_datadir}/%{name}/
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
%files
-%defattr(-,root,root,-)
%doc CHANGELOG readme.html config.py.example
%{_bindir}/*
%{_datadir}/%{name}/
%{_mandir}/man1/*
+
%changelog
+* Mon Mar 4 2013 Michael Schwendt <mschwendt at fedoraproject.org> - 2.71-5
+- Add a few patches from Debian package:
+ 0003-Setup-the-correct-version-number-in-rss2email.py.patch
+ 0006-Prefer-utf8-in-CHARSET_LIST.patch
+ 0008-Fix-encoding-of-From-and-To-headers.patch.diff
+- Merge a few update for the manual page.
+- Minor spec clean-up to remove superfluous items.
+
* Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.71-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
@@ -147,7 +158,7 @@ rm -rf $RPM_BUILD_ROOT
* Fri Aug 03 2007 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info>
- Update License field due to the "Licensing guidelines changes"
-* Sun Mar 24 2007 Thorsten Leemhuis <fedora[AT]leemhuis.info> - 2.60-3
+* Sun Mar 25 2007 Thorsten Leemhuis <fedora[AT]leemhuis.info> - 2.60-3
- Use sed instead of dos2unix
- Some small fixes from review bug #233715
- Apply one patch from Debian that should warn if there are problems with
More information about the scm-commits
mailing list