[packages/rss2email] up to 3.12.2

[atler]

commit f3bd4a25217d74477f9794e028c88dcfbb48832b
Author: Jan Palus <atler at pld-linux.org>
Date:   Mon Dec 14 01:44:52 2020 +0100

    up to 3.12.2
    
    - maildir patch upstreamed
    - packaged zsh completion

 rss2email-maildir.patch | 58 -------------------------------------------------
 rss2email.spec          | 29 ++++++++++++++++---------
 2 files changed, 19 insertions(+), 68 deletions(-)
---
diff --git a/rss2email.spec b/rss2email.spec
index 6762b36..e856076 100644
--- a/rss2email.spec
+++ b/rss2email.spec
@@ -1,14 +1,13 @@
 Summary:	A python script that converts RSS/Atom newsfeeds to email
 Name:		rss2email
-Version:	3.9
-Release:	5
+Version:	3.12.2
+Release:	1
 License:	GPL v2+
 Group:		Applications/Networking
 Source0:	https://pypi.python.org/packages/source/r/rss2email/%{name}-%{version}.tar.gz
-Patch0:		%{name}-maildir.patch
-# Source0-md5:	23be063b045be29cc4edc76fe6d141ff
+# Source0-md5:	49599fe910e3211f8858fd8f8abae169
 URL:		https://pypi.python.org/pypi/rss2email/
-BuildRequires:	python3 >= 3.2
+BuildRequires:	python3 >= 1:3.5
 BuildRequires:	rpm-pythonprov
 BuildRequires:	rpmbuild(macros) >= 1.219
 BuildRequires:	sed >= 4.0
@@ -21,9 +20,16 @@ BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 %description
 A python script that converts RSS/Atom newsfeeds to email.
 
+%package -n zsh-completion-rss2email
+Summary:	ZSH completion for rss2email
+Group:		Applications/Shells
+Requires:	%{name} = %{version}-%{release}
+
+%description -n zsh-completion-rss2email
+ZSH completion for rss2email.
+
 %prep
 %setup -q
-%patch0 -p1
 
 %{__sed} -i -e '1s,^#!.*python,#!%{__python3},' r2e
 
@@ -35,17 +41,16 @@ rm -rf $RPM_BUILD_ROOT
 
 %{py3_install}
 
-install -d $RPM_BUILD_ROOT%{_mandir}/man1
+install -d $RPM_BUILD_ROOT{%{_mandir}/man1,%{zsh_compdir}}
 cp -p r2e.1 $RPM_BUILD_ROOT%{_mandir}/man1
-
-%py_postclean
+cp -p completion/r2e.zsh $RPM_BUILD_ROOT%{zsh_compdir}/_r2e
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc AUTHORS CHANGELOG README
+%doc AUTHORS CHANGELOG README.rst
 %attr(755,root,root) %{_bindir}/r2e
 %dir %{py3_sitescriptdir}/rss2email
 %{py3_sitescriptdir}/rss2email/*.py
@@ -53,3 +58,7 @@ rm -rf $RPM_BUILD_ROOT
 %{py3_sitescriptdir}/rss2email/post_process
 %{py3_sitescriptdir}/rss2email-*.egg-info
 %{_mandir}/man1/r2e.1*
+
+%files -n zsh-completion-rss2email
+%defattr(644,root,root,755)
+%{zsh_compdir}/_r2e
diff --git a/rss2email-maildir.patch b/rss2email-maildir.patch
deleted file mode 100644
index a350e3e..0000000
--- a/rss2email-maildir.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-diff --git a/rss2email/config.py b/rss2email/config.py
-index 6b5155f..020b66b 100644
---- a/rss2email/config.py
-+++ b/rss2email/config.py
-@@ -193,6 +193,9 @@ def setup_html2text(self, section='DEFAULT'):
-         ('imap-port', str(143)),
-         ('imap-ssl', str(False)),       # connect to the IMAP server using SSL
-         ('imap-mailbox', 'INBOX'),      # where we should store new messages
-+        # Maildir configuration
-+        ('maildir-path', '~/Maildir'),
-+        ('maildir-mailbox', 'INBOX'),
- 
-         ### Miscellaneous
-         # Verbosity (one of 'error', 'warning', 'info', or 'debug').
-diff --git a/rss2email/email.py b/rss2email/email.py
-index ef798f7..50e4057 100644
---- a/rss2email/email.py
-+++ b/rss2email/email.py
-@@ -31,13 +31,15 @@
- from email.mime.text import MIMEText as _MIMEText
- from email.utils import formataddr as _formataddr
- from email.utils import parseaddr as _parseaddr
-+import mailbox as _mailbox
- import imaplib as _imaplib
- import io as _io
- import smtplib as _smtplib
- import ssl as _ssl
- import subprocess as _subprocess
- import sys as _sys
- import time as _time
-+import os as _os
- 
- from . import LOG as _LOG
- from . import config as _config
-@@ -199,6 +201,14 @@ def imap_send(message, config=None, section='DEFAULT'):
-     finally:
-         imap.logout()
- 
-+def maildir_send(message, config=None, section='DEFAULT'):
-+    if config is None:
-+        config = _config.CONFIG
-+    path = config.get(section, 'maildir-path')
-+    mailbox = config.get(section, 'maildir-mailbox')
-+    maildir = _mailbox.Maildir(_os.path.join(path, mailbox))
-+    maildir.add(message)
-+
- def _decode_header(header):
-     """Decode RFC-2047-encoded headers to Unicode strings
- 
-@@ -340,6 +350,8 @@ def send(sender, recipient, message, config=None, section='DEFAULT'):
-             config=config, section=section)
-     elif protocol == 'imap':
-         imap_send(message=message, config=config, section=section)
-+    elif protocol == 'maildir':
-+        maildir_send(message=message, config=config, section=section)
-     else:
-         sendmail_send(
-             sender=sender, recipient=recipient, message=message,
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/rss2email.git/commitdiff/f3bd4a25217d74477f9794e028c88dcfbb48832b