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