From 026415ac7c70a2a35bd2841c9cc33ae82b92a443 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 28 Jan 2019 20:18:21 +0100 Subject: [PATCH 01/49] Remove obsolete Group tag References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag --- rss2email.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/rss2email.spec b/rss2email.spec index ab83bc4..e2c2a45 100644 --- a/rss2email.spec +++ b/rss2email.spec @@ -3,7 +3,6 @@ Version: 2.71 Release: 14%{?dist} Summary: Deliver news from RSS feeds to your SMTP server as text or HTML mail -Group: Applications/Internet License: GPLv2 or GPLv3 URL: http://www.allthingsrss.com/rss2email/ Source0: http://www.allthingsrss.com/rss2email/rss2email-%{version}.tar.gz From 4c7eaaa87db3e541af5845a51d2669b1f89a96a8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 2 Feb 2019 11:37:57 +0000 Subject: [PATCH 02/49] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- rss2email.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rss2email.spec b/rss2email.spec index e2c2a45..84deaa9 100644 --- a/rss2email.spec +++ b/rss2email.spec @@ -1,6 +1,6 @@ Name: rss2email Version: 2.71 -Release: 14%{?dist} +Release: 15%{?dist} Summary: Deliver news from RSS feeds to your SMTP server as text or HTML mail License: GPLv2 or GPLv3 @@ -92,6 +92,9 @@ install -p -m 0644 config.py.example $RPM_BUILD_ROOT%{_datadir}/%{name}/ %changelog +* Sat Feb 02 2019 Fedora Release Engineering - 2.71-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Sat Jul 14 2018 Fedora Release Engineering - 2.71-14 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From a452a635e96bb9e15c04aadca93a893dbc97f1aa Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 26 Jul 2019 18:48:52 +0000 Subject: [PATCH 03/49] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- rss2email.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rss2email.spec b/rss2email.spec index 84deaa9..352aadc 100644 --- a/rss2email.spec +++ b/rss2email.spec @@ -1,6 +1,6 @@ Name: rss2email Version: 2.71 -Release: 15%{?dist} +Release: 16%{?dist} Summary: Deliver news from RSS feeds to your SMTP server as text or HTML mail License: GPLv2 or GPLv3 @@ -92,6 +92,9 @@ install -p -m 0644 config.py.example $RPM_BUILD_ROOT%{_datadir}/%{name}/ %changelog +* Fri Jul 26 2019 Fedora Release Engineering - 2.71-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Sat Feb 02 2019 Fedora Release Engineering - 2.71-15 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From 49b03ab547821e404db9b9a13cd14cb62dad4ed9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 8 Aug 2019 16:27:57 +0000 Subject: [PATCH 04/49] rss2email fails to build from source: https://bugzilla.redhat.com/show_bug.cgi?id=1675897 --- .gitignore | 3 - ...rrect-version-number-in-rss2email.py.patch | 23 -- 0006-Prefer-utf8-in-CHARSET_LIST.patch | 33 --- ...encoding-of-From-and-To-headers.patch.diff | 47 ---- dead.package | 1 + rss2email-2.70-config-location.patch | 22 -- rss2email-r2e | 24 -- rss2email-r2e.1 | 94 -------- rss2email.spec | 208 ------------------ sources | 1 - 10 files changed, 1 insertion(+), 455 deletions(-) delete mode 100644 .gitignore delete mode 100644 0003-Setup-the-correct-version-number-in-rss2email.py.patch delete mode 100644 0006-Prefer-utf8-in-CHARSET_LIST.patch delete mode 100644 0008-Fix-encoding-of-From-and-To-headers.patch.diff create mode 100644 dead.package delete mode 100644 rss2email-2.70-config-location.patch delete mode 100644 rss2email-r2e delete mode 100644 rss2email-r2e.1 delete mode 100644 rss2email.spec delete mode 100644 sources diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 9c2fe06..0000000 --- a/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -rss2email-2.66.tar.gz -/rss2email-2.70.tar.gz -/rss2email-2.71.tar.gz diff --git a/0003-Setup-the-correct-version-number-in-rss2email.py.patch b/0003-Setup-the-correct-version-number-in-rss2email.py.patch deleted file mode 100644 index a2f2269..0000000 --- a/0003-Setup-the-correct-version-number-in-rss2email.py.patch +++ /dev/null @@ -1,23 +0,0 @@ -From: Etienne Millon -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@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 deleted file mode 100644 index a390ad9..0000000 --- a/0006-Prefer-utf8-in-CHARSET_LIST.patch +++ /dev/null @@ -1,33 +0,0 @@ -From: Etienne Millon -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/0008-Fix-encoding-of-From-and-To-headers.patch.diff b/0008-Fix-encoding-of-From-and-To-headers.patch.diff deleted file mode 100644 index a160724..0000000 --- a/0008-Fix-encoding-of-From-and-To-headers.patch.diff +++ /dev/null @@ -1,47 +0,0 @@ ---- rss2email-2.71/debian/patches/0008-Fix-encoding-of-From-and-To-headers.patch 1970-01-01 01:00:00.000000000 +0100 -+++ rss2email-2.71/debian/patches/0008-Fix-encoding-of-From-and-To-headers.patch 2013-01-23 16:37:07.000000000 +0100 -@@ -0,0 +1,44 @@ -+From: Thorsten Glaser -+Date: Wed, 23 Jan 2013 15:25:35 +0100 -+Subject: Fix encoding of From and To headers -+ -+Debian-Bug: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=638994 -+--- -+ rss2email.py | 10 ++++++++-- -+ 1 file changed, 8 insertions(+), 2 deletions(-) -+ -+diff --git a/rss2email.py b/rss2email.py -+index a6c3cbe..bdfb41a 100755 -+--- a/rss2email.py -++++ b/rss2email.py -+@@ -114,6 +114,12 @@ from email.MIMEText import MIMEText -+ from email.Header import Header as _Header -+ from email.Utils import parseaddr, formataddr -+ -++def name_format(realname, mailaddress): -++ if not realname: -++ return mailaddress -++ foo = formataddr(("." + realname, mailaddress)) -++ return foo.replace(".", "", 1) -++ -+ class Header(_Header): -+ # Work-around for -+ def append(self, s=None, *args, **kwargs): -+@@ -166,7 +172,7 @@ def send(sender, recipient, subject, body, contenttype, extraheaders=None, smtps -+ -+ # Create the message ('plain' stands for Content-Type: text/plain) -+ msg = MIMEText(body.encode(body_charset), contenttype, body_charset) -+- msg['To'] = formataddr((recipient_name, recipient_addr)) -++ msg['To'] = name_format(recipient_name, recipient_addr) -+ msg['Subject'] = Header(unicode(subject), header_charset) -+ for hdr in extraheaders.keys(): -+ try: -+@@ -174,7 +180,7 @@ def send(sender, recipient, subject, body, contenttype, extraheaders=None, smtps -+ except: -+ msg[hdr] = Header(extraheaders[hdr]) -+ -+- fromhdr = formataddr((sender_name, sender_addr)) -++ fromhdr = name_format(sender_name, sender_addr) -+ msg['From'] = fromhdr -+ -+ msg_as_string = msg.as_string() diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..9e0843f --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +rss2email fails to build from source: https://bugzilla.redhat.com/show_bug.cgi?id=1675897 diff --git a/rss2email-2.70-config-location.patch b/rss2email-2.70-config-location.patch deleted file mode 100644 index a884141..0000000 --- a/rss2email-2.70-config-location.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -Nur rss2email-2.70-orig/rss2email.py rss2email-2.70/rss2email.py ---- rss2email-2.70-orig/rss2email.py 2010-12-17 19:29:34.000000000 +0100 -+++ rss2email-2.70/rss2email.py 2011-01-12 18:57:25.775331913 +0100 -@@ -254,11 +254,13 @@ - - # Read options from config file if present. - import sys --sys.path.insert(0,".") --try: -- from config import * --except: -- pass -+import os -+cfgpaths = [os.path.join(os.getcwd(),"config.py"), -+ os.path.join(os.environ["HOME"],".rss2email/config.py"),] -+for cfgfile in cfgpaths: -+ if os.path.exists(cfgfile): -+ execfile(cfgfile) -+ break - - warn = sys.stderr - diff --git a/rss2email-r2e b/rss2email-r2e deleted file mode 100644 index 7ec377a..0000000 --- a/rss2email-r2e +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/sh -datadir=@datadir@ -r2ehome=${datadir}/rss2email -cfgtemplate=${r2ehome}/config.py.example -dotr2e=${HOME}/.rss2email - -if [ ! -e ${dotr2e} ] -then - mkdir ${dotr2e} -fi - -if [ ! -e ${dotr2e}/config.py ] && [ -e ${cfgtemplate} ] -then - cp -a ${cfgtemplate} ${dotr2e}/config.py -fi - -if [ "${1}" = "--feedext" ] && [ "${2}" ] -then - fileext="${2}" - shift 2 - exec python ${r2ehome}/rss2email.py ${dotr2e}/feeds.dat."${fileext}" "$@" -else - exec python ${r2ehome}/rss2email.py ${dotr2e}/feeds.dat "$@" -fi diff --git a/rss2email-r2e.1 b/rss2email-r2e.1 deleted file mode 100644 index 1ce5bd7..0000000 --- a/rss2email-r2e.1 +++ /dev/null @@ -1,94 +0,0 @@ -.TH R2E 1 -.SH NAME -r2e \- receive RSS feeds by email -.SH SYNOPSIS -.B r2e action [options] -.SH DESCRIPTION -.BR r2e -is a simple program which you can run in your crontab. -It watches RSS feeds and sends you a nicely formatted email message -for each new item. -.P -The program is configured by ~/.rss2email/config.py -.P -For a quick start with r2e, try these steps: -.P -.RS -.nf -.BI "r2e new " your@address -.BI "r2e add " http://feed.url/somewhere.rss -.BI "r2e run " -.RE -.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] -Create a new feedfile. If the second option is specified, it sets the -default email address that mails are sent to. -.TP -.B add url [youremail] -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] -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 -useful the first time you run it, as otherwise it would send every -available story. -.P -If a number is specified, r2e will only download that feed. The list -command lists the feed numbers. -.TP -.B email yournewemail -Change the default email address. -.TP -.B list -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 -like this: VARIABLE = "value" -.P -If the value is a number, the quotes may be omitted. Most configuration -variables in the file are boolean values, where a 1 indicates the option is -set, and a 0 disables it. -.P -See the example config.py file for a full list of available configuration -variables. -.SH FILES -.TP -.B ~/.rss2email/feeds.dat -The database of feeds. Use r2e to add, remove, or modify feeds, do not edit -it directly. -.TP -.B ~/.rss2email/config.py -If this file exists, it is read to configure the program. -.SH AUTHOR -Aaron Swartz diff --git a/rss2email.spec b/rss2email.spec deleted file mode 100644 index 352aadc..0000000 --- a/rss2email.spec +++ /dev/null @@ -1,208 +0,0 @@ -Name: rss2email -Version: 2.71 -Release: 16%{?dist} -Summary: Deliver news from RSS feeds to your SMTP server as text or HTML mail - -License: GPLv2 or GPLv3 -URL: http://www.allthingsrss.com/rss2email/ -Source0: http://www.allthingsrss.com/rss2email/rss2email-%{version}.tar.gz -# 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.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 -# Remove the sys.path.insert(0,'.') module search path list alteration. -# 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 - -# These Python modules are imported by rss2email. -# The rss2email tarball contains copies of them, because some dists ship -# old modules which result in rss2email bug reports. We want to use the -# external packages due to Fedora packaging policies. -# -# 2011-01-12 -# - feedparser in Fedora 14 : 4.1 -# - feedparser in rss2email 2.66 to 2.70 : 4.2-pre -# 2011-04-11 -# - feedparser 5.0.2 in Fedora >= 14 -# - html2text 3.02 on its way to Fedora >= 15 -Requires: python2-feedparser >= 5.0.1 -Requires: python2-html2text >= 3.01 - -%description -rss2email lets you subscribe to a list of XML newsfeeds (RSS or Atom). It can -parse them regularly with the help of cron and send new items to you by email. - -An HTML mail will be send in the default configuration to the local SMTP server. -See the manual page r2e for details on how to set up rss2email. - - -%prep -# 2.71 tarball contains bad file permissions -# even for the top dir -%setup -q -c -n %{name}-fakeroot -chmod +x * -chmod +rw * -R -cp -a %{name}-%{version}/* . - -chmod -x CHANGELOG readme* config* -# prepare the custom "r2e" wrapper script -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 - - -%install -mkdir -p \ - $RPM_BUILD_ROOT%{_bindir}/ \ - $RPM_BUILD_ROOT%{_datadir}/%{name}/ \ - $RPM_BUILD_ROOT%{_mandir}/man1/ - -install -p -m 0755 rss2email.py $RPM_BUILD_ROOT%{_datadir}/%{name}/ -install -p -m 0755 r2e $RPM_BUILD_ROOT%{_bindir}/r2e -install -p -m 0644 %{SOURCE4} $RPM_BUILD_ROOT%{_mandir}/man1/r2e.1 -# the copy in docdir may not be present for an --excludedocs install -install -p -m 0644 config.py.example $RPM_BUILD_ROOT%{_datadir}/%{name}/ - - -%files -%doc CHANGELOG readme.html config.py.example -%{_bindir}/* -%{_datadir}/%{name}/ -%{_mandir}/man1/* - - -%changelog -* Fri Jul 26 2019 Fedora Release Engineering - 2.71-16 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Sat Feb 02 2019 Fedora Release Engineering - 2.71-15 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Sat Jul 14 2018 Fedora Release Engineering - 2.71-14 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Fri Feb 09 2018 Fedora Release Engineering - 2.71-13 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Wed Jan 31 2018 Iryna Shcherbina - 2.71-12 -- Update Python 2 dependency declarations to new packaging standards - (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3) - -* Thu Jul 27 2017 Fedora Release Engineering - 2.71-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Sat Feb 11 2017 Fedora Release Engineering - 2.71-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Thu Feb 04 2016 Fedora Release Engineering - 2.71-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Thu Jun 18 2015 Fedora Release Engineering - 2.71-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Sun Jun 08 2014 Fedora Release Engineering - 2.71-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Sun Aug 04 2013 Fedora Release Engineering - 2.71-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Mon Mar 4 2013 Michael Schwendt - 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 updates for the manual page. -- Minor spec clean-up to remove superfluous items. - -* Thu Feb 14 2013 Fedora Release Engineering - 2.71-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Sat Jul 21 2012 Fedora Release Engineering - 2.71-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Sat Jan 14 2012 Fedora Release Engineering - 2.71-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Mon Apr 11 2011 Michael Schwendt - 2.71-1 -- Upgrade to 2.71. -- Fix bad tarball permissions. -- Increase minimum version in python-feedparser and python-html2text - dependencies to match what upstream wants for this release. - -* Wed Feb 09 2011 Fedora Release Engineering - 2.70-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Wed Jan 12 2011 Michael Schwendt - 2.70-1 -- Upgrade to 2.70. -- Update r2e wrapper script. -- Patch config.py loader (now first look in current dir like upstream, - but if not found look for $HOME/.rss2email/config.py). -- Include config.py.example also in the documentation directory. -- Various minor spec file adjustments. - -* Sun Jul 04 2010 Thorsten Leemhuis - 2.66-1 -- update to 2.66, which now is shipped in a tarball - -* Sun Jul 26 2009 Fedora Release Engineering - 2.65-3.1 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Wed Feb 25 2009 Fedora Release Engineering - 2.65-2.1 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Tue Jan 06 2009 Thorsten Leemhuis - 2.65-1 -- update to 2.65 -- recreate rss2email-use-configpy-from-homedir.patch - -* Sun Oct 26 2008 Thorsten Leemhuis - 2.64-1 -- update to 2.64 -- drop rss2email-warn-if-problems-with-local-mta.patch, something similar now - upstream - -* Fri Jul 04 2008 Thorsten Leemhuis - 2.63-1 -- update to 2.63 (GPLv3 now) - -* Sat Jan 19 2008 Thorsten Leemhuis - 2.62-1 -- Update to 2.62 - -* Fri Dec 14 2007 Thorsten Leemhuis - 2.61-1 -- Update to 2.61 - -* Fri Aug 03 2007 Thorsten Leemhuis -- Update License field due to the "Licensing guidelines changes" - -* Sun Mar 25 2007 Thorsten Leemhuis - 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 - local delivery via sendmail - -* Sat Mar 24 2007 Thorsten Leemhuis - 2.60-2 -- Seperate package for html2text, as it might be useful for other stuff - as well -- update r2e and make it possible to manage different feed files (optional, - use r2e option "--feedext foo" to use it) -- add some common used, but-no-so-well documented configuration parameters - to config.py template and give a hint where to find docs what they do - -* Fri Mar 23 2007 Thorsten Leemhuis - 2.60-1 -- Initial package diff --git a/sources b/sources deleted file mode 100644 index 0e5e4ce..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -7d7dbac5aa181b07261516213a312f39 rss2email-2.71.tar.gz From 95cfa3c06eeef6fb2e2d262038b392096d4c4195 Mon Sep 17 00:00:00 2001 From: Mohan Boddu Date: Mon, 23 Sep 2019 15:00:18 -0400 Subject: [PATCH 05/49] Revert "rss2email fails to build from source: https://bugzilla.redhat.com/show_bug.cgi?id=1675897" Unretirement for https://pagure.io/releng/issue/8831 This reverts commit 49b03ab547821e404db9b9a13cd14cb62dad4ed9. --- .gitignore | 3 + ...rrect-version-number-in-rss2email.py.patch | 23 ++ 0006-Prefer-utf8-in-CHARSET_LIST.patch | 33 +++ ...encoding-of-From-and-To-headers.patch.diff | 47 ++++ dead.package | 1 - rss2email-2.70-config-location.patch | 22 ++ rss2email-r2e | 24 ++ rss2email-r2e.1 | 94 ++++++++ rss2email.spec | 208 ++++++++++++++++++ sources | 1 + 10 files changed, 455 insertions(+), 1 deletion(-) create mode 100644 .gitignore create mode 100644 0003-Setup-the-correct-version-number-in-rss2email.py.patch create mode 100644 0006-Prefer-utf8-in-CHARSET_LIST.patch create mode 100644 0008-Fix-encoding-of-From-and-To-headers.patch.diff delete mode 100644 dead.package create mode 100644 rss2email-2.70-config-location.patch create mode 100644 rss2email-r2e create mode 100644 rss2email-r2e.1 create mode 100644 rss2email.spec create mode 100644 sources diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..9c2fe06 --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ +rss2email-2.66.tar.gz +/rss2email-2.70.tar.gz +/rss2email-2.71.tar.gz 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 +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@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 +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/0008-Fix-encoding-of-From-and-To-headers.patch.diff b/0008-Fix-encoding-of-From-and-To-headers.patch.diff new file mode 100644 index 0000000..a160724 --- /dev/null +++ b/0008-Fix-encoding-of-From-and-To-headers.patch.diff @@ -0,0 +1,47 @@ +--- rss2email-2.71/debian/patches/0008-Fix-encoding-of-From-and-To-headers.patch 1970-01-01 01:00:00.000000000 +0100 ++++ rss2email-2.71/debian/patches/0008-Fix-encoding-of-From-and-To-headers.patch 2013-01-23 16:37:07.000000000 +0100 +@@ -0,0 +1,44 @@ ++From: Thorsten Glaser ++Date: Wed, 23 Jan 2013 15:25:35 +0100 ++Subject: Fix encoding of From and To headers ++ ++Debian-Bug: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=638994 ++--- ++ rss2email.py | 10 ++++++++-- ++ 1 file changed, 8 insertions(+), 2 deletions(-) ++ ++diff --git a/rss2email.py b/rss2email.py ++index a6c3cbe..bdfb41a 100755 ++--- a/rss2email.py +++++ b/rss2email.py ++@@ -114,6 +114,12 @@ from email.MIMEText import MIMEText ++ from email.Header import Header as _Header ++ from email.Utils import parseaddr, formataddr ++ +++def name_format(realname, mailaddress): +++ if not realname: +++ return mailaddress +++ foo = formataddr(("." + realname, mailaddress)) +++ return foo.replace(".", "", 1) +++ ++ class Header(_Header): ++ # Work-around for ++ def append(self, s=None, *args, **kwargs): ++@@ -166,7 +172,7 @@ def send(sender, recipient, subject, body, contenttype, extraheaders=None, smtps ++ ++ # Create the message ('plain' stands for Content-Type: text/plain) ++ msg = MIMEText(body.encode(body_charset), contenttype, body_charset) ++- msg['To'] = formataddr((recipient_name, recipient_addr)) +++ msg['To'] = name_format(recipient_name, recipient_addr) ++ msg['Subject'] = Header(unicode(subject), header_charset) ++ for hdr in extraheaders.keys(): ++ try: ++@@ -174,7 +180,7 @@ def send(sender, recipient, subject, body, contenttype, extraheaders=None, smtps ++ except: ++ msg[hdr] = Header(extraheaders[hdr]) ++ ++- fromhdr = formataddr((sender_name, sender_addr)) +++ fromhdr = name_format(sender_name, sender_addr) ++ msg['From'] = fromhdr ++ ++ msg_as_string = msg.as_string() diff --git a/dead.package b/dead.package deleted file mode 100644 index 9e0843f..0000000 --- a/dead.package +++ /dev/null @@ -1 +0,0 @@ -rss2email fails to build from source: https://bugzilla.redhat.com/show_bug.cgi?id=1675897 diff --git a/rss2email-2.70-config-location.patch b/rss2email-2.70-config-location.patch new file mode 100644 index 0000000..a884141 --- /dev/null +++ b/rss2email-2.70-config-location.patch @@ -0,0 +1,22 @@ +diff -Nur rss2email-2.70-orig/rss2email.py rss2email-2.70/rss2email.py +--- rss2email-2.70-orig/rss2email.py 2010-12-17 19:29:34.000000000 +0100 ++++ rss2email-2.70/rss2email.py 2011-01-12 18:57:25.775331913 +0100 +@@ -254,11 +254,13 @@ + + # Read options from config file if present. + import sys +-sys.path.insert(0,".") +-try: +- from config import * +-except: +- pass ++import os ++cfgpaths = [os.path.join(os.getcwd(),"config.py"), ++ os.path.join(os.environ["HOME"],".rss2email/config.py"),] ++for cfgfile in cfgpaths: ++ if os.path.exists(cfgfile): ++ execfile(cfgfile) ++ break + + warn = sys.stderr + diff --git a/rss2email-r2e b/rss2email-r2e new file mode 100644 index 0000000..7ec377a --- /dev/null +++ b/rss2email-r2e @@ -0,0 +1,24 @@ +#!/bin/sh +datadir=@datadir@ +r2ehome=${datadir}/rss2email +cfgtemplate=${r2ehome}/config.py.example +dotr2e=${HOME}/.rss2email + +if [ ! -e ${dotr2e} ] +then + mkdir ${dotr2e} +fi + +if [ ! -e ${dotr2e}/config.py ] && [ -e ${cfgtemplate} ] +then + cp -a ${cfgtemplate} ${dotr2e}/config.py +fi + +if [ "${1}" = "--feedext" ] && [ "${2}" ] +then + fileext="${2}" + shift 2 + exec python ${r2ehome}/rss2email.py ${dotr2e}/feeds.dat."${fileext}" "$@" +else + exec python ${r2ehome}/rss2email.py ${dotr2e}/feeds.dat "$@" +fi diff --git a/rss2email-r2e.1 b/rss2email-r2e.1 new file mode 100644 index 0000000..1ce5bd7 --- /dev/null +++ b/rss2email-r2e.1 @@ -0,0 +1,94 @@ +.TH R2E 1 +.SH NAME +r2e \- receive RSS feeds by email +.SH SYNOPSIS +.B r2e action [options] +.SH DESCRIPTION +.BR r2e +is a simple program which you can run in your crontab. +It watches RSS feeds and sends you a nicely formatted email message +for each new item. +.P +The program is configured by ~/.rss2email/config.py +.P +For a quick start with r2e, try these steps: +.P +.RS +.nf +.BI "r2e new " your@address +.BI "r2e add " http://feed.url/somewhere.rss +.BI "r2e run " +.RE +.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] +Create a new feedfile. If the second option is specified, it sets the +default email address that mails are sent to. +.TP +.B add url [youremail] +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] +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 +useful the first time you run it, as otherwise it would send every +available story. +.P +If a number is specified, r2e will only download that feed. The list +command lists the feed numbers. +.TP +.B email yournewemail +Change the default email address. +.TP +.B list +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 +like this: VARIABLE = "value" +.P +If the value is a number, the quotes may be omitted. Most configuration +variables in the file are boolean values, where a 1 indicates the option is +set, and a 0 disables it. +.P +See the example config.py file for a full list of available configuration +variables. +.SH FILES +.TP +.B ~/.rss2email/feeds.dat +The database of feeds. Use r2e to add, remove, or modify feeds, do not edit +it directly. +.TP +.B ~/.rss2email/config.py +If this file exists, it is read to configure the program. +.SH AUTHOR +Aaron Swartz diff --git a/rss2email.spec b/rss2email.spec new file mode 100644 index 0000000..352aadc --- /dev/null +++ b/rss2email.spec @@ -0,0 +1,208 @@ +Name: rss2email +Version: 2.71 +Release: 16%{?dist} +Summary: Deliver news from RSS feeds to your SMTP server as text or HTML mail + +License: GPLv2 or GPLv3 +URL: http://www.allthingsrss.com/rss2email/ +Source0: http://www.allthingsrss.com/rss2email/rss2email-%{version}.tar.gz +# 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.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 +# Remove the sys.path.insert(0,'.') module search path list alteration. +# 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 + +# These Python modules are imported by rss2email. +# The rss2email tarball contains copies of them, because some dists ship +# old modules which result in rss2email bug reports. We want to use the +# external packages due to Fedora packaging policies. +# +# 2011-01-12 +# - feedparser in Fedora 14 : 4.1 +# - feedparser in rss2email 2.66 to 2.70 : 4.2-pre +# 2011-04-11 +# - feedparser 5.0.2 in Fedora >= 14 +# - html2text 3.02 on its way to Fedora >= 15 +Requires: python2-feedparser >= 5.0.1 +Requires: python2-html2text >= 3.01 + +%description +rss2email lets you subscribe to a list of XML newsfeeds (RSS or Atom). It can +parse them regularly with the help of cron and send new items to you by email. + +An HTML mail will be send in the default configuration to the local SMTP server. +See the manual page r2e for details on how to set up rss2email. + + +%prep +# 2.71 tarball contains bad file permissions +# even for the top dir +%setup -q -c -n %{name}-fakeroot +chmod +x * +chmod +rw * -R +cp -a %{name}-%{version}/* . + +chmod -x CHANGELOG readme* config* +# prepare the custom "r2e" wrapper script +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 + + +%install +mkdir -p \ + $RPM_BUILD_ROOT%{_bindir}/ \ + $RPM_BUILD_ROOT%{_datadir}/%{name}/ \ + $RPM_BUILD_ROOT%{_mandir}/man1/ + +install -p -m 0755 rss2email.py $RPM_BUILD_ROOT%{_datadir}/%{name}/ +install -p -m 0755 r2e $RPM_BUILD_ROOT%{_bindir}/r2e +install -p -m 0644 %{SOURCE4} $RPM_BUILD_ROOT%{_mandir}/man1/r2e.1 +# the copy in docdir may not be present for an --excludedocs install +install -p -m 0644 config.py.example $RPM_BUILD_ROOT%{_datadir}/%{name}/ + + +%files +%doc CHANGELOG readme.html config.py.example +%{_bindir}/* +%{_datadir}/%{name}/ +%{_mandir}/man1/* + + +%changelog +* Fri Jul 26 2019 Fedora Release Engineering - 2.71-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Sat Feb 02 2019 Fedora Release Engineering - 2.71-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Sat Jul 14 2018 Fedora Release Engineering - 2.71-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Fri Feb 09 2018 Fedora Release Engineering - 2.71-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Wed Jan 31 2018 Iryna Shcherbina - 2.71-12 +- Update Python 2 dependency declarations to new packaging standards + (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3) + +* Thu Jul 27 2017 Fedora Release Engineering - 2.71-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Sat Feb 11 2017 Fedora Release Engineering - 2.71-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Thu Feb 04 2016 Fedora Release Engineering - 2.71-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Thu Jun 18 2015 Fedora Release Engineering - 2.71-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Sun Jun 08 2014 Fedora Release Engineering - 2.71-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Sun Aug 04 2013 Fedora Release Engineering - 2.71-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Mon Mar 4 2013 Michael Schwendt - 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 updates for the manual page. +- Minor spec clean-up to remove superfluous items. + +* Thu Feb 14 2013 Fedora Release Engineering - 2.71-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Sat Jul 21 2012 Fedora Release Engineering - 2.71-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Sat Jan 14 2012 Fedora Release Engineering - 2.71-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Mon Apr 11 2011 Michael Schwendt - 2.71-1 +- Upgrade to 2.71. +- Fix bad tarball permissions. +- Increase minimum version in python-feedparser and python-html2text + dependencies to match what upstream wants for this release. + +* Wed Feb 09 2011 Fedora Release Engineering - 2.70-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Wed Jan 12 2011 Michael Schwendt - 2.70-1 +- Upgrade to 2.70. +- Update r2e wrapper script. +- Patch config.py loader (now first look in current dir like upstream, + but if not found look for $HOME/.rss2email/config.py). +- Include config.py.example also in the documentation directory. +- Various minor spec file adjustments. + +* Sun Jul 04 2010 Thorsten Leemhuis - 2.66-1 +- update to 2.66, which now is shipped in a tarball + +* Sun Jul 26 2009 Fedora Release Engineering - 2.65-3.1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Wed Feb 25 2009 Fedora Release Engineering - 2.65-2.1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Tue Jan 06 2009 Thorsten Leemhuis - 2.65-1 +- update to 2.65 +- recreate rss2email-use-configpy-from-homedir.patch + +* Sun Oct 26 2008 Thorsten Leemhuis - 2.64-1 +- update to 2.64 +- drop rss2email-warn-if-problems-with-local-mta.patch, something similar now + upstream + +* Fri Jul 04 2008 Thorsten Leemhuis - 2.63-1 +- update to 2.63 (GPLv3 now) + +* Sat Jan 19 2008 Thorsten Leemhuis - 2.62-1 +- Update to 2.62 + +* Fri Dec 14 2007 Thorsten Leemhuis - 2.61-1 +- Update to 2.61 + +* Fri Aug 03 2007 Thorsten Leemhuis +- Update License field due to the "Licensing guidelines changes" + +* Sun Mar 25 2007 Thorsten Leemhuis - 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 + local delivery via sendmail + +* Sat Mar 24 2007 Thorsten Leemhuis - 2.60-2 +- Seperate package for html2text, as it might be useful for other stuff + as well +- update r2e and make it possible to manage different feed files (optional, + use r2e option "--feedext foo" to use it) +- add some common used, but-no-so-well documented configuration parameters + to config.py template and give a hint where to find docs what they do + +* Fri Mar 23 2007 Thorsten Leemhuis - 2.60-1 +- Initial package diff --git a/sources b/sources new file mode 100644 index 0000000..0e5e4ce --- /dev/null +++ b/sources @@ -0,0 +1 @@ +7d7dbac5aa181b07261516213a312f39 rss2email-2.71.tar.gz From 50c959b50bc27ace9938f43fc61ef8d86e305d8d Mon Sep 17 00:00:00 2001 From: David Kaufmann Date: Tue, 24 Sep 2019 00:11:19 +0200 Subject: [PATCH 06/49] update to version 3.10 from github:rss2email/rss2email --- ...rrect-version-number-in-rss2email.py.patch | 23 --- 0006-Prefer-utf8-in-CHARSET_LIST.patch | 33 ---- ...encoding-of-From-and-To-headers.patch.diff | 47 ------ README.migrate | 7 + r2e-migrate | 153 ++++++++++++++++++ r2e-migrate.1 | 24 +++ rss2email-2.70-config-location.patch | 22 --- rss2email-r2e | 24 --- rss2email-r2e.1 | 94 ----------- rss2email.spec | 131 ++++++--------- sources | 2 +- 11 files changed, 238 insertions(+), 322 deletions(-) delete mode 100644 0003-Setup-the-correct-version-number-in-rss2email.py.patch delete mode 100644 0006-Prefer-utf8-in-CHARSET_LIST.patch delete mode 100644 0008-Fix-encoding-of-From-and-To-headers.patch.diff create mode 100644 README.migrate create mode 100755 r2e-migrate create mode 100644 r2e-migrate.1 delete mode 100644 rss2email-2.70-config-location.patch delete mode 100644 rss2email-r2e delete mode 100644 rss2email-r2e.1 diff --git a/0003-Setup-the-correct-version-number-in-rss2email.py.patch b/0003-Setup-the-correct-version-number-in-rss2email.py.patch deleted file mode 100644 index a2f2269..0000000 --- a/0003-Setup-the-correct-version-number-in-rss2email.py.patch +++ /dev/null @@ -1,23 +0,0 @@ -From: Etienne Millon -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@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 deleted file mode 100644 index a390ad9..0000000 --- a/0006-Prefer-utf8-in-CHARSET_LIST.patch +++ /dev/null @@ -1,33 +0,0 @@ -From: Etienne Millon -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/0008-Fix-encoding-of-From-and-To-headers.patch.diff b/0008-Fix-encoding-of-From-and-To-headers.patch.diff deleted file mode 100644 index a160724..0000000 --- a/0008-Fix-encoding-of-From-and-To-headers.patch.diff +++ /dev/null @@ -1,47 +0,0 @@ ---- rss2email-2.71/debian/patches/0008-Fix-encoding-of-From-and-To-headers.patch 1970-01-01 01:00:00.000000000 +0100 -+++ rss2email-2.71/debian/patches/0008-Fix-encoding-of-From-and-To-headers.patch 2013-01-23 16:37:07.000000000 +0100 -@@ -0,0 +1,44 @@ -+From: Thorsten Glaser -+Date: Wed, 23 Jan 2013 15:25:35 +0100 -+Subject: Fix encoding of From and To headers -+ -+Debian-Bug: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=638994 -+--- -+ rss2email.py | 10 ++++++++-- -+ 1 file changed, 8 insertions(+), 2 deletions(-) -+ -+diff --git a/rss2email.py b/rss2email.py -+index a6c3cbe..bdfb41a 100755 -+--- a/rss2email.py -++++ b/rss2email.py -+@@ -114,6 +114,12 @@ from email.MIMEText import MIMEText -+ from email.Header import Header as _Header -+ from email.Utils import parseaddr, formataddr -+ -++def name_format(realname, mailaddress): -++ if not realname: -++ return mailaddress -++ foo = formataddr(("." + realname, mailaddress)) -++ return foo.replace(".", "", 1) -++ -+ class Header(_Header): -+ # Work-around for -+ def append(self, s=None, *args, **kwargs): -+@@ -166,7 +172,7 @@ def send(sender, recipient, subject, body, contenttype, extraheaders=None, smtps -+ -+ # Create the message ('plain' stands for Content-Type: text/plain) -+ msg = MIMEText(body.encode(body_charset), contenttype, body_charset) -+- msg['To'] = formataddr((recipient_name, recipient_addr)) -++ msg['To'] = name_format(recipient_name, recipient_addr) -+ msg['Subject'] = Header(unicode(subject), header_charset) -+ for hdr in extraheaders.keys(): -+ try: -+@@ -174,7 +180,7 @@ def send(sender, recipient, subject, body, contenttype, extraheaders=None, smtps -+ except: -+ msg[hdr] = Header(extraheaders[hdr]) -+ -+- fromhdr = formataddr((sender_name, sender_addr)) -++ fromhdr = name_format(sender_name, sender_addr) -+ msg['From'] = fromhdr -+ -+ msg_as_string = msg.as_string() diff --git a/README.migrate b/README.migrate new file mode 100644 index 0000000..46c085a --- /dev/null +++ b/README.migrate @@ -0,0 +1,7 @@ +rss2email 3.x introduces a new, incompatible format for configuration and +feed data. Please review the r2e(1) manpage for details on the new +configuration format. + +You can migrate (parts of) your data, using the provided r2e-migrate +executable: it will set up your default email address, feed list, and +already-seen database. diff --git a/r2e-migrate b/r2e-migrate new file mode 100755 index 0000000..c741c46 --- /dev/null +++ b/r2e-migrate @@ -0,0 +1,153 @@ +#!/usr/bin/python3 +# +# Migrate data from the rss2email 2.x format to the 3.x format. +# +# Copyright (c) 2013, Etienne Millon +# Redistributable under the GPL version 2 or later +# +# Please report bugs and suggestion on the Debian bugtracker using the +# "reportbug rss2email" command. +# +# Changelog: +# +# v6 (2017-12-28) +# - ported to Python 3 using 2to3 +# +# v5 (2015-07-04) +# - support per-feed addresses +# +# v4 (2014-06-10) +# - support XDG directories +# +# v3 (2014-02-04) +# - Write status file (already-seen DB) +# - Fix path in error message +# +# v2 (2013-09-17) +# - Preserve paused status (Denis Laxalde) +# +# v1 (2013-08-12) +# - Migrate feed names only. +# + +import json +import os.path +import pickle +import string +import subprocess +import sys +import xdg.BaseDirectory + + +class Feed: + def __init__(self, url, to): + self.url, self.etag, self.modified, self.seen = url, None, None, {} + self.active = True + self.to = to + + def __repr__(self): + fmt = '\n'.join(['Feed(url={url},', + ' etag={etag},', + ' modified={modified},', + ' seen={seen},', + ' active={active},', + ' to={to},', + ')', + ]) + return fmt.format(**self.__dict__) + + +def not_empty(g): + try: + next(g) + return True + except StopIteration: + return False + + +def new_db_exists(): + config = xdg.BaseDirectory.load_config_paths('rss2email.cfg') + data = xdg.BaseDirectory.load_data_paths('rss2email.json') + return not_empty(config) or not_empty(data) + + +def set_email(s): + return subprocess.call(['r2e', 'email', s]) + + +def slugify_char(c): + allowed = string.ascii_letters + string.digits + '._-' + if c in allowed: + return c + else: + return '_' + + +def slugify(s): + return ''.join([slugify_char(c) for c in s]) + + +def add(url, name, to): + extra_args = [] + if to is not None: + extra_args = [to] + return subprocess.call(['r2e', 'add', name, url] + extra_args) + + +def pause(name): + return subprocess.call(['r2e', 'pause', name]) + + +def main(): + if new_db_exists(): + print(""" + It seems that a rss2email 3.x database already exists, exiting. + If you want to import your old (rss2email 2.x) database, please remove + ~/.config/rss2email.cfg and ~/.local/share/rss2email.json (or XDG + equivalents) and re-run r2e-migrate. + """) + sys.exit(1) + + old_feed_data_file = os.path.expanduser('~/.rss2email/feeds.dat') + with open(old_feed_data_file) as f: + data = pickle.load(f) + + email = data[0] + feeds = data[1:] + + status = {'version': 2, + 'feeds': [], + } + + print('Default email address: {}'.format(email)) + set_email(email) + + print('Adding feeds:') + for feed in feeds: + url = feed.url + print(url) + name = slugify(url) + add(url, name, feed.to) + if not feed.active: + pause(name) + modified = None + if feed.modified: + modified = str(feed.modified) + feed_status = {'seen': {}, + 'etag': feed.etag, + 'name': str(name), + 'modified': modified, + } + for k, v in list(feed.seen.items()): + feed_status['seen'][k] = {'id': v} + status['feeds'].append(feed_status) + + # save_data_path would work but rss2email uses a bare file + data_dir = xdg.BaseDirectory.xdg_data_home + new_status_file = os.path.join(data_dir, 'rss2email.json') + with open(new_status_file, 'w') as statf: + json.dump(status, statf) + + +if __name__ == '__main__': + main() diff --git a/r2e-migrate.1 b/r2e-migrate.1 new file mode 100644 index 0000000..dd53d39 --- /dev/null +++ b/r2e-migrate.1 @@ -0,0 +1,24 @@ +.TH r2e\-migrate 1 "2013\-02\-04" +.SH NAME +r2e\-migrate \- Migrate your data from rss2email 2.x to rss2email 3.x. +.SH USAGE +.IP +.nf +\f[C] +r2e\-migrate +\f[] +.fi +.PP +Please note that you may still have to adapt your configuration. +See \f[C]r2e(1)\f[]. +.SH FILES +.PP +2.x versions used to store configuration in +\f[C]~/.rss2email/config.py\f[] and data in +\f[C]~/.rss2email/feeds.dat\f[]. +.PP +Now 3.x stores its configuration in +\f[C]$XDG_CONFIG_HOME/rss2email.cfg\f[] and data in +\f[C]$XDG_DATA_HOME/rss2email.json\f[]. +.SH AUTHORS +Etienne Millon . diff --git a/rss2email-2.70-config-location.patch b/rss2email-2.70-config-location.patch deleted file mode 100644 index a884141..0000000 --- a/rss2email-2.70-config-location.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -Nur rss2email-2.70-orig/rss2email.py rss2email-2.70/rss2email.py ---- rss2email-2.70-orig/rss2email.py 2010-12-17 19:29:34.000000000 +0100 -+++ rss2email-2.70/rss2email.py 2011-01-12 18:57:25.775331913 +0100 -@@ -254,11 +254,13 @@ - - # Read options from config file if present. - import sys --sys.path.insert(0,".") --try: -- from config import * --except: -- pass -+import os -+cfgpaths = [os.path.join(os.getcwd(),"config.py"), -+ os.path.join(os.environ["HOME"],".rss2email/config.py"),] -+for cfgfile in cfgpaths: -+ if os.path.exists(cfgfile): -+ execfile(cfgfile) -+ break - - warn = sys.stderr - diff --git a/rss2email-r2e b/rss2email-r2e deleted file mode 100644 index 7ec377a..0000000 --- a/rss2email-r2e +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/sh -datadir=@datadir@ -r2ehome=${datadir}/rss2email -cfgtemplate=${r2ehome}/config.py.example -dotr2e=${HOME}/.rss2email - -if [ ! -e ${dotr2e} ] -then - mkdir ${dotr2e} -fi - -if [ ! -e ${dotr2e}/config.py ] && [ -e ${cfgtemplate} ] -then - cp -a ${cfgtemplate} ${dotr2e}/config.py -fi - -if [ "${1}" = "--feedext" ] && [ "${2}" ] -then - fileext="${2}" - shift 2 - exec python ${r2ehome}/rss2email.py ${dotr2e}/feeds.dat."${fileext}" "$@" -else - exec python ${r2ehome}/rss2email.py ${dotr2e}/feeds.dat "$@" -fi diff --git a/rss2email-r2e.1 b/rss2email-r2e.1 deleted file mode 100644 index 1ce5bd7..0000000 --- a/rss2email-r2e.1 +++ /dev/null @@ -1,94 +0,0 @@ -.TH R2E 1 -.SH NAME -r2e \- receive RSS feeds by email -.SH SYNOPSIS -.B r2e action [options] -.SH DESCRIPTION -.BR r2e -is a simple program which you can run in your crontab. -It watches RSS feeds and sends you a nicely formatted email message -for each new item. -.P -The program is configured by ~/.rss2email/config.py -.P -For a quick start with r2e, try these steps: -.P -.RS -.nf -.BI "r2e new " your@address -.BI "r2e add " http://feed.url/somewhere.rss -.BI "r2e run " -.RE -.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] -Create a new feedfile. If the second option is specified, it sets the -default email address that mails are sent to. -.TP -.B add url [youremail] -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] -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 -useful the first time you run it, as otherwise it would send every -available story. -.P -If a number is specified, r2e will only download that feed. The list -command lists the feed numbers. -.TP -.B email yournewemail -Change the default email address. -.TP -.B list -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 -like this: VARIABLE = "value" -.P -If the value is a number, the quotes may be omitted. Most configuration -variables in the file are boolean values, where a 1 indicates the option is -set, and a 0 disables it. -.P -See the example config.py file for a full list of available configuration -variables. -.SH FILES -.TP -.B ~/.rss2email/feeds.dat -The database of feeds. Use r2e to add, remove, or modify feeds, do not edit -it directly. -.TP -.B ~/.rss2email/config.py -If this file exists, it is read to configure the program. -.SH AUTHOR -Aaron Swartz diff --git a/rss2email.spec b/rss2email.spec index 352aadc..d4e4b62 100644 --- a/rss2email.spec +++ b/rss2email.spec @@ -1,112 +1,87 @@ +%global commit 9c2d4072cb126b9806ec783627f0bd2f68debdf6 +%global shortcommit %(c=%{commit}; echo ${c:0:7}) +%global snapinfo 20190909git%{shortcommit} + Name: rss2email -Version: 2.71 -Release: 16%{?dist} +Version: 3.10 +Release: 2.%{snapinfo}%{?dist} Summary: Deliver news from RSS feeds to your SMTP server as text or HTML mail -License: GPLv2 or GPLv3 -URL: http://www.allthingsrss.com/rss2email/ -Source0: http://www.allthingsrss.com/rss2email/rss2email-%{version}.tar.gz -# 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.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 -# Remove the sys.path.insert(0,'.') module search path list alteration. -# 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 +License: GPLv2+ or GPLv3+ +URL: https://github.com/%{name}/%{name} +Source0: %{url}/%{name}/archive/%{commit}/%{name}-%{shortcommit}.tar.gz +# Migration tool (rss2email 2.x to rss2email 3.x) from https://github.com/emillon/rss2email-debian +Source1: r2e-migrate +Source2: r2e-migrate.1 +Source3: README.migrate BuildArch: noarch - -# These Python modules are imported by rss2email. -# The rss2email tarball contains copies of them, because some dists ship -# old modules which result in rss2email bug reports. We want to use the -# external packages due to Fedora packaging policies. -# -# 2011-01-12 -# - feedparser in Fedora 14 : 4.1 -# - feedparser in rss2email 2.66 to 2.70 : 4.2-pre -# 2011-04-11 -# - feedparser 5.0.2 in Fedora >= 14 -# - html2text 3.02 on its way to Fedora >= 15 -Requires: python2-feedparser >= 5.0.1 -Requires: python2-html2text >= 3.01 +BuildRequires: python3-devel +BuildRequires: python3-setuptools +BuildRequires: python3-feedparser >= 5.2.1 +BuildRequires: python3-html2text >= 2018.1.9 +Recommends: python3-beautifulsoup4 +Recommends: esmtp +# r2e-migrate +Requires: python3-pyxdg %description -rss2email lets you subscribe to a list of XML newsfeeds (RSS or Atom). It can +%{name} lets you subscribe to a list of XML news feeds (RSS or Atom). It can parse them regularly with the help of cron and send new items to you by email. An HTML mail will be send in the default configuration to the local SMTP server. -See the manual page r2e for details on how to set up rss2email. +See the manual page r2e for details on how to set up %{name}. %prep -# 2.71 tarball contains bad file permissions -# even for the top dir -%setup -q -c -n %{name}-fakeroot -chmod +x * -chmod +rw * -R -cp -a %{name}-%{version}/* . +%autosetup -n %{name}-%{commit} -chmod -x CHANGELOG readme* config* -# prepare the custom "r2e" wrapper script -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 +cp -p %{SOURCE3} . %build +%py3_build %install -mkdir -p \ - $RPM_BUILD_ROOT%{_bindir}/ \ - $RPM_BUILD_ROOT%{_datadir}/%{name}/ \ - $RPM_BUILD_ROOT%{_mandir}/man1/ +%py3_install -install -p -m 0755 rss2email.py $RPM_BUILD_ROOT%{_datadir}/%{name}/ -install -p -m 0755 r2e $RPM_BUILD_ROOT%{_bindir}/r2e -install -p -m 0644 %{SOURCE4} $RPM_BUILD_ROOT%{_mandir}/man1/r2e.1 -# the copy in docdir may not be present for an --excludedocs install -install -p -m 0644 config.py.example $RPM_BUILD_ROOT%{_datadir}/%{name}/ +install -D -m 644 -p r2e.1 %{buildroot}%{_mandir}/man1/r2e.1 + +install -D -m 755 -p %{SOURCE1} %{buildroot}%{_bindir}/r2e-migrate +install -D -m 644 -p %{SOURCE2} %{buildroot}%{_mandir}/man1/r2e-migrate.1 + + +%check +PATH="${PATH}:%{buildroot}%{_bindir}" PYTHONPATH=%{buildroot}%{python3_sitelib} %{__python3} ./test/test.py %files -%doc CHANGELOG readme.html config.py.example +%license COPYING +%doc AUTHORS CHANGELOG README.rst README.migrate %{_bindir}/* -%{_datadir}/%{name}/ %{_mandir}/man1/* - +%{python3_sitelib}/%{name} +%{python3_sitelib}/%{name}*.egg-info %changelog -* Fri Jul 26 2019 Fedora Release Engineering - 2.71-16 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild +* Mon Sep 23 2019 David Kaufmann - 3.10-2.20190909git9c2d407 +- Enable tests +- Use automatically generated dependencies for python packages for f30+ -* Sat Feb 02 2019 Fedora Release Engineering - 2.71-15 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild +* Mon Sep 09 2019 David Kaufmann - 3.10-1.20190909git9c2d407 +- Update to latest git version -* Sat Jul 14 2018 Fedora Release Engineering - 2.71-14 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild +* Mon Aug 12 2019 David Kaufmann - 3.9-3.20190812git4708c4b +- Include package review recommendations -* Fri Feb 09 2018 Fedora Release Engineering - 2.71-13 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild +* Mon Aug 12 2019 David Kaufmann - 3.9-2.20190812git4708c4b +- Update to latest git version +- Fix python version name for EPEL7 -* Wed Jan 31 2018 Iryna Shcherbina - 2.71-12 -- Update Python 2 dependency declarations to new packaging standards - (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3) +* Thu Dec 28 2017 Filip Szymański - 3.9-1.20171228gite21e803 +- Update to 3.9 +- Major spec file cleanup * Thu Jul 27 2017 Fedora Release Engineering - 2.71-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild @@ -161,7 +136,7 @@ install -p -m 0644 config.py.example $RPM_BUILD_ROOT%{_datadir}/%{name}/ - Various minor spec file adjustments. * Sun Jul 04 2010 Thorsten Leemhuis - 2.66-1 -- update to 2.66, which now is shipped in a tarball +- update to 2.66, which now is shipped in a tarball * Sun Jul 26 2009 Fedora Release Engineering - 2.65-3.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild diff --git a/sources b/sources index 0e5e4ce..3393895 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7d7dbac5aa181b07261516213a312f39 rss2email-2.71.tar.gz +SHA512 (rss2email-9c2d407.tar.gz) = 6ba6a8db3e6b2880855781a05502526d772c8a973c1d38d1f7bbe88595f4b28a50961f98dea132a3a6c485be7df7f81f370a878f25bd8c8cc09036fa0ac4cfc1 From 2cb5829ac137f1a01ad5281fb86f7506ff14a558 Mon Sep 17 00:00:00 2001 From: David Kaufmann Date: Tue, 24 Sep 2019 01:01:29 +0200 Subject: [PATCH 07/49] update gitignore --- .gitignore | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 9c2fe06..a445c76 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1 @@ -rss2email-2.66.tar.gz -/rss2email-2.70.tar.gz -/rss2email-2.71.tar.gz +/rss2email-*.tar.gz From 6b463e046f3cf1d0166d88e61809deed1955ae1f Mon Sep 17 00:00:00 2001 From: David Kaufmann Date: Tue, 24 Sep 2019 01:23:53 +0200 Subject: [PATCH 08/49] fix mistake in replacing url with url macro --- rss2email.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rss2email.spec b/rss2email.spec index d4e4b62..55f67cd 100644 --- a/rss2email.spec +++ b/rss2email.spec @@ -9,7 +9,7 @@ Summary: Deliver news from RSS feeds to your SMTP server as text or HTML License: GPLv2+ or GPLv3+ URL: https://github.com/%{name}/%{name} -Source0: %{url}/%{name}/archive/%{commit}/%{name}-%{shortcommit}.tar.gz +Source0: %{url}/archive/%{commit}/%{name}-%{shortcommit}.tar.gz # Migration tool (rss2email 2.x to rss2email 3.x) from https://github.com/emillon/rss2email-debian Source1: r2e-migrate Source2: r2e-migrate.1 From 1a33ff4831a2bd378a524fd4c9203d95c46a85d8 Mon Sep 17 00:00:00 2001 From: David Kaufmann Date: Mon, 28 Oct 2019 23:15:25 +0100 Subject: [PATCH 09/49] update version to 3.11 --- rss2email.spec | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/rss2email.spec b/rss2email.spec index 55f67cd..6ab9a3c 100644 --- a/rss2email.spec +++ b/rss2email.spec @@ -1,10 +1,10 @@ -%global commit 9c2d4072cb126b9806ec783627f0bd2f68debdf6 +%global commit b4eae441c2255de5de1dd7503b1ad2c02fd427a9 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global snapinfo 20190909git%{shortcommit} +%global snapinfo 20191028git%{shortcommit} Name: rss2email -Version: 3.10 -Release: 2.%{snapinfo}%{?dist} +Version: 3.11 +Release: 1.%{snapinfo}%{?dist} Summary: Deliver news from RSS feeds to your SMTP server as text or HTML mail License: GPLv2+ or GPLv3+ @@ -46,6 +46,8 @@ cp -p %{SOURCE3} . %install %py3_install +install -D -m 644 -p completion/r2e.zsh %{buildroot}%{_datadir}/zsh/functions/Completion/Unix/_r2e + install -D -m 644 -p r2e.1 %{buildroot}%{_mandir}/man1/r2e.1 install -D -m 755 -p %{SOURCE1} %{buildroot}%{_bindir}/r2e-migrate @@ -60,11 +62,15 @@ PATH="${PATH}:%{buildroot}%{_bindir}" PYTHONPATH=%{buildroot}%{python3_sitelib} %license COPYING %doc AUTHORS CHANGELOG README.rst README.migrate %{_bindir}/* +%{_datadir}/zsh/functions/Completion/Unix/_r2e %{_mandir}/man1/* %{python3_sitelib}/%{name} %{python3_sitelib}/%{name}*.egg-info %changelog +* Mon Oct 28 2019 David Kaufmann - 3.11-1.20191028gitb4eae44 +- Add new `user-agent` attribute for configuring email User-Agent + * Mon Sep 23 2019 David Kaufmann - 3.10-2.20190909git9c2d407 - Enable tests - Use automatically generated dependencies for python packages for f30+ From 3ea02598fb4662e0165d4aa72782e97af44fbf41 Mon Sep 17 00:00:00 2001 From: David Kaufmann Date: Mon, 28 Oct 2019 23:19:21 +0100 Subject: [PATCH 10/49] update sources file --- sources | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources b/sources index 3393895..f4e25eb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (rss2email-9c2d407.tar.gz) = 6ba6a8db3e6b2880855781a05502526d772c8a973c1d38d1f7bbe88595f4b28a50961f98dea132a3a6c485be7df7f81f370a878f25bd8c8cc09036fa0ac4cfc1 +SHA512 (rss2email-b4eae44.tar.gz) = f3a97d5947723b5041ee1ffcfb555aa4ffe6f515732a9e0f53b18bc92f191ffde55b82fa56e92d73b6552adcd728e95515050db26ed3b61d9dab1f161521610a From 4cb4a2dbc553f5cc05dc5de7c5220f2a52f9dec2 Mon Sep 17 00:00:00 2001 From: David Kaufmann Date: Sun, 8 Dec 2019 03:36:57 +0100 Subject: [PATCH 11/49] new release version for cleanup --- rss2email.spec | 27 +++++++++++++++++++++------ 1 file changed, 21 insertions(+), 6 deletions(-) diff --git a/rss2email.spec b/rss2email.spec index 6ab9a3c..ec4f0fc 100644 --- a/rss2email.spec +++ b/rss2email.spec @@ -1,10 +1,9 @@ %global commit b4eae441c2255de5de1dd7503b1ad2c02fd427a9 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global snapinfo 20191028git%{shortcommit} Name: rss2email Version: 3.11 -Release: 1.%{snapinfo}%{?dist} +Release: 2%{?dist} Summary: Deliver news from RSS feeds to your SMTP server as text or HTML mail License: GPLv2+ or GPLv3+ @@ -32,6 +31,15 @@ parse them regularly with the help of cron and send new items to you by email. An HTML mail will be send in the default configuration to the local SMTP server. See the manual page r2e for details on how to set up %{name}. +%package zsh-completion +Summary: zsh-completion files for rss2email +BuildArch: noarch +Supplements: (rss2email and zsh) +Requires: zsh +Requires: rss2email + +%description zsh-completion +This package provides %{summary}. %prep %autosetup -n %{name}-%{commit} @@ -61,13 +69,20 @@ PATH="${PATH}:%{buildroot}%{_bindir}" PYTHONPATH=%{buildroot}%{python3_sitelib} %files %license COPYING %doc AUTHORS CHANGELOG README.rst README.migrate -%{_bindir}/* +%{_bindir}/r2e +%{_bindir}/r2e-migrate +%{_mandir}/man1/r2e.1.gz +%{_mandir}/man1/r2e-migrate.1.gz +%{python3_sitelib}/%{name}/ +%{python3_sitelib}/%{name}-%{version}-py%{python3_version}.egg-info/ + +%files zsh-completion %{_datadir}/zsh/functions/Completion/Unix/_r2e -%{_mandir}/man1/* -%{python3_sitelib}/%{name} -%{python3_sitelib}/%{name}*.egg-info %changelog +* Mon Oct 28 2019 David Kaufmann - 3.11-2 +- clean up spec file a bit + * Mon Oct 28 2019 David Kaufmann - 3.11-1.20191028gitb4eae44 - Add new `user-agent` attribute for configuring email User-Agent From c13c47558a6a339ddc054569334771cfb9665000 Mon Sep 17 00:00:00 2001 From: David Kaufmann Date: Sun, 8 Dec 2019 23:40:52 +0100 Subject: [PATCH 12/49] man-pages actually do need globbing --- rss2email.spec | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/rss2email.spec b/rss2email.spec index ec4f0fc..429a6d6 100644 --- a/rss2email.spec +++ b/rss2email.spec @@ -71,8 +71,8 @@ PATH="${PATH}:%{buildroot}%{_bindir}" PYTHONPATH=%{buildroot}%{python3_sitelib} %doc AUTHORS CHANGELOG README.rst README.migrate %{_bindir}/r2e %{_bindir}/r2e-migrate -%{_mandir}/man1/r2e.1.gz -%{_mandir}/man1/r2e-migrate.1.gz +%{_mandir}/man1/r2e.1* +%{_mandir}/man1/r2e-migrate.1* %{python3_sitelib}/%{name}/ %{python3_sitelib}/%{name}-%{version}-py%{python3_version}.egg-info/ @@ -81,7 +81,9 @@ PATH="${PATH}:%{buildroot}%{_bindir}" PYTHONPATH=%{buildroot}%{python3_sitelib} %changelog * Mon Oct 28 2019 David Kaufmann - 3.11-2 -- clean up spec file a bit +- Clean up spec file a bit +- Get rid of over-globbing +- Add zsh-completion subpackage * Mon Oct 28 2019 David Kaufmann - 3.11-1.20191028gitb4eae44 - Add new `user-agent` attribute for configuring email User-Agent From 0d738da742a205be919795c45e35b3ad2f8f331f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 30 Jan 2020 17:55:28 +0000 Subject: [PATCH 13/49] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- rss2email.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rss2email.spec b/rss2email.spec index 429a6d6..d26d1f6 100644 --- a/rss2email.spec +++ b/rss2email.spec @@ -3,7 +3,7 @@ Name: rss2email Version: 3.11 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Deliver news from RSS feeds to your SMTP server as text or HTML mail License: GPLv2+ or GPLv3+ @@ -80,6 +80,9 @@ PATH="${PATH}:%{buildroot}%{_bindir}" PYTHONPATH=%{buildroot}%{python3_sitelib} %{_datadir}/zsh/functions/Completion/Unix/_r2e %changelog +* Thu Jan 30 2020 Fedora Release Engineering - 3.11-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Mon Oct 28 2019 David Kaufmann - 3.11-2 - Clean up spec file a bit - Get rid of over-globbing From 2214f65fa79b748d931662668d5b4562727e90c9 Mon Sep 17 00:00:00 2001 From: David Kaufmann Date: Fri, 22 May 2020 13:25:29 +0200 Subject: [PATCH 14/49] add python39 patch file --- python39.patch | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 python39.patch diff --git a/python39.patch b/python39.patch new file mode 100644 index 0000000..f7cce7d --- /dev/null +++ b/python39.patch @@ -0,0 +1,11 @@ +--- a/rss2email/util.py 2020-01-24 18:10:54.938818268 +0100 ++++ b/rss2email/util.py 2020-01-24 18:11:03.786677927 +0100 +@@ -74,7 +74,7 @@ + if self.error: + raise _error.TimeoutError( + time_limited_function=self) from self.error[1] +- elif self.isAlive(): ++ elif self.is_alive(): + raise _error.TimeoutError(time_limited_function=self) + return self.result + From 3e0d1c920900b1cbeeda9a447eeedc8b0cb7f33f Mon Sep 17 00:00:00 2001 From: David Kaufmann Date: Fri, 22 May 2020 14:26:23 +0200 Subject: [PATCH 15/49] also use python39 patch --- rss2email.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/rss2email.spec b/rss2email.spec index d26d1f6..f4f3250 100644 --- a/rss2email.spec +++ b/rss2email.spec @@ -13,6 +13,7 @@ Source0: %{url}/archive/%{commit}/%{name}-%{shortcommit}.tar.gz Source1: r2e-migrate Source2: r2e-migrate.1 Source3: README.migrate +Patch0: python39.patch BuildArch: noarch BuildRequires: python3-devel @@ -43,6 +44,7 @@ This package provides %{summary}. %prep %autosetup -n %{name}-%{commit} +%patch0 -p1 cp -p %{SOURCE3} . From f007131214d7cc6e118d299dfefcfd52244313cd Mon Sep 17 00:00:00 2001 From: David Kaufmann Date: Fri, 22 May 2020 15:57:07 +0200 Subject: [PATCH 16/49] properly use autosetup --- rss2email.spec | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/rss2email.spec b/rss2email.spec index f4f3250..3018fb5 100644 --- a/rss2email.spec +++ b/rss2email.spec @@ -43,8 +43,7 @@ Requires: rss2email This package provides %{summary}. %prep -%autosetup -n %{name}-%{commit} -%patch0 -p1 +%autosetup -n %{name}-%{commit} -p1 cp -p %{SOURCE3} . From 02df0b84b7c65237fafccee96adb504ca332769e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Tue, 26 May 2020 03:49:36 +0200 Subject: [PATCH 17/49] Rebuilt for Python 3.9 --- rss2email.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rss2email.spec b/rss2email.spec index 3018fb5..b31496f 100644 --- a/rss2email.spec +++ b/rss2email.spec @@ -3,7 +3,7 @@ Name: rss2email Version: 3.11 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Deliver news from RSS feeds to your SMTP server as text or HTML mail License: GPLv2+ or GPLv3+ @@ -81,6 +81,9 @@ PATH="${PATH}:%{buildroot}%{_bindir}" PYTHONPATH=%{buildroot}%{python3_sitelib} %{_datadir}/zsh/functions/Completion/Unix/_r2e %changelog +* Tue May 26 2020 Miro Hrončok - 3.11-4 +- Rebuilt for Python 3.9 + * Thu Jan 30 2020 Fedora Release Engineering - 3.11-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From 519f5d436890e3f4c44cc7eee7a326ec14a95062 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jul 2020 05:58:13 +0000 Subject: [PATCH 18/49] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- rss2email.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rss2email.spec b/rss2email.spec index b31496f..b50a1e7 100644 --- a/rss2email.spec +++ b/rss2email.spec @@ -3,7 +3,7 @@ Name: rss2email Version: 3.11 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Deliver news from RSS feeds to your SMTP server as text or HTML mail License: GPLv2+ or GPLv3+ @@ -81,6 +81,9 @@ PATH="${PATH}:%{buildroot}%{_bindir}" PYTHONPATH=%{buildroot}%{python3_sitelib} %{_datadir}/zsh/functions/Completion/Unix/_r2e %changelog +* Wed Jul 29 2020 Fedora Release Engineering - 3.11-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Tue May 26 2020 Miro Hrončok - 3.11-4 - Rebuilt for Python 3.9 From 7cd04d88db79802aed278b3785bc0dc084ed211a Mon Sep 17 00:00:00 2001 From: David Kaufmann Date: Mon, 10 Aug 2020 01:08:40 +0200 Subject: [PATCH 19/49] build new version --- python39.patch | 11 ----------- rss2email.spec | 10 ++++++---- sources | 2 +- 3 files changed, 7 insertions(+), 16 deletions(-) delete mode 100644 python39.patch diff --git a/python39.patch b/python39.patch deleted file mode 100644 index f7cce7d..0000000 --- a/python39.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/rss2email/util.py 2020-01-24 18:10:54.938818268 +0100 -+++ b/rss2email/util.py 2020-01-24 18:11:03.786677927 +0100 -@@ -74,7 +74,7 @@ - if self.error: - raise _error.TimeoutError( - time_limited_function=self) from self.error[1] -- elif self.isAlive(): -+ elif self.is_alive(): - raise _error.TimeoutError(time_limited_function=self) - return self.result - diff --git a/rss2email.spec b/rss2email.spec index b50a1e7..144b5fa 100644 --- a/rss2email.spec +++ b/rss2email.spec @@ -1,9 +1,9 @@ -%global commit b4eae441c2255de5de1dd7503b1ad2c02fd427a9 +%global commit 561aa02e07a47a1467e070d299402d2cbfc21ed9 %global shortcommit %(c=%{commit}; echo ${c:0:7}) Name: rss2email -Version: 3.11 -Release: 5%{?dist} +Version: 3.12.1 +Release: 1%{?dist} Summary: Deliver news from RSS feeds to your SMTP server as text or HTML mail License: GPLv2+ or GPLv3+ @@ -13,7 +13,6 @@ Source0: %{url}/archive/%{commit}/%{name}-%{shortcommit}.tar.gz Source1: r2e-migrate Source2: r2e-migrate.1 Source3: README.migrate -Patch0: python39.patch BuildArch: noarch BuildRequires: python3-devel @@ -81,6 +80,9 @@ PATH="${PATH}:%{buildroot}%{_bindir}" PYTHONPATH=%{buildroot}%{python3_sitelib} %{_datadir}/zsh/functions/Completion/Unix/_r2e %changelog +* Fri Aug 07 2020 David Kaufmann - 3.12.1-1 +- Update to 3.12.1 + * Wed Jul 29 2020 Fedora Release Engineering - 3.11-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild diff --git a/sources b/sources index f4e25eb..94b4420 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (rss2email-b4eae44.tar.gz) = f3a97d5947723b5041ee1ffcfb555aa4ffe6f515732a9e0f53b18bc92f191ffde55b82fa56e92d73b6552adcd728e95515050db26ed3b61d9dab1f161521610a +SHA512 (rss2email-561aa02.tar.gz) = 07332271d134fa5b4aca7a14e530cbfb6d861e20769fe9f1875e33081db717bc3e77bc3f95217fad20bf8bd6a4ad6e886d9c67927927e56852354222fc67b496 From e7e36fac160c82d8d9f38fb0decdb99b90675ade Mon Sep 17 00:00:00 2001 From: David Kaufmann Date: Tue, 1 Sep 2020 15:13:12 +0200 Subject: [PATCH 20/49] new release --- .gitignore | 1 + rss2email.spec | 13 +++++++------ sources | 2 +- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index a445c76..502e98e 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /rss2email-*.tar.gz +/v3.12.2.tar.gz diff --git a/rss2email.spec b/rss2email.spec index 144b5fa..da4798f 100644 --- a/rss2email.spec +++ b/rss2email.spec @@ -1,14 +1,11 @@ -%global commit 561aa02e07a47a1467e070d299402d2cbfc21ed9 -%global shortcommit %(c=%{commit}; echo ${c:0:7}) - Name: rss2email -Version: 3.12.1 +Version: 3.12.2 Release: 1%{?dist} Summary: Deliver news from RSS feeds to your SMTP server as text or HTML mail License: GPLv2+ or GPLv3+ URL: https://github.com/%{name}/%{name} -Source0: %{url}/archive/%{commit}/%{name}-%{shortcommit}.tar.gz +Source0: %{url}/archive/v%{version}.tar.gz # Migration tool (rss2email 2.x to rss2email 3.x) from https://github.com/emillon/rss2email-debian Source1: r2e-migrate Source2: r2e-migrate.1 @@ -42,7 +39,7 @@ Requires: rss2email This package provides %{summary}. %prep -%autosetup -n %{name}-%{commit} -p1 +%autosetup -p1 cp -p %{SOURCE3} . @@ -80,6 +77,10 @@ PATH="${PATH}:%{buildroot}%{_bindir}" PYTHONPATH=%{buildroot}%{python3_sitelib} %{_datadir}/zsh/functions/Completion/Unix/_r2e %changelog +* Tue Sep 01 2020 David Kaufmann - 3.12.2-1 +- Update to 3.12.2 +- Reference files by tag instead of commit + * Fri Aug 07 2020 David Kaufmann - 3.12.1-1 - Update to 3.12.1 diff --git a/sources b/sources index 94b4420..b20239f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (rss2email-561aa02.tar.gz) = 07332271d134fa5b4aca7a14e530cbfb6d861e20769fe9f1875e33081db717bc3e77bc3f95217fad20bf8bd6a4ad6e886d9c67927927e56852354222fc67b496 +SHA512 (v3.12.2.tar.gz) = 4df498cebd74bb25ffa2caa5aa851ccb106b0fa1b98113c5643cdd3ed8f9a73d266a649df521b8237740ea491ba086a65df0ba60c28a60a3d63360b8280a3888 From 74ddac7103ec7542c566e0893cae1e79a141bd82 Mon Sep 17 00:00:00 2001 From: David Kaufmann Date: Fri, 1 Jan 2021 00:47:27 +0100 Subject: [PATCH 21/49] update dependency feedparser to v6 --- rss2email-feedparser-6-support.patch | 119 +++++++++++++++++++++++++++ rss2email.spec | 8 +- 2 files changed, 125 insertions(+), 2 deletions(-) create mode 100644 rss2email-feedparser-6-support.patch diff --git a/rss2email-feedparser-6-support.patch b/rss2email-feedparser-6-support.patch new file mode 100644 index 0000000..16b9c13 --- /dev/null +++ b/rss2email-feedparser-6-support.patch @@ -0,0 +1,119 @@ +--- a/rss2email/feed.py ++++ b/rss2email/feed.py +@@ -433,7 +433,7 @@ def _check_for_errors(self, parsed): + elif isinstance(exc, _SOCKET_ERRORS): + _LOG.error('{}: {}'.format(exc, self)) + warned = True +- elif isinstance(exc, _feedparser.zlib.error): ++ elif isinstance(exc, _feedparser.http.zlib.error): + _LOG.error('broken compression: {}'.format(self)) + warned = True + elif isinstance(exc, (IOError, AttributeError)): + + +--- a/requirements.txt ++++ b/requirements.txt +@@ -1,2 +1,2 @@ +-feedparser==5.2.1 ++feedparser>=6.0.0 + html2text==2020.1.16 + +--- a/setup.py ++++ b/setup.py +@@ -65,7 +65,7 @@ + scripts=['r2e'], + provides=['rss2email'], + install_requires=[ +- 'feedparser>=5.0.1', ++ 'feedparser>=6.0.0', + 'html2text>=3.0.1', + ], + ) + + +--- a/.github/workflows/python-package.yml ++++ b/.github/workflows/python-package.yml +@@ -15,7 +15,7 @@ jobs: + strategy: + matrix: + os: [ubuntu-latest] +- python-version: [3.5, 3.6, 3.7, 3.8] ++ python-version: [3.6, 3.7, 3.8] + steps: + - uses: actions/checkout@v2 + - name: Set up Python ${{ matrix.python-version }} + + +--- a/HACKING.md ++++ b/HACKING.md +@@ -43,9 +43,9 @@ against multiple python versions. + You can build each one of them like this: + + ``` +-nix-build -A pythonVersions.rss2email-python_3_5 nix/release.nix + nix-build -A pythonVersions.rss2email-python_3_6 nix/release.nix + nix-build -A pythonVersions.rss2email-python_3_7 nix/release.nix ++nix-build -A pythonVersions.rss2email-python_3_8 nix/release.nix + … + ``` + + +--- a/nix/release.nix ++++ b/nix/release.nix +@@ -3,7 +3,6 @@ let + pkgs = import nixpkgs {}; + + supportedPackageSets = [ +- { version = "3_5"; set = pkgs.python35Packages; } + { version = "3_6"; set = pkgs.python36Packages; } + { version = "3_7"; set = pkgs.python37Packages; } + { version = "3_8"; set = pkgs.python38Packages; } +@@ -31,7 +30,7 @@ let + ''; + }; + +- # { "rss2email-python_3_5" = ; … } ++ # { "rss2email-python_3_6" = ; … } + rss2emailVersions = + (pkgs.lib.listToAttrs + (map + + +--- a/rss2email/email.py ++++ b/rss2email/email.py +@@ -325,7 +325,7 @@ def _flatten(message): + """ + bytesio = _io.BytesIO() + # TODO: use policies argument instead of policy set in `message` +- # see https://docs.python.org/3.5/library/email.generator.html?highlight=bytesgenerator#email.generator.BytesGenerator ++ # see https://docs.python.org/3.6/library/email.generator.html?highlight=bytesgenerator#email.generator.BytesGenerator + generator = _BytesGenerator(bytesio) + try: + generator.flatten(message) + + +--- a/setup.py ++++ b/setup.py +@@ -54,7 +54,6 @@ + 'License :: OSI Approved :: GNU General Public License v3 (GPLv3)', + 'Programming Language :: Python', + 'Programming Language :: Python :: 3', +- 'Programming Language :: Python :: 3.5', + 'Programming Language :: Python :: 3.6', + 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.8', + + +--- a/test/data/disqus/1.expected ++++ b/test/data/disqus/1.expected +@@ -43,7 +43,7 @@ + List-ID: + List-Post: NO (posting not allowed on this list) + X-RSS-Feed: data/disqus/feed.rss +-X-RSS-ID: ab03f2100069a1cd0876b997be87976c18d48e8a ++X-RSS-ID: a52375ec78a988241fe9864a2243d4d910538d52 + X-RSS-URL: http://software-carpentry.org/2012/11/who-wants-to-write-a-little-code/#comment-713578640 + + @Hans-Martin + + diff --git a/rss2email.spec b/rss2email.spec index da4798f..1b9082d 100644 --- a/rss2email.spec +++ b/rss2email.spec @@ -1,6 +1,6 @@ Name: rss2email Version: 3.12.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Deliver news from RSS feeds to your SMTP server as text or HTML mail License: GPLv2+ or GPLv3+ @@ -10,11 +10,12 @@ Source0: %{url}/archive/v%{version}.tar.gz Source1: r2e-migrate Source2: r2e-migrate.1 Source3: README.migrate +Patch0: rss2email-feedparser-6-support.patch BuildArch: noarch BuildRequires: python3-devel BuildRequires: python3-setuptools -BuildRequires: python3-feedparser >= 5.2.1 +BuildRequires: python3-feedparser >= 6.0.0 BuildRequires: python3-html2text >= 2018.1.9 Recommends: python3-beautifulsoup4 Recommends: esmtp @@ -77,6 +78,9 @@ PATH="${PATH}:%{buildroot}%{_bindir}" PYTHONPATH=%{buildroot}%{python3_sitelib} %{_datadir}/zsh/functions/Completion/Unix/_r2e %changelog +* Thu Dec 31 2020 David Kaufmann - 3.12.2-2 +- Update to feedparser 6 + * Tue Sep 01 2020 David Kaufmann - 3.12.2-1 - Update to 3.12.2 - Reference files by tag instead of commit From 0e211a15028d04dbbce6b94fe400fcd79dd10532 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 27 Jan 2021 15:29:58 +0000 Subject: [PATCH 22/49] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- rss2email.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rss2email.spec b/rss2email.spec index 1b9082d..c77dd16 100644 --- a/rss2email.spec +++ b/rss2email.spec @@ -1,6 +1,6 @@ Name: rss2email Version: 3.12.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Deliver news from RSS feeds to your SMTP server as text or HTML mail License: GPLv2+ or GPLv3+ @@ -78,6 +78,9 @@ PATH="${PATH}:%{buildroot}%{_bindir}" PYTHONPATH=%{buildroot}%{python3_sitelib} %{_datadir}/zsh/functions/Completion/Unix/_r2e %changelog +* Wed Jan 27 2021 Fedora Release Engineering - 3.12.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Thu Dec 31 2020 David Kaufmann - 3.12.2-2 - Update to feedparser 6 From db6133151cf470f2c8a6497b334224996e53c8d3 Mon Sep 17 00:00:00 2001 From: Fedora Release Monitoring Date: Fri, 19 Mar 2021 22:43:03 +0000 Subject: [PATCH 23/49] Update to 3.12.3 (#1941090) --- rss2email.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/rss2email.spec b/rss2email.spec index c77dd16..4a536c3 100644 --- a/rss2email.spec +++ b/rss2email.spec @@ -1,6 +1,6 @@ Name: rss2email -Version: 3.12.2 -Release: 3%{?dist} +Version: 3.12.3 +Release: 1%{?dist} Summary: Deliver news from RSS feeds to your SMTP server as text or HTML mail License: GPLv2+ or GPLv3+ @@ -78,6 +78,9 @@ PATH="${PATH}:%{buildroot}%{_bindir}" PYTHONPATH=%{buildroot}%{python3_sitelib} %{_datadir}/zsh/functions/Completion/Unix/_r2e %changelog +* Fri Mar 19 2021 Fedora Release Monitoring - 3.12.3-1 +- Update to 3.12.3 (#1941090) + * Wed Jan 27 2021 Fedora Release Engineering - 3.12.2-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From bb926caa7a125de27971d54b8a91240af996ab85 Mon Sep 17 00:00:00 2001 From: David Kaufmann Date: Sun, 21 Mar 2021 00:18:50 +0100 Subject: [PATCH 24/49] update feedparser version patch --- .gitignore | 1 + rss2email-feedparser-6-support.patch | 112 ++++++++++++--------------- sources | 2 +- 3 files changed, 53 insertions(+), 62 deletions(-) diff --git a/.gitignore b/.gitignore index 502e98e..ecf1aeb 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /rss2email-*.tar.gz /v3.12.2.tar.gz +/v3.12.3.tar.gz diff --git a/rss2email-feedparser-6-support.patch b/rss2email-feedparser-6-support.patch index 16b9c13..67bc217 100644 --- a/rss2email-feedparser-6-support.patch +++ b/rss2email-feedparser-6-support.patch @@ -1,39 +1,7 @@ ---- a/rss2email/feed.py -+++ b/rss2email/feed.py -@@ -433,7 +433,7 @@ def _check_for_errors(self, parsed): - elif isinstance(exc, _SOCKET_ERRORS): - _LOG.error('{}: {}'.format(exc, self)) - warned = True -- elif isinstance(exc, _feedparser.zlib.error): -+ elif isinstance(exc, _feedparser.http.zlib.error): - _LOG.error('broken compression: {}'.format(self)) - warned = True - elif isinstance(exc, (IOError, AttributeError)): - - ---- a/requirements.txt -+++ b/requirements.txt -@@ -1,2 +1,2 @@ --feedparser==5.2.1 -+feedparser>=6.0.0 - html2text==2020.1.16 - ---- a/setup.py -+++ b/setup.py -@@ -65,7 +65,7 @@ - scripts=['r2e'], - provides=['rss2email'], - install_requires=[ -- 'feedparser>=5.0.1', -+ 'feedparser>=6.0.0', - 'html2text>=3.0.1', - ], - ) - - ---- a/.github/workflows/python-package.yml -+++ b/.github/workflows/python-package.yml -@@ -15,7 +15,7 @@ jobs: +diff --color -ur a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml +--- a/.github/workflows/python-package.yml 2021-03-21 00:08:08.248447512 +0100 ++++ b/.github/workflows/python-package.yml 2021-03-21 00:10:21.775473081 +0100 +@@ -14,7 +14,7 @@ strategy: matrix: os: [ubuntu-latest] @@ -42,11 +10,10 @@ steps: - uses: actions/checkout@v2 - name: Set up Python ${{ matrix.python-version }} - - ---- a/HACKING.md -+++ b/HACKING.md -@@ -43,9 +43,9 @@ against multiple python versions. +diff --color -ur a/HACKING.md b/HACKING.md +--- a/HACKING.md 2021-03-21 00:08:08.248447512 +0100 ++++ b/HACKING.md 2021-03-21 00:10:50.213053120 +0100 +@@ -43,9 +43,9 @@ You can build each one of them like this: ``` @@ -57,10 +24,10 @@ … ``` - ---- a/nix/release.nix -+++ b/nix/release.nix -@@ -3,7 +3,6 @@ let +diff --color -ur a/nix/release.nix b/nix/release.nix +--- a/nix/release.nix 2021-03-21 00:08:08.248447512 +0100 ++++ b/nix/release.nix 2021-03-21 00:11:37.012362008 +0100 +@@ -3,7 +3,6 @@ pkgs = import nixpkgs {}; supportedPackageSets = [ @@ -68,7 +35,7 @@ { version = "3_6"; set = pkgs.python36Packages; } { version = "3_7"; set = pkgs.python37Packages; } { version = "3_8"; set = pkgs.python38Packages; } -@@ -31,7 +30,7 @@ let +@@ -31,7 +30,7 @@ ''; }; @@ -77,11 +44,17 @@ rss2emailVersions = (pkgs.lib.listToAttrs (map - - ---- a/rss2email/email.py -+++ b/rss2email/email.py -@@ -325,7 +325,7 @@ def _flatten(message): +diff --color -ur a/requirements.txt b/requirements.txt +--- a/requirements.txt 2021-03-21 00:08:08.248447512 +0100 ++++ b/requirements.txt 2021-03-21 00:09:21.456363851 +0100 +@@ -1,2 +1,2 @@ +-feedparser==5.2.1 ++feedparser>=6.0.0 + html2text==2020.1.16 +diff --color -ur a/rss2email/email.py b/rss2email/email.py +--- a/rss2email/email.py 2021-03-21 00:08:08.249447497 +0100 ++++ b/rss2email/email.py 2021-03-21 00:13:20.919827528 +0100 +@@ -325,7 +325,7 @@ """ bytesio = _io.BytesIO() # TODO: use policies argument instead of policy set in `message` @@ -90,10 +63,21 @@ generator = _BytesGenerator(bytesio) try: generator.flatten(message) - - ---- a/setup.py -+++ b/setup.py +diff --color -ur a/rss2email/feed.py b/rss2email/feed.py +--- a/rss2email/feed.py 2021-03-21 00:08:08.249447497 +0100 ++++ b/rss2email/feed.py 2021-03-21 00:13:47.857429725 +0100 +@@ -433,7 +433,7 @@ + elif isinstance(exc, _SOCKET_ERRORS): + _LOG.error('{}: {}'.format(exc, self)) + warned = True +- elif isinstance(exc, _feedparser.zlib.error): ++ elif isinstance(exc, _feedparser.http.zlib.error): + _LOG.error('broken compression: {}'.format(self)) + warned = True + elif isinstance(exc, (IOError, AttributeError)): +diff --color -ur a/setup.py b/setup.py +--- a/setup.py 2021-03-21 00:08:08.248447512 +0100 ++++ b/setup.py 2021-03-21 00:11:57.771055446 +0100 @@ -54,7 +54,6 @@ 'License :: OSI Approved :: GNU General Public License v3 (GPLv3)', 'Programming Language :: Python', @@ -102,10 +86,18 @@ 'Programming Language :: Python :: 3.6', 'Programming Language :: Python :: 3.7', 'Programming Language :: Python :: 3.8', - - ---- a/test/data/disqus/1.expected -+++ b/test/data/disqus/1.expected +@@ -65,7 +64,7 @@ + scripts=['r2e'], + provides=['rss2email'], + install_requires=[ +- 'feedparser>=5.0.1, <6.0', ++ 'feedparser>=6.0.0', + 'html2text>=3.0.1', + ], + ) +diff --color -ur a/test/data/disqus/1.expected b/test/data/disqus/1.expected +--- a/test/data/disqus/1.expected 2021-03-21 00:08:08.252447452 +0100 ++++ b/test/data/disqus/1.expected 2021-03-21 00:12:46.569334811 +0100 @@ -43,7 +43,7 @@ List-ID: List-Post: NO (posting not allowed on this list) @@ -115,5 +107,3 @@ X-RSS-URL: http://software-carpentry.org/2012/11/who-wants-to-write-a-little-code/#comment-713578640 @Hans-Martin - - diff --git a/sources b/sources index b20239f..f4477d6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (v3.12.2.tar.gz) = 4df498cebd74bb25ffa2caa5aa851ccb106b0fa1b98113c5643cdd3ed8f9a73d266a649df521b8237740ea491ba086a65df0ba60c28a60a3d63360b8280a3888 +SHA512 (v3.12.3.tar.gz) = 189f6d81020a582a6a0d142cd31cf2dd200382037f4e87444a4d3df58d9feeb3b5503a689ea91c5ad88d70cfc6a7f9767314cbaa0dad0f20cb525a8251df3026 From fd3bcbeb81c3deeb5aa7224b28fbfd9882d66bce Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 4 Jun 2021 21:13:54 +0200 Subject: [PATCH 25/49] Rebuilt for Python 3.10 --- rss2email.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rss2email.spec b/rss2email.spec index 4a536c3..8797e87 100644 --- a/rss2email.spec +++ b/rss2email.spec @@ -1,6 +1,6 @@ Name: rss2email Version: 3.12.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Deliver news from RSS feeds to your SMTP server as text or HTML mail License: GPLv2+ or GPLv3+ @@ -78,6 +78,9 @@ PATH="${PATH}:%{buildroot}%{_bindir}" PYTHONPATH=%{buildroot}%{python3_sitelib} %{_datadir}/zsh/functions/Completion/Unix/_r2e %changelog +* Fri Jun 04 2021 Python Maint - 3.12.3-2 +- Rebuilt for Python 3.10 + * Fri Mar 19 2021 Fedora Release Monitoring - 3.12.3-1 - Update to 3.12.3 (#1941090) From e312bcb9f00f5b459b0f96a344d66dc7dede4222 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 11:39:24 +0000 Subject: [PATCH 26/49] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- rss2email.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rss2email.spec b/rss2email.spec index 8797e87..ba04979 100644 --- a/rss2email.spec +++ b/rss2email.spec @@ -1,6 +1,6 @@ Name: rss2email Version: 3.12.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Deliver news from RSS feeds to your SMTP server as text or HTML mail License: GPLv2+ or GPLv3+ @@ -78,6 +78,9 @@ PATH="${PATH}:%{buildroot}%{_bindir}" PYTHONPATH=%{buildroot}%{python3_sitelib} %{_datadir}/zsh/functions/Completion/Unix/_r2e %changelog +* Fri Jul 23 2021 Fedora Release Engineering - 3.12.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Fri Jun 04 2021 Python Maint - 3.12.3-2 - Rebuilt for Python 3.10 From 3b5bb234976bd99d15dd640f417f4cd1f6c1a991 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 21 Jan 2022 18:05:58 +0000 Subject: [PATCH 27/49] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- rss2email.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rss2email.spec b/rss2email.spec index ba04979..bdb9678 100644 --- a/rss2email.spec +++ b/rss2email.spec @@ -1,6 +1,6 @@ Name: rss2email Version: 3.12.3 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Deliver news from RSS feeds to your SMTP server as text or HTML mail License: GPLv2+ or GPLv3+ @@ -78,6 +78,9 @@ PATH="${PATH}:%{buildroot}%{_bindir}" PYTHONPATH=%{buildroot}%{python3_sitelib} %{_datadir}/zsh/functions/Completion/Unix/_r2e %changelog +* Fri Jan 21 2022 Fedora Release Engineering - 3.12.3-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Fri Jul 23 2021 Fedora Release Engineering - 3.12.3-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 2bbad5573a56357a998aaa70d3f5d6cc13e9942b Mon Sep 17 00:00:00 2001 From: Python Maint Date: Mon, 13 Jun 2022 18:41:53 +0200 Subject: [PATCH 28/49] Rebuilt for Python 3.11 --- rss2email.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rss2email.spec b/rss2email.spec index bdb9678..4270539 100644 --- a/rss2email.spec +++ b/rss2email.spec @@ -1,6 +1,6 @@ Name: rss2email Version: 3.12.3 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Deliver news from RSS feeds to your SMTP server as text or HTML mail License: GPLv2+ or GPLv3+ @@ -78,6 +78,9 @@ PATH="${PATH}:%{buildroot}%{_bindir}" PYTHONPATH=%{buildroot}%{python3_sitelib} %{_datadir}/zsh/functions/Completion/Unix/_r2e %changelog +* Mon Jun 13 2022 Python Maint - 3.12.3-5 +- Rebuilt for Python 3.11 + * Fri Jan 21 2022 Fedora Release Engineering - 3.12.3-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From ac08d7b79aea57f73ba9a68211e5fb16f0851552 Mon Sep 17 00:00:00 2001 From: David Kaufmann Date: Tue, 28 Jun 2022 15:22:34 +0200 Subject: [PATCH 29/49] update to 3.13.1 --- .gitignore | 1 + rss2email-feedparser-6-support.patch | 109 --------------------------- rss2email.spec | 8 +- sources | 2 +- 4 files changed, 7 insertions(+), 113 deletions(-) delete mode 100644 rss2email-feedparser-6-support.patch diff --git a/.gitignore b/.gitignore index ecf1aeb..9fe6ab6 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /rss2email-*.tar.gz /v3.12.2.tar.gz /v3.12.3.tar.gz +/v3.13.1.tar.gz diff --git a/rss2email-feedparser-6-support.patch b/rss2email-feedparser-6-support.patch deleted file mode 100644 index 67bc217..0000000 --- a/rss2email-feedparser-6-support.patch +++ /dev/null @@ -1,109 +0,0 @@ -diff --color -ur a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml ---- a/.github/workflows/python-package.yml 2021-03-21 00:08:08.248447512 +0100 -+++ b/.github/workflows/python-package.yml 2021-03-21 00:10:21.775473081 +0100 -@@ -14,7 +14,7 @@ - strategy: - matrix: - os: [ubuntu-latest] -- python-version: [3.5, 3.6, 3.7, 3.8] -+ python-version: [3.6, 3.7, 3.8] - steps: - - uses: actions/checkout@v2 - - name: Set up Python ${{ matrix.python-version }} -diff --color -ur a/HACKING.md b/HACKING.md ---- a/HACKING.md 2021-03-21 00:08:08.248447512 +0100 -+++ b/HACKING.md 2021-03-21 00:10:50.213053120 +0100 -@@ -43,9 +43,9 @@ - You can build each one of them like this: - - ``` --nix-build -A pythonVersions.rss2email-python_3_5 nix/release.nix - nix-build -A pythonVersions.rss2email-python_3_6 nix/release.nix - nix-build -A pythonVersions.rss2email-python_3_7 nix/release.nix -+nix-build -A pythonVersions.rss2email-python_3_8 nix/release.nix - … - ``` - -diff --color -ur a/nix/release.nix b/nix/release.nix ---- a/nix/release.nix 2021-03-21 00:08:08.248447512 +0100 -+++ b/nix/release.nix 2021-03-21 00:11:37.012362008 +0100 -@@ -3,7 +3,6 @@ - pkgs = import nixpkgs {}; - - supportedPackageSets = [ -- { version = "3_5"; set = pkgs.python35Packages; } - { version = "3_6"; set = pkgs.python36Packages; } - { version = "3_7"; set = pkgs.python37Packages; } - { version = "3_8"; set = pkgs.python38Packages; } -@@ -31,7 +30,7 @@ - ''; - }; - -- # { "rss2email-python_3_5" = ; … } -+ # { "rss2email-python_3_6" = ; … } - rss2emailVersions = - (pkgs.lib.listToAttrs - (map -diff --color -ur a/requirements.txt b/requirements.txt ---- a/requirements.txt 2021-03-21 00:08:08.248447512 +0100 -+++ b/requirements.txt 2021-03-21 00:09:21.456363851 +0100 -@@ -1,2 +1,2 @@ --feedparser==5.2.1 -+feedparser>=6.0.0 - html2text==2020.1.16 -diff --color -ur a/rss2email/email.py b/rss2email/email.py ---- a/rss2email/email.py 2021-03-21 00:08:08.249447497 +0100 -+++ b/rss2email/email.py 2021-03-21 00:13:20.919827528 +0100 -@@ -325,7 +325,7 @@ - """ - bytesio = _io.BytesIO() - # TODO: use policies argument instead of policy set in `message` -- # see https://docs.python.org/3.5/library/email.generator.html?highlight=bytesgenerator#email.generator.BytesGenerator -+ # see https://docs.python.org/3.6/library/email.generator.html?highlight=bytesgenerator#email.generator.BytesGenerator - generator = _BytesGenerator(bytesio) - try: - generator.flatten(message) -diff --color -ur a/rss2email/feed.py b/rss2email/feed.py ---- a/rss2email/feed.py 2021-03-21 00:08:08.249447497 +0100 -+++ b/rss2email/feed.py 2021-03-21 00:13:47.857429725 +0100 -@@ -433,7 +433,7 @@ - elif isinstance(exc, _SOCKET_ERRORS): - _LOG.error('{}: {}'.format(exc, self)) - warned = True -- elif isinstance(exc, _feedparser.zlib.error): -+ elif isinstance(exc, _feedparser.http.zlib.error): - _LOG.error('broken compression: {}'.format(self)) - warned = True - elif isinstance(exc, (IOError, AttributeError)): -diff --color -ur a/setup.py b/setup.py ---- a/setup.py 2021-03-21 00:08:08.248447512 +0100 -+++ b/setup.py 2021-03-21 00:11:57.771055446 +0100 -@@ -54,7 +54,6 @@ - 'License :: OSI Approved :: GNU General Public License v3 (GPLv3)', - 'Programming Language :: Python', - 'Programming Language :: Python :: 3', -- 'Programming Language :: Python :: 3.5', - 'Programming Language :: Python :: 3.6', - 'Programming Language :: Python :: 3.7', - 'Programming Language :: Python :: 3.8', -@@ -65,7 +64,7 @@ - scripts=['r2e'], - provides=['rss2email'], - install_requires=[ -- 'feedparser>=5.0.1, <6.0', -+ 'feedparser>=6.0.0', - 'html2text>=3.0.1', - ], - ) -diff --color -ur a/test/data/disqus/1.expected b/test/data/disqus/1.expected ---- a/test/data/disqus/1.expected 2021-03-21 00:08:08.252447452 +0100 -+++ b/test/data/disqus/1.expected 2021-03-21 00:12:46.569334811 +0100 -@@ -43,7 +43,7 @@ - List-ID: - List-Post: NO (posting not allowed on this list) - X-RSS-Feed: data/disqus/feed.rss --X-RSS-ID: ab03f2100069a1cd0876b997be87976c18d48e8a -+X-RSS-ID: a52375ec78a988241fe9864a2243d4d910538d52 - X-RSS-URL: http://software-carpentry.org/2012/11/who-wants-to-write-a-little-code/#comment-713578640 - - @Hans-Martin diff --git a/rss2email.spec b/rss2email.spec index 4270539..d8e33ef 100644 --- a/rss2email.spec +++ b/rss2email.spec @@ -1,6 +1,6 @@ Name: rss2email -Version: 3.12.3 -Release: 5%{?dist} +Version: 3.13.1 +Release: 1%{?dist} Summary: Deliver news from RSS feeds to your SMTP server as text or HTML mail License: GPLv2+ or GPLv3+ @@ -10,7 +10,6 @@ Source0: %{url}/archive/v%{version}.tar.gz Source1: r2e-migrate Source2: r2e-migrate.1 Source3: README.migrate -Patch0: rss2email-feedparser-6-support.patch BuildArch: noarch BuildRequires: python3-devel @@ -78,6 +77,9 @@ PATH="${PATH}:%{buildroot}%{_bindir}" PYTHONPATH=%{buildroot}%{python3_sitelib} %{_datadir}/zsh/functions/Completion/Unix/_r2e %changelog +* Tue Jun 28 2022 David Kaufmann - 3.13.1-1 +- Update to 3.13.1 + * Mon Jun 13 2022 Python Maint - 3.12.3-5 - Rebuilt for Python 3.11 diff --git a/sources b/sources index f4477d6..b826967 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (v3.12.3.tar.gz) = 189f6d81020a582a6a0d142cd31cf2dd200382037f4e87444a4d3df58d9feeb3b5503a689ea91c5ad88d70cfc6a7f9767314cbaa0dad0f20cb525a8251df3026 +SHA512 (v3.13.1.tar.gz) = fbfd47c3512fc86a4db692245f7765281515b733cfd9bb13e8f7d225c8fe20a816469be2f1f9e71e925216686e6f470349c16573ab9c662d8e2b4e9d1b6debe6 From 0ed5f3006892367d6647f03fc5492387ff831f19 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 23 Jul 2022 01:05:46 +0000 Subject: [PATCH 30/49] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- rss2email.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rss2email.spec b/rss2email.spec index d8e33ef..8b5f7e0 100644 --- a/rss2email.spec +++ b/rss2email.spec @@ -1,6 +1,6 @@ Name: rss2email Version: 3.13.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Deliver news from RSS feeds to your SMTP server as text or HTML mail License: GPLv2+ or GPLv3+ @@ -77,6 +77,9 @@ PATH="${PATH}:%{buildroot}%{_bindir}" PYTHONPATH=%{buildroot}%{python3_sitelib} %{_datadir}/zsh/functions/Completion/Unix/_r2e %changelog +* Sat Jul 23 2022 Fedora Release Engineering - 3.13.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Tue Jun 28 2022 David Kaufmann - 3.13.1-1 - Update to 3.13.1 From b7b4c4faf1f6cfd73c5b6a6bb18dddc03246597b Mon Sep 17 00:00:00 2001 From: David Kaufmann Date: Sat, 27 Aug 2022 03:00:08 +0200 Subject: [PATCH 31/49] update to 3.14 --- rss2email.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/rss2email.spec b/rss2email.spec index 8b5f7e0..361d640 100644 --- a/rss2email.spec +++ b/rss2email.spec @@ -1,6 +1,6 @@ Name: rss2email -Version: 3.13.1 -Release: 2%{?dist} +Version: 3.14 +Release: 1%{?dist} Summary: Deliver news from RSS feeds to your SMTP server as text or HTML mail License: GPLv2+ or GPLv3+ @@ -14,7 +14,7 @@ Source3: README.migrate BuildArch: noarch BuildRequires: python3-devel BuildRequires: python3-setuptools -BuildRequires: python3-feedparser >= 6.0.0 +BuildRequires: python3-feedparser >= 6.0.5 BuildRequires: python3-html2text >= 2018.1.9 Recommends: python3-beautifulsoup4 Recommends: esmtp @@ -77,6 +77,9 @@ PATH="${PATH}:%{buildroot}%{_bindir}" PYTHONPATH=%{buildroot}%{python3_sitelib} %{_datadir}/zsh/functions/Completion/Unix/_r2e %changelog +* Sat Aug 27 2022 David Kaufmann - 3.14-1 +- Update to 3.14 + * Sat Jul 23 2022 Fedora Release Engineering - 3.13.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 628180be478b2a95a9908aa0774c98c556472efd Mon Sep 17 00:00:00 2001 From: David Kaufmann Date: Sat, 27 Aug 2022 03:17:53 +0200 Subject: [PATCH 32/49] new sources --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 9fe6ab6..1b6464b 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /v3.12.2.tar.gz /v3.12.3.tar.gz /v3.13.1.tar.gz +/v3.14.tar.gz diff --git a/sources b/sources index b826967..68735f8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (v3.13.1.tar.gz) = fbfd47c3512fc86a4db692245f7765281515b733cfd9bb13e8f7d225c8fe20a816469be2f1f9e71e925216686e6f470349c16573ab9c662d8e2b4e9d1b6debe6 +SHA512 (v3.14.tar.gz) = 42308a3ae2bfe3adaf4b904983c2270a162d268ce5f4357d853a7ba74814d97dc5dc66d7d94ef6b3fbe510e8368361f63a99de814d3388f37b190fa63594a727 From f240bccdde380024de3a9067039782ffc59559b1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 20 Jan 2023 20:00:50 +0000 Subject: [PATCH 33/49] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- rss2email.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rss2email.spec b/rss2email.spec index 361d640..ff1f556 100644 --- a/rss2email.spec +++ b/rss2email.spec @@ -1,6 +1,6 @@ Name: rss2email Version: 3.14 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Deliver news from RSS feeds to your SMTP server as text or HTML mail License: GPLv2+ or GPLv3+ @@ -77,6 +77,9 @@ PATH="${PATH}:%{buildroot}%{_bindir}" PYTHONPATH=%{buildroot}%{python3_sitelib} %{_datadir}/zsh/functions/Completion/Unix/_r2e %changelog +* Fri Jan 20 2023 Fedora Release Engineering - 3.14-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Sat Aug 27 2022 David Kaufmann - 3.14-1 - Update to 3.14 From 6f7dbc077047563b275eaa8978e7f4d650d89956 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Wed, 14 Jun 2023 07:02:49 +0200 Subject: [PATCH 34/49] Rebuilt for Python 3.12 --- rss2email.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rss2email.spec b/rss2email.spec index ff1f556..6c8032f 100644 --- a/rss2email.spec +++ b/rss2email.spec @@ -1,6 +1,6 @@ Name: rss2email Version: 3.14 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Deliver news from RSS feeds to your SMTP server as text or HTML mail License: GPLv2+ or GPLv3+ @@ -77,6 +77,9 @@ PATH="${PATH}:%{buildroot}%{_bindir}" PYTHONPATH=%{buildroot}%{python3_sitelib} %{_datadir}/zsh/functions/Completion/Unix/_r2e %changelog +* Wed Jun 14 2023 Python Maint - 3.14-3 +- Rebuilt for Python 3.12 + * Fri Jan 20 2023 Fedora Release Engineering - 3.14-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 2605fc99225875d62790b80ae6b0d6fca5a4a9d3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 21 Jul 2023 17:09:24 +0000 Subject: [PATCH 35/49] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- rss2email.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rss2email.spec b/rss2email.spec index 6c8032f..f117403 100644 --- a/rss2email.spec +++ b/rss2email.spec @@ -1,6 +1,6 @@ Name: rss2email Version: 3.14 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Deliver news from RSS feeds to your SMTP server as text or HTML mail License: GPLv2+ or GPLv3+ @@ -77,6 +77,9 @@ PATH="${PATH}:%{buildroot}%{_bindir}" PYTHONPATH=%{buildroot}%{python3_sitelib} %{_datadir}/zsh/functions/Completion/Unix/_r2e %changelog +* Fri Jul 21 2023 Fedora Release Engineering - 3.14-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Wed Jun 14 2023 Python Maint - 3.14-3 - Rebuilt for Python 3.12 From e9d3594a337ab510c9542150c98c28d6fe0e0b23 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 22 Jan 2024 12:07:08 +0000 Subject: [PATCH 36/49] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- rss2email.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rss2email.spec b/rss2email.spec index f117403..e8857bc 100644 --- a/rss2email.spec +++ b/rss2email.spec @@ -1,6 +1,6 @@ Name: rss2email Version: 3.14 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Deliver news from RSS feeds to your SMTP server as text or HTML mail License: GPLv2+ or GPLv3+ @@ -77,6 +77,9 @@ PATH="${PATH}:%{buildroot}%{_bindir}" PYTHONPATH=%{buildroot}%{python3_sitelib} %{_datadir}/zsh/functions/Completion/Unix/_r2e %changelog +* Mon Jan 22 2024 Fedora Release Engineering - 3.14-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Fri Jul 21 2023 Fedora Release Engineering - 3.14-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 2d946775f938cfdaf8399131ecea6cc08c083f45 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 26 Jan 2024 16:25:03 +0000 Subject: [PATCH 37/49] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- rss2email.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rss2email.spec b/rss2email.spec index e8857bc..8c02adf 100644 --- a/rss2email.spec +++ b/rss2email.spec @@ -1,6 +1,6 @@ Name: rss2email Version: 3.14 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Deliver news from RSS feeds to your SMTP server as text or HTML mail License: GPLv2+ or GPLv3+ @@ -77,6 +77,9 @@ PATH="${PATH}:%{buildroot}%{_bindir}" PYTHONPATH=%{buildroot}%{python3_sitelib} %{_datadir}/zsh/functions/Completion/Unix/_r2e %changelog +* Fri Jan 26 2024 Fedora Release Engineering - 3.14-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Mon Jan 22 2024 Fedora Release Engineering - 3.14-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 3f13d033ea0e132ce45781369fe65f0323662a12 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 7 Jun 2024 18:42:31 +0200 Subject: [PATCH 38/49] Rebuilt for Python 3.13 --- rss2email.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rss2email.spec b/rss2email.spec index 8c02adf..10b6744 100644 --- a/rss2email.spec +++ b/rss2email.spec @@ -1,6 +1,6 @@ Name: rss2email Version: 3.14 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Deliver news from RSS feeds to your SMTP server as text or HTML mail License: GPLv2+ or GPLv3+ @@ -77,6 +77,9 @@ PATH="${PATH}:%{buildroot}%{_bindir}" PYTHONPATH=%{buildroot}%{python3_sitelib} %{_datadir}/zsh/functions/Completion/Unix/_r2e %changelog +* Fri Jun 07 2024 Python Maint - 3.14-7 +- Rebuilt for Python 3.13 + * Fri Jan 26 2024 Fedora Release Engineering - 3.14-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 1a1d92be3782772e2a784ca8178a7e24391fa58c Mon Sep 17 00:00:00 2001 From: David Kaufmann Date: Wed, 12 Jun 2024 19:34:26 +0200 Subject: [PATCH 39/49] remove special chars --- rss2email-3.14-remove-special-bytes.patch | 11 +++++++++++ rss2email.spec | 6 +++++- 2 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 rss2email-3.14-remove-special-bytes.patch diff --git a/rss2email-3.14-remove-special-bytes.patch b/rss2email-3.14-remove-special-bytes.patch new file mode 100644 index 0000000..79951ee --- /dev/null +++ b/rss2email-3.14-remove-special-bytes.patch @@ -0,0 +1,11 @@ +--- a/test/data/allthingsrss/feed.atom ++++ b/test/data/allthingsrss/feed.atom +@@ -47,7 +47,7 @@ + </ul> + <p>Complete list in the official <a href="http://www.allthingsrss.com/rss2email/changelog">CHANGELOG</a>.</p> + <p><strong>Pause/Unpause</strong></p> +-<p>Through <code>r2e pause <em>n</em></code> where <em>n</em> is a feed number, you can temporarily suspend checking that feed for new content. To start checking it again, simply run <code>r2e unpause <em>n</em></code>. When you <code>r2e list</code>, an asterisk indicates that the feed is currently unpaused and active.</p> ++<p>Through <code>r2e pause <em>n</em></code> where <em>n</em> is a feed number, you can temporarily suspend checking that feed for new content. To start checking it again, simply run <code>r2e unpause <em>n</em></code>. When you <code>r2e list</code>, an asterisk indicates that the feed is currently unpaused and active.</p> + + <p><a href="http://feedads.g.doubleclick.net/~a/nYgTsIUsS9pmvRZ6092XGGHnNKg/0/da"><img src="http://feedads.g.doubleclick.net/~a/nYgTsIUsS9pmvRZ6092XGGHnNKg/0/di" border="0" ismap="true"></img></a><br/> + <a href="http://feedads.g.doubleclick.net/~a/nYgTsIUsS9pmvRZ6092XGGHnNKg/1/da"><img src="http://feedads.g.doubleclick.net/~a/nYgTsIUsS9pmvRZ6092XGGHnNKg/1/di" border="0" ismap="true"></img></a></p><img src="http://feeds.feedburner.com/~r/allthingsrss/hJBr/~4/bT-I0iH2vw8" height="1" width="1"/> diff --git a/rss2email.spec b/rss2email.spec index 10b6744..0b617db 100644 --- a/rss2email.spec +++ b/rss2email.spec @@ -1,6 +1,6 @@ Name: rss2email Version: 3.14 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Deliver news from RSS feeds to your SMTP server as text or HTML mail License: GPLv2+ or GPLv3+ @@ -10,6 +10,7 @@ Source0: %{url}/archive/v%{version}.tar.gz Source1: r2e-migrate Source2: r2e-migrate.1 Source3: README.migrate +Patch1: rss2email-3.14-remove-special-bytes.patch BuildArch: noarch BuildRequires: python3-devel @@ -77,6 +78,9 @@ PATH="${PATH}:%{buildroot}%{_bindir}" PYTHONPATH=%{buildroot}%{python3_sitelib} %{_datadir}/zsh/functions/Completion/Unix/_r2e %changelog +* Wed Jun 12 2024 David Kaufmann - 3.14-8 +- Remove special characters from Testcase + * Fri Jun 07 2024 Python Maint - 3.14-7 - Rebuilt for Python 3.13 From d2316541f93854eaeaf34950b51bd6cf81279a50 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jul 2024 18:53:29 +0000 Subject: [PATCH 40/49] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- rss2email.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rss2email.spec b/rss2email.spec index 0b617db..b6df9e4 100644 --- a/rss2email.spec +++ b/rss2email.spec @@ -1,6 +1,6 @@ Name: rss2email Version: 3.14 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Deliver news from RSS feeds to your SMTP server as text or HTML mail License: GPLv2+ or GPLv3+ @@ -78,6 +78,9 @@ PATH="${PATH}:%{buildroot}%{_bindir}" PYTHONPATH=%{buildroot}%{python3_sitelib} %{_datadir}/zsh/functions/Completion/Unix/_r2e %changelog +* Fri Jul 19 2024 Fedora Release Engineering - 3.14-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Wed Jun 12 2024 David Kaufmann - 3.14-8 - Remove special characters from Testcase From 208aedc597c4faf1987386e6b9739160168020ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Wed, 7 Aug 2024 10:11:03 +0200 Subject: [PATCH 41/49] convert license to SPDX This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4 --- rss2email.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/rss2email.spec b/rss2email.spec index b6df9e4..410a2f9 100644 --- a/rss2email.spec +++ b/rss2email.spec @@ -1,9 +1,10 @@ Name: rss2email Version: 3.14 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Deliver news from RSS feeds to your SMTP server as text or HTML mail -License: GPLv2+ or GPLv3+ +# Automatically converted from old format: GPLv2+ or GPLv3+ - review is highly recommended. +License: GPL-2.0-or-later OR GPL-3.0-or-later URL: https://github.com/%{name}/%{name} Source0: %{url}/archive/v%{version}.tar.gz # Migration tool (rss2email 2.x to rss2email 3.x) from https://github.com/emillon/rss2email-debian @@ -78,6 +79,9 @@ PATH="${PATH}:%{buildroot}%{_bindir}" PYTHONPATH=%{buildroot}%{python3_sitelib} %{_datadir}/zsh/functions/Completion/Unix/_r2e %changelog +* Wed Aug 07 2024 Miroslav Suchý - 3.14-10 +- convert license to SPDX + * Fri Jul 19 2024 Fedora Release Engineering - 3.14-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 1266f80475b58bcd70389a206fa123b44cab1d58 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 18 Jan 2025 22:47:38 +0000 Subject: [PATCH 42/49] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- rss2email.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rss2email.spec b/rss2email.spec index 410a2f9..1cb8b17 100644 --- a/rss2email.spec +++ b/rss2email.spec @@ -1,6 +1,6 @@ Name: rss2email Version: 3.14 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Deliver news from RSS feeds to your SMTP server as text or HTML mail # Automatically converted from old format: GPLv2+ or GPLv3+ - review is highly recommended. @@ -79,6 +79,9 @@ PATH="${PATH}:%{buildroot}%{_bindir}" PYTHONPATH=%{buildroot}%{python3_sitelib} %{_datadir}/zsh/functions/Completion/Unix/_r2e %changelog +* Sat Jan 18 2025 Fedora Release Engineering - 3.14-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Wed Aug 07 2024 Miroslav Suchý - 3.14-10 - convert license to SPDX From 76cc9c2e44084ea8a757f692f7da71b68bc79f25 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Tue, 3 Jun 2025 11:56:26 +0200 Subject: [PATCH 43/49] Rebuilt for Python 3.14 --- rss2email.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rss2email.spec b/rss2email.spec index 1cb8b17..5e29876 100644 --- a/rss2email.spec +++ b/rss2email.spec @@ -1,6 +1,6 @@ Name: rss2email Version: 3.14 -Release: 11%{?dist} +Release: 12%{?dist} Summary: Deliver news from RSS feeds to your SMTP server as text or HTML mail # Automatically converted from old format: GPLv2+ or GPLv3+ - review is highly recommended. @@ -79,6 +79,9 @@ PATH="${PATH}:%{buildroot}%{_bindir}" PYTHONPATH=%{buildroot}%{python3_sitelib} %{_datadir}/zsh/functions/Completion/Unix/_r2e %changelog +* Tue Jun 03 2025 Python Maint - 3.14-12 +- Rebuilt for Python 3.14 + * Sat Jan 18 2025 Fedora Release Engineering - 3.14-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 1f962815fbaf4b3999dc29ae1994f351f975bd1a Mon Sep 17 00:00:00 2001 From: David Kaufmann Date: Fri, 11 Jul 2025 04:10:27 +0200 Subject: [PATCH 44/49] migrate to new python3 build system --- rss2email.spec | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/rss2email.spec b/rss2email.spec index 5e29876..0115404 100644 --- a/rss2email.spec +++ b/rss2email.spec @@ -15,9 +15,9 @@ Patch1: rss2email-3.14-remove-special-bytes.patch BuildArch: noarch BuildRequires: python3-devel -BuildRequires: python3-setuptools BuildRequires: python3-feedparser >= 6.0.5 BuildRequires: python3-html2text >= 2018.1.9 +BuildRequires: python3-beautifulsoup4 Recommends: python3-beautifulsoup4 Recommends: esmtp # r2e-migrate @@ -46,12 +46,17 @@ This package provides %{summary}. cp -p %{SOURCE3} . +%generate_buildrequires +%pyproject_buildrequires + + %build -%py3_build +%pyproject_wheel %install -%py3_install +%pyproject_install +%pyproject_save_files -L %{name} install -D -m 644 -p completion/r2e.zsh %{buildroot}%{_datadir}/zsh/functions/Completion/Unix/_r2e @@ -62,18 +67,18 @@ install -D -m 644 -p %{SOURCE2} %{buildroot}%{_mandir}/man1/r2e-migrate.1 %check +%pyproject_check_import + PATH="${PATH}:%{buildroot}%{_bindir}" PYTHONPATH=%{buildroot}%{python3_sitelib} %{__python3} ./test/test.py -%files +%files -f %{pyproject_files} %license COPYING %doc AUTHORS CHANGELOG README.rst README.migrate %{_bindir}/r2e %{_bindir}/r2e-migrate %{_mandir}/man1/r2e.1* %{_mandir}/man1/r2e-migrate.1* -%{python3_sitelib}/%{name}/ -%{python3_sitelib}/%{name}-%{version}-py%{python3_version}.egg-info/ %files zsh-completion %{_datadir}/zsh/functions/Completion/Unix/_r2e From 6ff4c60941b45f7efa84cd019386e49b0345e6cc Mon Sep 17 00:00:00 2001 From: David Kaufmann Date: Fri, 11 Jul 2025 04:13:20 +0200 Subject: [PATCH 45/49] fix testcases --- rss2email-3.14-fix-tests-pr-279.patch | 234 ++++++++++++++++++++++++++ rss2email.spec | 1 + 2 files changed, 235 insertions(+) create mode 100644 rss2email-3.14-fix-tests-pr-279.patch diff --git a/rss2email-3.14-fix-tests-pr-279.patch b/rss2email-3.14-fix-tests-pr-279.patch new file mode 100644 index 0000000..5b5b92e --- /dev/null +++ b/rss2email-3.14-fix-tests-pr-279.patch @@ -0,0 +1,234 @@ +diff --git a/test/data/tails/1.expected b/test/data/tails/1.expected +index cd6238c..0feef24 100644 +--- a/test/data/tails/1.expected ++++ b/test/data/tails/1.expected +@@ -362,48 +362,48 @@ YzEuCgpUbyBkbyBhbiBhdXRvbWF0aWMgdXBncmFkZSB0byBUYWlscyA0LjExfnJjMToKCiAgICAx + LiBTdGFydCBUYWlscyA0LjIgb3IgbGF0ZXIgYW5kIFtzZXQgYW4gYWRtaW5pc3RyYXRpb24gcGFz + c3dvcmRdKGh0dHBzOi8vdGFpbHMuYm91bS5vcmcvZG9jL2ZpcnN0X3N0ZXBzL3dlbGNvbWVfc2Ny + ZWVuL2FkbWluaXN0cmF0aW9uX3Bhc3N3b3JkL2luZGV4LmVuLmh0bWwpLgoKICAgIDIuIFJ1biB0 +-aGlzIGNvbW1hbmQgaW4gYSBfVGVybWluYWxfIDoKICAgICAgICAKICAgICAgICAgICAgICAgIGVj +-aG8gVEFJTFNfQ0hBTk5FTD1cImFscGhhXCIgfCBzdWRvIHRlZSAtYSAvZXRjL29zLXJlbGVhc2Ug +-JiYgXAogICAgICAgICAgICAgdGFpbHMtdXBncmFkZS1mcm9udGVuZC13cmFwcGVyCiAgICAgICAg +-CgpFbnRlciB0aGUgYWRtaW5pc3RyYXRpb24gcGFzc3dvcmQgd2hlbiBhc2tlZCBmb3IgdGhlICJw +-YXNzd29yZCBmb3IgYW1uZXNpYSIuCgogICAgMy4gQWZ0ZXIgdGhlIHVwZ3JhZGUgaXMgYXBwbGll +-ZCwgcmVzdGFydCBUYWlscyBhbmQgY2hvb3NlICoqQXBwbGljYXRpb25zICDilrggVGFpbHMg4pa4 +-IEFib3V0IFRhaWxzKiogdG8gdmVyaWZ5IHRoYXQgeW91IGFyZSBydW5uaW5nIFRhaWxzIDQuMTF+ +-cmMxLgoKICAqIElmIHlvdSBjYW5ub3QgZG8gYW4gYXV0b21hdGljIHVwZ3JhZGUgb3IgaWYgVGFp +-bHMgZmFpbHMgdG8gc3RhcnQgYWZ0ZXIgYW4gYXV0b21hdGljIHVwZ3JhZGUsIHBsZWFzZSB0cnkg +-dG8gZG8gYSBbbWFudWFsIHVwZ3JhZGVdKGh0dHBzOi8vdGFpbHMuYm91bS5vcmcvZG9jL3VwZ3Jh +-ZGUvaW5kZXguZW4uaHRtbCNtYW51YWwpLgoKIyMgVG8gZG93bmxvYWQgNC4xMX5yYzEKCiMjIyBE +-aXJlY3QgZG93bmxvYWQKCiAgKiBbRm9yIFVTQiBzdGlja3MgKFVTQiBpbWFnZSldKGh0dHA6Ly9k +-bC5hbW5lc2lhLmJvdW0ub3JnL3RhaWxzL2FscGhhL3RhaWxzLWFtZDY0LTQuMTF+cmMxL3RhaWxz +-LWFtZDY0LTQuMTF+cmMxLmltZykgKFs/XShodHRwczovL3RhaWxzLmJvdW0ub3JnL2lraXdpa2ku +-Y2dpP2RvPWNyZWF0ZSZmcm9tPW5ld3MlMkZ0ZXN0XzQuMTEtcmMxJnBhZ2U9dG9ycmVudHMlMkZm +-aWxlcyUyRnRhaWxzLWFtZDY0LTQuMTF+cmMxLmltZy5zaWcpT3BlblBHUCBzaWduYXR1cmUpCgog +-ICogW0ZvciBEVkRzIGFuZCB2aXJ0dWFsIG1hY2hpbmVzIChJU08gaW1hZ2UpXShodHRwOi8vZGwu +-YW1uZXNpYS5ib3VtLm9yZy90YWlscy9hbHBoYS90YWlscy1hbWQ2NC00LjExfnJjMS90YWlscy1h +-bWQ2NC00LjExfnJjMS5pc28pIChbP10oaHR0cHM6Ly90YWlscy5ib3VtLm9yZy9pa2l3aWtpLmNn +-aT9kbz1jcmVhdGUmZnJvbT1uZXdzJTJGdGVzdF80LjExLXJjMSZwYWdlPXRvcnJlbnRzJTJGZmls +-ZXMlMkZ0YWlscy1hbWQ2NC00LjExfnJjMS5pc28uc2lnKU9wZW5QR1Agc2lnbmF0dXJlKQoKIyMj +-IEJpdFRvcnJlbnQgZG93bmxvYWQKCiAgKiBbRm9yIFVTQiBzdGlja3MgKFVTQiBpbWFnZSldKGh0 +-dHBzOi8vdGFpbHMuYm91bS5vcmcvdG9ycmVudHMvZmlsZXMvdGFpbHMtYW1kNjQtNC4xMX5yYzEu +-aW1nLnRvcnJlbnQpCgogICogW0ZvciBEVkRzIGFuZCB2aXJ0dWFsIG1hY2hpbmVzIChJU08gaW1h +-Z2UpXShodHRwczovL3RhaWxzLmJvdW0ub3JnL3RvcnJlbnRzL2ZpbGVzL3RhaWxzLWFtZDY0LTQu +-MTF+cmMxLmlzby50b3JyZW50KQoKIyMgVG8gaW5zdGFsbCBUYWlscyBvbiBhIG5ldyBVU0Igc3Rp +-Y2sKCkZvbGxvdyBvdXIgaW5zdGFsbGF0aW9uIGluc3RydWN0aW9uczoKCiAgKiBbSW5zdGFsbCBm +-cm9tIFdpbmRvd3NdKGh0dHBzOi8vdGFpbHMuYm91bS5vcmcvaW5zdGFsbC93aW4vdXNiL2luZGV4 +-LmVuLmh0bWwpCiAgKiBbSW5zdGFsbCBmcm9tIG1hY09TXShodHRwczovL3RhaWxzLmJvdW0ub3Jn +-L2luc3RhbGwvbWFjL3VzYi9pbmRleC5lbi5odG1sKQogICogW0luc3RhbGwgZnJvbSBMaW51eF0o +-aHR0cHM6Ly90YWlscy5ib3VtLm9yZy9pbnN0YWxsL2xpbnV4L3VzYi9pbmRleC5lbi5odG1sKQoK +-QWxsIHRoZSBkYXRhIG9uIHRoaXMgVVNCIHN0aWNrIHdpbGwgYmUgbG9zdC4KCiMgV2hhdCdzIGNv +-bWluZyB1cD8KClRhaWxzIDQuMTEgaXMgW3NjaGVkdWxlZF0oaHR0cHM6Ly90YWlscy5ib3VtLm9y +-Zy9jb250cmlidXRlL2NhbGVuZGFyLykgZm9yClNlcHRlbWJlciAyMi4KCkhhdmUgYSBsb29rIGF0 +-IG91ciBbcm9hZG1hcF0oaHR0cHM6Ly90YWlscy5ib3VtLm9yZy9jb250cmlidXRlL3JvYWRtYXAp +-IHRvIHNlZQp3aGVyZSB3ZSBhcmUgaGVhZGluZyB0by4KCldlIG5lZWQgeW91ciBoZWxwIGFuZCB0 +-aGVyZSBhcmUgbWFueSB3YXlzIHRvIFtjb250cmlidXRlIHRvClRhaWxzXShodHRwczovL3RhaWxz +-LmJvdW0ub3JnL2NvbnRyaWJ1dGUvaW5kZXguZW4uaHRtbCkKKFtkb25hdGluZ10oaHR0cHM6Ly90 +-YWlscy5ib3VtLm9yZy9kb25hdGUvP3I9NC4xMS1yYzEpIGlzIG9ubHkgb25lIG9mIHRoZW0pLgpD +-b21lIFt0YWxrIHRvIHVzXShodHRwczovL3RhaWxzLmJvdW0ub3JnL2Fib3V0L2NvbnRhY3QvaW5k +-ZXguZW4uaHRtbCN0YWlscy0KZGV2KSEKCgoKVVJMOiBodHRwczovL3RhaWxzLmJvdW0ub3JnL25l +-d3MvdGVzdF80LjExLXJjMS8= ++aGlzIGNvbW1hbmQgaW4gYSBfVGVybWluYWxfIDoKICAgICAgICAgICAKICAgICAgICAgICBlY2hv ++IFRBSUxTX0NIQU5ORUw9XCJhbHBoYVwiIHwgc3VkbyB0ZWUgLWEgL2V0Yy9vcy1yZWxlYXNlICYm ++IFwKICAgICAgICAgICAgICAgIHRhaWxzLXVwZ3JhZGUtZnJvbnRlbmQtd3JhcHBlcgogICAgICAg ++ICAgIAoKRW50ZXIgdGhlIGFkbWluaXN0cmF0aW9uIHBhc3N3b3JkIHdoZW4gYXNrZWQgZm9yIHRo ++ZSAicGFzc3dvcmQgZm9yIGFtbmVzaWEiLgoKICAgIDMuIEFmdGVyIHRoZSB1cGdyYWRlIGlzIGFw ++cGxpZWQsIHJlc3RhcnQgVGFpbHMgYW5kIGNob29zZSAqKkFwcGxpY2F0aW9ucyAg4pa4IFRhaWxz ++IOKWuCBBYm91dCBUYWlscyoqIHRvIHZlcmlmeSB0aGF0IHlvdSBhcmUgcnVubmluZyBUYWlscyA0 ++LjExfnJjMS4KCiAgKiBJZiB5b3UgY2Fubm90IGRvIGFuIGF1dG9tYXRpYyB1cGdyYWRlIG9yIGlm ++IFRhaWxzIGZhaWxzIHRvIHN0YXJ0IGFmdGVyIGFuIGF1dG9tYXRpYyB1cGdyYWRlLCBwbGVhc2Ug ++dHJ5IHRvIGRvIGEgW21hbnVhbCB1cGdyYWRlXShodHRwczovL3RhaWxzLmJvdW0ub3JnL2RvYy91 ++cGdyYWRlL2luZGV4LmVuLmh0bWwjbWFudWFsKS4KCiMjIFRvIGRvd25sb2FkIDQuMTF+cmMxCgoj ++IyMgRGlyZWN0IGRvd25sb2FkCgogICogW0ZvciBVU0Igc3RpY2tzIChVU0IgaW1hZ2UpXShodHRw ++Oi8vZGwuYW1uZXNpYS5ib3VtLm9yZy90YWlscy9hbHBoYS90YWlscy1hbWQ2NC00LjExfnJjMS90 ++YWlscy1hbWQ2NC00LjExfnJjMS5pbWcpIChbP10oaHR0cHM6Ly90YWlscy5ib3VtLm9yZy9pa2l3 ++aWtpLmNnaT9kbz1jcmVhdGUmZnJvbT1uZXdzJTJGdGVzdF80LjExLXJjMSZwYWdlPXRvcnJlbnRz ++JTJGZmlsZXMlMkZ0YWlscy1hbWQ2NC00LjExfnJjMS5pbWcuc2lnKU9wZW5QR1Agc2lnbmF0dXJl ++KQoKICAqIFtGb3IgRFZEcyBhbmQgdmlydHVhbCBtYWNoaW5lcyAoSVNPIGltYWdlKV0oaHR0cDov ++L2RsLmFtbmVzaWEuYm91bS5vcmcvdGFpbHMvYWxwaGEvdGFpbHMtYW1kNjQtNC4xMX5yYzEvdGFp ++bHMtYW1kNjQtNC4xMX5yYzEuaXNvKSAoWz9dKGh0dHBzOi8vdGFpbHMuYm91bS5vcmcvaWtpd2lr ++aS5jZ2k/ZG89Y3JlYXRlJmZyb209bmV3cyUyRnRlc3RfNC4xMS1yYzEmcGFnZT10b3JyZW50cyUy ++RmZpbGVzJTJGdGFpbHMtYW1kNjQtNC4xMX5yYzEuaXNvLnNpZylPcGVuUEdQIHNpZ25hdHVyZSkK ++CiMjIyBCaXRUb3JyZW50IGRvd25sb2FkCgogICogW0ZvciBVU0Igc3RpY2tzIChVU0IgaW1hZ2Up ++XShodHRwczovL3RhaWxzLmJvdW0ub3JnL3RvcnJlbnRzL2ZpbGVzL3RhaWxzLWFtZDY0LTQuMTF+ ++cmMxLmltZy50b3JyZW50KQoKICAqIFtGb3IgRFZEcyBhbmQgdmlydHVhbCBtYWNoaW5lcyAoSVNP ++IGltYWdlKV0oaHR0cHM6Ly90YWlscy5ib3VtLm9yZy90b3JyZW50cy9maWxlcy90YWlscy1hbWQ2 ++NC00LjExfnJjMS5pc28udG9ycmVudCkKCiMjIFRvIGluc3RhbGwgVGFpbHMgb24gYSBuZXcgVVNC ++IHN0aWNrCgpGb2xsb3cgb3VyIGluc3RhbGxhdGlvbiBpbnN0cnVjdGlvbnM6CgogICogW0luc3Rh ++bGwgZnJvbSBXaW5kb3dzXShodHRwczovL3RhaWxzLmJvdW0ub3JnL2luc3RhbGwvd2luL3VzYi9p ++bmRleC5lbi5odG1sKQogICogW0luc3RhbGwgZnJvbSBtYWNPU10oaHR0cHM6Ly90YWlscy5ib3Vt ++Lm9yZy9pbnN0YWxsL21hYy91c2IvaW5kZXguZW4uaHRtbCkKICAqIFtJbnN0YWxsIGZyb20gTGlu ++dXhdKGh0dHBzOi8vdGFpbHMuYm91bS5vcmcvaW5zdGFsbC9saW51eC91c2IvaW5kZXguZW4uaHRt ++bCkKCkFsbCB0aGUgZGF0YSBvbiB0aGlzIFVTQiBzdGljayB3aWxsIGJlIGxvc3QuCgojIFdoYXQn ++cyBjb21pbmcgdXA/CgpUYWlscyA0LjExIGlzIFtzY2hlZHVsZWRdKGh0dHBzOi8vdGFpbHMuYm91 ++bS5vcmcvY29udHJpYnV0ZS9jYWxlbmRhci8pIGZvcgpTZXB0ZW1iZXIgMjIuCgpIYXZlIGEgbG9v ++ayBhdCBvdXIgW3JvYWRtYXBdKGh0dHBzOi8vdGFpbHMuYm91bS5vcmcvY29udHJpYnV0ZS9yb2Fk ++bWFwKSB0byBzZWUKd2hlcmUgd2UgYXJlIGhlYWRpbmcgdG8uCgpXZSBuZWVkIHlvdXIgaGVscCBh ++bmQgdGhlcmUgYXJlIG1hbnkgd2F5cyB0byBbY29udHJpYnV0ZSB0bwpUYWlsc10oaHR0cHM6Ly90 ++YWlscy5ib3VtLm9yZy9jb250cmlidXRlL2luZGV4LmVuLmh0bWwpCihbZG9uYXRpbmddKGh0dHBz ++Oi8vdGFpbHMuYm91bS5vcmcvZG9uYXRlLz9yPTQuMTEtcmMxKSBpcyBvbmx5IG9uZSBvZiB0aGVt ++KS4KQ29tZSBbdGFsayB0byB1c10oaHR0cHM6Ly90YWlscy5ib3VtLm9yZy9hYm91dC9jb250YWN0 ++L2luZGV4LmVuLmh0bWwjdGFpbHMtCmRldikhCgoKClVSTDogaHR0cHM6Ly90YWlscy5ib3VtLm9y ++Zy9uZXdzL3Rlc3RfNC4xMS1yYzEv + + + SENT BY: "Tails - News: " +@@ -796,17 +796,17 @@ For more details, read our + # Known issues + + * Ledger wallets are not detected by _Electrum_ , with the following error message returned. ([#18080](https://gitlab.tails.boum.org/tails/tails/-/issues/18080)) +- ++ + "No hardware device detected" +- ++ + + Please try to execute the following command in a [root + terminal](https://tails.boum.org/doc/first_steps/welcome_screen/administration_password/index.en.html#open_root_terminal) + before starting _Electrum_ : + +- +- apt update && apt install python3-btchip/testing +- ++ ++ apt update && apt install python3-btchip/testing ++ + + See the list of [long-standing + issues](https://tails.boum.org/support/known_issues/index.en.html). +diff --git a/test/data/tails/2.expected b/test/data/tails/2.expected +index 7b48a67..7e9fd49 100644 +--- a/test/data/tails/2.expected ++++ b/test/data/tails/2.expected +@@ -933,47 +933,47 @@ bHMgNC4xMX5yYzE6CgogICAgMS4gU3RhcnQgVGFpbHMgNC4yIG9yIGxhdGVyIGFuZCBbc2V0IGFu + IGFkbWluaXN0cmF0aW9uIHBhc3N3b3JkXShodHRwczovL3RhaWxzLmJvdW0ub3JnL2RvYy9maXJz + dF9zdGVwcy93ZWxjb21lX3NjcmVlbi9hZG1pbmlzdHJhdGlvbl9wYXNzd29yZC9pbmRleC5lbi5o + dG1sKS4KCiAgICAyLiBSdW4gdGhpcyBjb21tYW5kIGluIGEgX1Rlcm1pbmFsXyA6CiAgICAgICAg +-CiAgICAgICAgICAgICAgICBlY2hvIFRBSUxTX0NIQU5ORUw9XCJhbHBoYVwiIHwgc3VkbyB0ZWUg +-LWEgL2V0Yy9vcy1yZWxlYXNlICYmIFwKICAgICAgICAgICAgIHRhaWxzLXVwZ3JhZGUtZnJvbnRl +-bmQtd3JhcHBlcgogICAgICAgIAoKRW50ZXIgdGhlIGFkbWluaXN0cmF0aW9uIHBhc3N3b3JkIHdo +-ZW4gYXNrZWQgZm9yIHRoZSAicGFzc3dvcmQgZm9yIGFtbmVzaWEiLgoKICAgIDMuIEFmdGVyIHRo +-ZSB1cGdyYWRlIGlzIGFwcGxpZWQsIHJlc3RhcnQgVGFpbHMgYW5kIGNob29zZSAqKkFwcGxpY2F0 +-aW9ucyAg4pa4IFRhaWxzIOKWuCBBYm91dCBUYWlscyoqIHRvIHZlcmlmeSB0aGF0IHlvdSBhcmUg +-cnVubmluZyBUYWlscyA0LjExfnJjMS4KCiAgKiBJZiB5b3UgY2Fubm90IGRvIGFuIGF1dG9tYXRp +-YyB1cGdyYWRlIG9yIGlmIFRhaWxzIGZhaWxzIHRvIHN0YXJ0IGFmdGVyIGFuIGF1dG9tYXRpYyB1 +-cGdyYWRlLCBwbGVhc2UgdHJ5IHRvIGRvIGEgW21hbnVhbCB1cGdyYWRlXShodHRwczovL3RhaWxz +-LmJvdW0ub3JnL2RvYy91cGdyYWRlL2luZGV4LmVuLmh0bWwjbWFudWFsKS4KCiMjIFRvIGRvd25s +-b2FkIDQuMTF+cmMxCgojIyMgRGlyZWN0IGRvd25sb2FkCgogICogW0ZvciBVU0Igc3RpY2tzIChV +-U0IgaW1hZ2UpXShodHRwOi8vZGwuYW1uZXNpYS5ib3VtLm9yZy90YWlscy9hbHBoYS90YWlscy1h +-bWQ2NC00LjExfnJjMS90YWlscy1hbWQ2NC00LjExfnJjMS5pbWcpIChbP10oaHR0cHM6Ly90YWls +-cy5ib3VtLm9yZy9pa2l3aWtpLmNnaT9kbz1jcmVhdGUmZnJvbT1uZXdzJTJGdGVzdF80LjExLXJj +-MSZwYWdlPXRvcnJlbnRzJTJGZmlsZXMlMkZ0YWlscy1hbWQ2NC00LjExfnJjMS5pbWcuc2lnKU9w +-ZW5QR1Agc2lnbmF0dXJlKQoKICAqIFtGb3IgRFZEcyBhbmQgdmlydHVhbCBtYWNoaW5lcyAoSVNP +-IGltYWdlKV0oaHR0cDovL2RsLmFtbmVzaWEuYm91bS5vcmcvdGFpbHMvYWxwaGEvdGFpbHMtYW1k +-NjQtNC4xMX5yYzEvdGFpbHMtYW1kNjQtNC4xMX5yYzEuaXNvKSAoWz9dKGh0dHBzOi8vdGFpbHMu +-Ym91bS5vcmcvaWtpd2lraS5jZ2k/ZG89Y3JlYXRlJmZyb209bmV3cyUyRnRlc3RfNC4xMS1yYzEm +-cGFnZT10b3JyZW50cyUyRmZpbGVzJTJGdGFpbHMtYW1kNjQtNC4xMX5yYzEuaXNvLnNpZylPcGVu +-UEdQIHNpZ25hdHVyZSkKCiMjIyBCaXRUb3JyZW50IGRvd25sb2FkCgogICogW0ZvciBVU0Igc3Rp +-Y2tzIChVU0IgaW1hZ2UpXShodHRwczovL3RhaWxzLmJvdW0ub3JnL3RvcnJlbnRzL2ZpbGVzL3Rh +-aWxzLWFtZDY0LTQuMTF+cmMxLmltZy50b3JyZW50KQoKICAqIFtGb3IgRFZEcyBhbmQgdmlydHVh +-bCBtYWNoaW5lcyAoSVNPIGltYWdlKV0oaHR0cHM6Ly90YWlscy5ib3VtLm9yZy90b3JyZW50cy9m +-aWxlcy90YWlscy1hbWQ2NC00LjExfnJjMS5pc28udG9ycmVudCkKCiMjIFRvIGluc3RhbGwgVGFp +-bHMgb24gYSBuZXcgVVNCIHN0aWNrCgpGb2xsb3cgb3VyIGluc3RhbGxhdGlvbiBpbnN0cnVjdGlv +-bnM6CgogICogW0luc3RhbGwgZnJvbSBXaW5kb3dzXShodHRwczovL3RhaWxzLmJvdW0ub3JnL2lu +-c3RhbGwvd2luL3VzYi9pbmRleC5lbi5odG1sKQogICogW0luc3RhbGwgZnJvbSBtYWNPU10oaHR0 +-cHM6Ly90YWlscy5ib3VtLm9yZy9pbnN0YWxsL21hYy91c2IvaW5kZXguZW4uaHRtbCkKICAqIFtJ +-bnN0YWxsIGZyb20gTGludXhdKGh0dHBzOi8vdGFpbHMuYm91bS5vcmcvaW5zdGFsbC9saW51eC91 +-c2IvaW5kZXguZW4uaHRtbCkKCkFsbCB0aGUgZGF0YSBvbiB0aGlzIFVTQiBzdGljayB3aWxsIGJl +-IGxvc3QuCgojIFdoYXQncyBjb21pbmcgdXA/CgpUYWlscyA0LjExIGlzIFtzY2hlZHVsZWRdKGh0 +-dHBzOi8vdGFpbHMuYm91bS5vcmcvY29udHJpYnV0ZS9jYWxlbmRhci8pIGZvcgpTZXB0ZW1iZXIg +-MjIuCgpIYXZlIGEgbG9vayBhdCBvdXIgW3JvYWRtYXBdKGh0dHBzOi8vdGFpbHMuYm91bS5vcmcv +-Y29udHJpYnV0ZS9yb2FkbWFwKSB0byBzZWUKd2hlcmUgd2UgYXJlIGhlYWRpbmcgdG8uCgpXZSBu +-ZWVkIHlvdXIgaGVscCBhbmQgdGhlcmUgYXJlIG1hbnkgd2F5cyB0byBbY29udHJpYnV0ZSB0bwpU +-YWlsc10oaHR0cHM6Ly90YWlscy5ib3VtLm9yZy9jb250cmlidXRlL2luZGV4LmVuLmh0bWwpCihb +-ZG9uYXRpbmddKGh0dHBzOi8vdGFpbHMuYm91bS5vcmcvZG9uYXRlLz9yPTQuMTEtcmMxKSBpcyBv +-bmx5IG9uZSBvZiB0aGVtKS4KQ29tZSBbdGFsayB0byB1c10oaHR0cHM6Ly90YWlscy5ib3VtLm9y +-Zy9hYm91dC9jb250YWN0L2luZGV4LmVuLmh0bWwjdGFpbHMtCmRldikhCgpVUkw6IDxodHRwczov +-L3RhaWxzLmJvdW0ub3JnL25ld3MvdGVzdF80LjExLXJjMS8+Cgo= ++ICAgCiAgICAgICAgICAgZWNobyBUQUlMU19DSEFOTkVMPVwiYWxwaGFcIiB8IHN1ZG8gdGVlIC1h ++IC9ldGMvb3MtcmVsZWFzZSAmJiBcCiAgICAgICAgICAgICAgICB0YWlscy11cGdyYWRlLWZyb250 ++ZW5kLXdyYXBwZXIKICAgICAgICAgICAKCkVudGVyIHRoZSBhZG1pbmlzdHJhdGlvbiBwYXNzd29y ++ZCB3aGVuIGFza2VkIGZvciB0aGUgInBhc3N3b3JkIGZvciBhbW5lc2lhIi4KCiAgICAzLiBBZnRl ++ciB0aGUgdXBncmFkZSBpcyBhcHBsaWVkLCByZXN0YXJ0IFRhaWxzIGFuZCBjaG9vc2UgKipBcHBs ++aWNhdGlvbnMgIOKWuCBUYWlscyDilrggQWJvdXQgVGFpbHMqKiB0byB2ZXJpZnkgdGhhdCB5b3Ug ++YXJlIHJ1bm5pbmcgVGFpbHMgNC4xMX5yYzEuCgogICogSWYgeW91IGNhbm5vdCBkbyBhbiBhdXRv ++bWF0aWMgdXBncmFkZSBvciBpZiBUYWlscyBmYWlscyB0byBzdGFydCBhZnRlciBhbiBhdXRvbWF0 ++aWMgdXBncmFkZSwgcGxlYXNlIHRyeSB0byBkbyBhIFttYW51YWwgdXBncmFkZV0oaHR0cHM6Ly90 ++YWlscy5ib3VtLm9yZy9kb2MvdXBncmFkZS9pbmRleC5lbi5odG1sI21hbnVhbCkuCgojIyBUbyBk ++b3dubG9hZCA0LjExfnJjMQoKIyMjIERpcmVjdCBkb3dubG9hZAoKICAqIFtGb3IgVVNCIHN0aWNr ++cyAoVVNCIGltYWdlKV0oaHR0cDovL2RsLmFtbmVzaWEuYm91bS5vcmcvdGFpbHMvYWxwaGEvdGFp ++bHMtYW1kNjQtNC4xMX5yYzEvdGFpbHMtYW1kNjQtNC4xMX5yYzEuaW1nKSAoWz9dKGh0dHBzOi8v ++dGFpbHMuYm91bS5vcmcvaWtpd2lraS5jZ2k/ZG89Y3JlYXRlJmZyb209bmV3cyUyRnRlc3RfNC4x ++MS1yYzEmcGFnZT10b3JyZW50cyUyRmZpbGVzJTJGdGFpbHMtYW1kNjQtNC4xMX5yYzEuaW1nLnNp ++ZylPcGVuUEdQIHNpZ25hdHVyZSkKCiAgKiBbRm9yIERWRHMgYW5kIHZpcnR1YWwgbWFjaGluZXMg ++KElTTyBpbWFnZSldKGh0dHA6Ly9kbC5hbW5lc2lhLmJvdW0ub3JnL3RhaWxzL2FscGhhL3RhaWxz ++LWFtZDY0LTQuMTF+cmMxL3RhaWxzLWFtZDY0LTQuMTF+cmMxLmlzbykgKFs/XShodHRwczovL3Rh ++aWxzLmJvdW0ub3JnL2lraXdpa2kuY2dpP2RvPWNyZWF0ZSZmcm9tPW5ld3MlMkZ0ZXN0XzQuMTEt ++cmMxJnBhZ2U9dG9ycmVudHMlMkZmaWxlcyUyRnRhaWxzLWFtZDY0LTQuMTF+cmMxLmlzby5zaWcp ++T3BlblBHUCBzaWduYXR1cmUpCgojIyMgQml0VG9ycmVudCBkb3dubG9hZAoKICAqIFtGb3IgVVNC ++IHN0aWNrcyAoVVNCIGltYWdlKV0oaHR0cHM6Ly90YWlscy5ib3VtLm9yZy90b3JyZW50cy9maWxl ++cy90YWlscy1hbWQ2NC00LjExfnJjMS5pbWcudG9ycmVudCkKCiAgKiBbRm9yIERWRHMgYW5kIHZp ++cnR1YWwgbWFjaGluZXMgKElTTyBpbWFnZSldKGh0dHBzOi8vdGFpbHMuYm91bS5vcmcvdG9ycmVu ++dHMvZmlsZXMvdGFpbHMtYW1kNjQtNC4xMX5yYzEuaXNvLnRvcnJlbnQpCgojIyBUbyBpbnN0YWxs ++IFRhaWxzIG9uIGEgbmV3IFVTQiBzdGljawoKRm9sbG93IG91ciBpbnN0YWxsYXRpb24gaW5zdHJ1 ++Y3Rpb25zOgoKICAqIFtJbnN0YWxsIGZyb20gV2luZG93c10oaHR0cHM6Ly90YWlscy5ib3VtLm9y ++Zy9pbnN0YWxsL3dpbi91c2IvaW5kZXguZW4uaHRtbCkKICAqIFtJbnN0YWxsIGZyb20gbWFjT1Nd ++KGh0dHBzOi8vdGFpbHMuYm91bS5vcmcvaW5zdGFsbC9tYWMvdXNiL2luZGV4LmVuLmh0bWwpCiAg ++KiBbSW5zdGFsbCBmcm9tIExpbnV4XShodHRwczovL3RhaWxzLmJvdW0ub3JnL2luc3RhbGwvbGlu ++dXgvdXNiL2luZGV4LmVuLmh0bWwpCgpBbGwgdGhlIGRhdGEgb24gdGhpcyBVU0Igc3RpY2sgd2ls ++bCBiZSBsb3N0LgoKIyBXaGF0J3MgY29taW5nIHVwPwoKVGFpbHMgNC4xMSBpcyBbc2NoZWR1bGVk ++XShodHRwczovL3RhaWxzLmJvdW0ub3JnL2NvbnRyaWJ1dGUvY2FsZW5kYXIvKSBmb3IKU2VwdGVt ++YmVyIDIyLgoKSGF2ZSBhIGxvb2sgYXQgb3VyIFtyb2FkbWFwXShodHRwczovL3RhaWxzLmJvdW0u ++b3JnL2NvbnRyaWJ1dGUvcm9hZG1hcCkgdG8gc2VlCndoZXJlIHdlIGFyZSBoZWFkaW5nIHRvLgoK ++V2UgbmVlZCB5b3VyIGhlbHAgYW5kIHRoZXJlIGFyZSBtYW55IHdheXMgdG8gW2NvbnRyaWJ1dGUg ++dG8KVGFpbHNdKGh0dHBzOi8vdGFpbHMuYm91bS5vcmcvY29udHJpYnV0ZS9pbmRleC5lbi5odG1s ++KQooW2RvbmF0aW5nXShodHRwczovL3RhaWxzLmJvdW0ub3JnL2RvbmF0ZS8/cj00LjExLXJjMSkg ++aXMgb25seSBvbmUgb2YgdGhlbSkuCkNvbWUgW3RhbGsgdG8gdXNdKGh0dHBzOi8vdGFpbHMuYm91 ++bS5vcmcvYWJvdXQvY29udGFjdC9pbmRleC5lbi5odG1sI3RhaWxzLQpkZXYpIQoKVVJMOiA8aHR0 ++cHM6Ly90YWlscy5ib3VtLm9yZy9uZXdzL3Rlc3RfNC4xMS1yYzEvPgoK + + --===============...==-- + +@@ -1951,17 +1951,17 @@ For more details, read our + # Known issues + + * Ledger wallets are not detected by _Electrum_ , with the following error message returned. ([#18080](https://gitlab.tails.boum.org/tails/tails/-/issues/18080)) +- ++ + "No hardware device detected" +- ++ + + Please try to execute the following command in a [root + terminal](https://tails.boum.org/doc/first_steps/welcome_screen/administration_password/index.en.html#open_root_terminal) + before starting _Electrum_ : + +- +- apt update && apt install python3-btchip/testing +- ++ ++ apt update && apt install python3-btchip/testing ++ + + See the list of [long-standing + issues](https://tails.boum.org/support/known_issues/index.en.html). diff --git a/rss2email.spec b/rss2email.spec index 0115404..3adc903 100644 --- a/rss2email.spec +++ b/rss2email.spec @@ -12,6 +12,7 @@ Source1: r2e-migrate Source2: r2e-migrate.1 Source3: README.migrate Patch1: rss2email-3.14-remove-special-bytes.patch +Patch2: rss2email-3.14-fix-tests-pr-279.patch BuildArch: noarch BuildRequires: python3-devel From 021dc800861a2f7bcf13081f1d1d1e69fa65286a Mon Sep 17 00:00:00 2001 From: David Kaufmann Date: Fri, 11 Jul 2025 04:51:53 +0200 Subject: [PATCH 46/49] update changelog --- rss2email.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/rss2email.spec b/rss2email.spec index 3adc903..1724835 100644 --- a/rss2email.spec +++ b/rss2email.spec @@ -1,6 +1,6 @@ Name: rss2email Version: 3.14 -Release: 12%{?dist} +Release: 13%{?dist} Summary: Deliver news from RSS feeds to your SMTP server as text or HTML mail # Automatically converted from old format: GPLv2+ or GPLv3+ - review is highly recommended. @@ -85,6 +85,10 @@ PATH="${PATH}:%{buildroot}%{_bindir}" PYTHONPATH=%{buildroot}%{python3_sitelib} %{_datadir}/zsh/functions/Completion/Unix/_r2e %changelog +* Fri Jul 11 2025 David Kaufmann - 3.14-13 +- Moved to new python3 build system +- Fix indentation in testcases + * Tue Jun 03 2025 Python Maint - 3.14-12 - Rebuilt for Python 3.14 From 507c4f3cfd93feaf131c7d820ea5b2db9f2ec231 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 12:09:14 +0000 Subject: [PATCH 47/49] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- rss2email.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rss2email.spec b/rss2email.spec index 1724835..1e398bd 100644 --- a/rss2email.spec +++ b/rss2email.spec @@ -1,6 +1,6 @@ Name: rss2email Version: 3.14 -Release: 13%{?dist} +Release: 14%{?dist} Summary: Deliver news from RSS feeds to your SMTP server as text or HTML mail # Automatically converted from old format: GPLv2+ or GPLv3+ - review is highly recommended. @@ -85,6 +85,9 @@ PATH="${PATH}:%{buildroot}%{_bindir}" PYTHONPATH=%{buildroot}%{python3_sitelib} %{_datadir}/zsh/functions/Completion/Unix/_r2e %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 3.14-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Fri Jul 11 2025 David Kaufmann - 3.14-13 - Moved to new python3 build system - Fix indentation in testcases From 93b332bd71ca322af2120cc01629aae1964b63c1 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 15 Aug 2025 15:16:25 +0200 Subject: [PATCH 48/49] Rebuilt for Python 3.14.0rc2 bytecode --- rss2email.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rss2email.spec b/rss2email.spec index 1e398bd..fd26145 100644 --- a/rss2email.spec +++ b/rss2email.spec @@ -1,6 +1,6 @@ Name: rss2email Version: 3.14 -Release: 14%{?dist} +Release: 15%{?dist} Summary: Deliver news from RSS feeds to your SMTP server as text or HTML mail # Automatically converted from old format: GPLv2+ or GPLv3+ - review is highly recommended. @@ -85,6 +85,9 @@ PATH="${PATH}:%{buildroot}%{_bindir}" PYTHONPATH=%{buildroot}%{python3_sitelib} %{_datadir}/zsh/functions/Completion/Unix/_r2e %changelog +* Fri Aug 15 2025 Python Maint - 3.14-15 +- Rebuilt for Python 3.14.0rc2 bytecode + * Fri Jul 25 2025 Fedora Release Engineering - 3.14-14 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 57d6c6ebd7d36724ddeb3c30c2fccf45208b8c0f Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 19 Sep 2025 14:54:07 +0200 Subject: [PATCH 49/49] Rebuilt for Python 3.14.0rc3 bytecode --- rss2email.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rss2email.spec b/rss2email.spec index fd26145..6d693b3 100644 --- a/rss2email.spec +++ b/rss2email.spec @@ -1,6 +1,6 @@ Name: rss2email Version: 3.14 -Release: 15%{?dist} +Release: 16%{?dist} Summary: Deliver news from RSS feeds to your SMTP server as text or HTML mail # Automatically converted from old format: GPLv2+ or GPLv3+ - review is highly recommended. @@ -85,6 +85,9 @@ PATH="${PATH}:%{buildroot}%{_bindir}" PYTHONPATH=%{buildroot}%{python3_sitelib} %{_datadir}/zsh/functions/Completion/Unix/_r2e %changelog +* Fri Sep 19 2025 Python Maint - 3.14-16 +- Rebuilt for Python 3.14.0rc3 bytecode + * Fri Aug 15 2025 Python Maint - 3.14-15 - Rebuilt for Python 3.14.0rc2 bytecode