Files
rss2email/dynamic-version-number.patch

166 lines
6.0 KiB
Diff
Raw Permalink Normal View History

Accepting request 1289539 from home:mcepl - Switch the SPEC file from the single-spec one to the regular one (rss2email is not consumed by any other package, AFAIK, so multiple binary packages are not needed). - Add dynamic-version-number.patch to switch incorrect duality of pyproject.toml/setup.py to the regular PEP 621 setup.cfg (gh#rss2email/rss2email!284). - Add 213-http-header-config.patch to allow adding a custom HTTP header to the request (required for some websites, e.g., gh#rss2email/rss2email#273; the code is from gh#rss2email/rss2email!213). - Added patch: * fix-tests.patch + upstream patch to replace a "c2 a0" utf-8 sequence in test feed with a space. This caused html2text >=2024.2.25 to produce a double space and break the tests. - update to 3.14: * New `digest-type` configuration adds optional more widely supported `multipart/mixed` format * New argument `--only-new` on the `add` command to ignore entries in feed when added, so only new entries will be sent. * Fix exception when parsing a feed with a linebreak in its title * Add a new `subject-format` setting, customise the subject line * Removed '$' interpolation in config file to allow URLs containing dollar signs. Interpolation was not fully supported, and the placeholder would not survive a second save. Config files with ${...} placeholders will need to be manually edited after upgrading, or a save forced by adding and removing a fake feed before upgrading. * Fix default HTTP User-Agent to use `rss2email` instead of `feedparser`, and fix `user-agent` setting to consistently apply to both outgoing emails and HTTP requests. This introduces a couple of potentially breaking changes: o Configurations that came to rely on the `feedparser` UA string should adjust to the updated UA string going forward. o Configurations that came to rely on the unintended behaviour, that configuring the User-Agent header in emails does not affect HTTP requests, should use a custom `post-process` hook instead. - No longer skip python310, feedparser is now available. - Skip python310: no sgmlli3k and thus no feedparser for Python3.10 - update to 3.13.1: * Fix crash on html-mail entries with no URL - specfile: * removed patch rss2email-3.12.2-feedparser-6.patch (fixed upstream) * fix requirements - update to version 13.3: * Switch to feedparser 6 * Switch to poetry instead of requirements.txt * Make the `verbose` flag in the config file actually have an impact, and have it default to `info * Improve log messages * Remove documentation of `smtp-ssl-protocol` as this option was dropped in 2016 * Stop forging SMTP and sendmail envelope sender (#134) * Add sendmail_config option * Upgraded to feedparser v6.0 (https://github.com/kurtmckee/feedparser/) * Drop support for Python 3.5, add support for Python 3.9 * Log sendmail output * Support multipart/alternative emails with both HTML and plain text parts with option `multipart-html` * Add inline-links option, allowing links to be sent to the bottom of the paragraph * Add wrap-links option, preventing links from be wrapped over multiple lines * Stop looking in $XDG_DATA_DIRS for the database, and only look in $XDG_DATA_HOME * Warnings about HTTP content-type being unexpected now properly display * Make the proxy parameter also affect https connections * Add a --clean argument on the run command to reduce the database size * Set body element attribute dir=auto in HTML mail * Store the lock file in XDG_RUNTIME_DIR instead of /tmp - specfile: * update patch * add __pycache__ files * update to newer python macros * skip python2 - update to version 3.12.3: * *Improve log messages * Remove documentation of `smtp-ssl-protocol` as this option was dropped in 2016 * Stop forging SMTP and sendmail envelope sender (#134) * Add sendmail_config option * Fix verbose configuration setting * Upgraded to feedparser v6.0 (https://github.com/kurtmckee/feedparser/) * Drop support for Python 3.5 * Log sendmail output * Support multipart/alternative emails with both HTML and plain text parts with option `multipart-html` * Add inline-links option, allowing links to be sent to the bottom of the * paragraph * Add wrap-links option, preventing links from be wrapped over multiple lines * Stop looking in $XDG_DATA_DIRS for the database, and only look in * $XDG_DATA_HOME * Warnings about HTTP content-type being unexpected now properly display * Make the proxy parameter also affect https connections * Add a --clean argument on the run command to reduce the database size - fix failure with Feedparser 6 [boo#1178085] adding rss2email-3.12.2-feedparser-6.patch from upstream - clean up spec file to current python Macros, run tests - update to version 3.12.2: * Fix bug `AttributeError: 'NoneType' object has no attribute 'close'` (#126) - changes from version 3.12.1 : * Fix calling opmlexport without arguments - changes from version 3.12: * Drop support for EOL Python 3.4, add support for Python 3.8 * Add List_ID and List_Post headers to the generated emails * Add a new `reply-changes` setting * Improve configurability of text wrapping for the emails * Use `platform.node()` instead of "dev.null.invalid" in "Message-ID" header * Improve locking support for when multiple rss2email instances are run in parallel * Fix handling of __VERSION__ and __URL__ in user-agent strings * Fix opmlexport - update to version 3.11: * Add new `user-agent` attribute for configuring email User-Agent - update to version 3.10: * Catch and warn for invalid Content-Types * Add a manually extracted list of config options to r2e.1 * Add a redirect post-process module * Follow symlinks of datafiles * Add zsh completion * Add support for maildir * Fix `r2e new` overwriting an existing config * Add new `feed-name` and `feed-url` attributes for the `name-format` setting * Change logging format * Allow multiple SMTP recipients * Fix SMTP security issues * Fix test suite * Drop support for Python 3.2 and 3.3 * Remove `__contributors__` from the `rss2email` module * Stop using deprecated `html2text.unescape` * Fix locking issues when data file is on NFS * Add `same-server-fetch-interval` setting for rate-limiting fetches to a server * Update setup.py to setuptools - switch requires from outdated python3-distribute to setuptools - update to v3.9 (2014-09-01) * Catch and error out if a user adds a feed with a duplicate name. * Split sender into both sendmail's -F and -f. * Fix an error with SMTPConnectionError inheritance order ("does not take keyword arguments"). * Add a new `smtp-ssl-protocol` setting, to select acceptable protocols for SMTP connections. * Fix non-compliant User-Agent header for HTTP/1.1. * Fix an error in the NoToEmailAddress invocation. * Add a new 'trust-link' setting, to prefer the 'link' attribute over the 'id' attribute for identifying entries. - license update: GPL-2.0 or GPL-3.0 This is a dual license of either GPL-2.0 or GPL-3.0. It does not allow updating to beyond GPL-3.0 - updated to v3.8 (2014-01-18) * Sluggify feed names on opmlimport. * Allow Unicode letters and digits in feed names, instead of just ASCII lettters and digits. - updated to version 3.7 * Fix fallback for titles that contain malformed HTML [1]. * Fix atomic saves to avoid garbling config and data files if the disk is full [2]. Reported by Etienne Millon [3,4]. * Convert the `friendly-name` boolean to the new `name-format` setting. This allow users to customize how the friendly name is constructed [5]. Requested by Joey Hess [6,7]. * Demote guessed encodings logs from 'error' to 'warning' [8]. Patch by J. Lewis Muir [9,10]. [1]: http://thread.gmane.org/gmane.mail.rss2email/183 [2]: http://thread.gmane.org/gmane.mail.rss2email/182 [3]: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=724671 [4]: https://github.com/wking/rss2email/issues/22 [5]: http://thread.gmane.org/gmane.mail.rss2email/177 [6]: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=722009 [7]: https://github.com/wking/rss2email/issues/19 [8]: http://thread.gmane.org/gmane.mail.rss2email/178 [9]: https://github.com/wking/rss2email/pull/18 [10]: https://github.com/wking/rss2email/pull/20 - updated to version 3.6 Changes since 3.5 (from CHANGELOG) v3.6 (2013-09-09) * Fix missing port argument for IMAPAuthenticationError. * Fix `<div id="entry>` syntax error in HTML mail. - updated to version 3.5 Changes since 3.4 (from CHANGELOG) v3.5 (2013-06-05) * Added digest generation and post-processing hooks. * Fix html2text configuration (ignored since 2012-10-04). * Fix opmlexport crash due to orphaned feed data. * Use feed names in OPML 'text' attributes. - updated to version 3.4 Changes since 3.3 (from CHANGELOG) v3.4 (2013-05-14) * Added post-processing hooks for user-specified message manipulation. * Added settings for IMAP delivery. The old `use-smtp` boolean has been replaced by a new `email-protocol` setting. Non-IMAP users should adjust their configuration to set `email-protocol` to either `sendmail` or `smtp`. - updated to version 3.3 Changes since 3.2 (from CHANGELOG): v3.3 (2013-04-13) * Fix SMTP message submission logic. * Fix error inheritence (super() calls). * Convert html2text parsing errors to `ProcessingError`s. * Cleanup html2text error handling. * Drop Google Reader rel-via manipulation. * Drop the wrapping <table> elements from HTML mail - updated to verson 3.2 Changes since 3.1 (from the CHANGELOG): * Use extended interpolation in configuration files, to allow percent signs (%). * Added .as_string() fallback to email flattening (only used if `use-smtp = False` and `use-8bit = True`). * Added sendmail configuration option. Change this if you want to use an alternative, sendmail-compatible mailer. - added some missing dependencies: python3, python3-xml, python3-feedparser, python3-html2text - update to version 3.1, use tar.gz instead of zip - fixed spec file according to comments on pull request * removed double install of doc files * don't zip man page - initial version from current git (933dc46f6af3fb5473da93e02c9a90c1e4b4ae5f) OBS-URL: https://build.opensuse.org/request/show/1289539 OBS-URL: https://build.opensuse.org/package/show/server:mail/rss2email?expand=0&rev=37
2025-07-25 13:48:32 +00:00
---
pyproject.toml | 21 ----------------
setup.cfg | 48 ++++++++++++++++++++++++++++++++++++++
setup.py | 71 +--------------------------------------------------------
3 files changed, 50 insertions(+), 90 deletions(-)
Index: rss2email-3.14/pyproject.toml
===================================================================
--- rss2email-3.14.orig/pyproject.toml 2022-08-26 16:54:21.000000000 +0200
+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -1,21 +0,0 @@
-[tool.poetry]
-name = "rss2email"
-version = "3.12.2"
-description = "Forward RSS feeds to your email address"
-authors = ["Your Name <you@example.com>"]
-license = "GPL-2.0-only"
-
-[tool.poetry.dependencies]
-python = "^3.6"
-feedparser = ">=6.0.5"
-html2text = ">=2020.1.16"
-
-[tool.poetry.dev-dependencies]
-update-copyright = ">=0.6.2"
-
-[build-system]
-requires = ["poetry>=0.12"]
-build-backend = "poetry.masonry.api"
-
-[tool.poetry.scripts]
-r2e = "rss2email.main:run"
Index: rss2email-3.14/setup.cfg
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ rss2email-3.14/setup.cfg 2025-07-01 15:01:34.861755273 +0200
@@ -0,0 +1,48 @@
+[metadata]
+name = rss2email
+version = attr: rss2email.__version__
+description = A python script that converts RSS/Atom newsfeeds to email
+long_description = file: README.rst
+author = Adam Mokhtari, W. Trevor King, Amir Yalon
+author_email = 2553423+uutari@users.noreply.github.com, wking@tremily.us, git@please.nospammail.net
+maintainer = Adam Mokhtari
+maintainer_email = 2553423+uutari@users.noreply.github.com
+license = GPL-2.0-or-later
+keywords = rss, atom, feed, email
+classifiers =
+ Development Status :: 5 - Production/Stable
+ Environment :: Console
+ Intended Audience :: End Users/Desktop
+ Operating System :: OS Independent
+ Programming Language :: Python
+ Programming Language :: Python :: 3
+ Programming Language :: Python :: 3.6
+ Programming Language :: Python :: 3.7
+ Programming Language :: Python :: 3.8
+ Programming Language :: Python :: 3.9
+ Programming Language :: Python :: 3.10
+ Programming Language :: Python :: 3.11
+ Topic :: Communications :: Email
+ Topic :: Software Development :: Libraries :: Python Modules
+project_urls =
+ Homepage = https://github.com/rss2email/rss2email
+ Repository = https://github.com/rss2email/rss2email
+ Bug Tracker = https://github.com/rss2email/rss2email/issues
+
+[options]
+python_requires = >=3.6
+install_requires =
+ feedparser>=6.0.5
+ html2text>=2020.1.16
+packages = find:
+
+[options.extras_require]
+dev =
+ update-copyright>=0.6.2
+
+[options.entry_points]
+console_scripts =
+ r2e = rss2email.main:run
+
+[options.packages.find]
+where = .
\ No newline at end of file
Index: rss2email-3.14/setup.py
===================================================================
--- rss2email-3.14.orig/setup.py 2022-08-26 16:54:21.000000000 +0200
+++ rss2email-3.14/setup.py 2025-07-01 14:58:57.349589201 +0200
@@ -1,72 +1,5 @@
-# Copyright (C) 2012-2021 Adam Mokhtari <2553423+uutari@users.noreply.github.com>
-# Amir Yalon <git@please.nospammail.net>
-# Andrey Zelenchuk <azelenchuk@plesk.com>
-# Arun Persaud <apersaud@lbl.gov>
-# Léo Gaspard <leo@gaspard.io>
-# Markus Unterwaditzer <markus@unterwaditzer.net>
-# Profpatsch <mail@profpatsch.de>
-# Steven Siloti <ssiloti@gmail.com>
-# W. Trevor King <wking@tremily.us>
-# auouymous <au@qzx.com>
-#
-# This file is part of rss2email.
-#
-# rss2email is free software: you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation, either version 2 of the License, or (at your option) version 3 of
-# the License.
-#
-# rss2email is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-# A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along with
-# rss2email. If not, see <http://www.gnu.org/licenses/>.
+#!/usr/bin/python3
-"A python script that converts RSS/Atom newsfeeds to email"
-
-import codecs as _codecs
-import os.path as _os_path
import setuptools
-from rss2email import __version__, __url__, __author__, __email__
-
-
-_this_dir = _os_path.dirname(__file__)
-
-setuptools.setup(
- name='rss2email',
- version=__version__,
- maintainer=__author__,
- maintainer_email=__email__,
- url=__url__,
- download_url='{}/archive/v{}.tar.gz'.format(__url__, __version__),
- license='GNU General Public License (GPL)',
- platforms=['all'],
- description=__doc__,
- long_description=_codecs.open(
- _os_path.join(_this_dir, 'README.rst'), 'r', encoding='utf-8').read(),
- classifiers=[
- 'Development Status :: 5 - Production/Stable',
- 'Environment :: Console',
- 'Intended Audience :: End Users/Desktop',
- 'Operating System :: OS Independent',
- 'License :: OSI Approved :: GNU General Public License (GPL)',
- 'License :: OSI Approved :: GNU General Public License v2 (GPLv2)',
- 'License :: OSI Approved :: GNU General Public License v3 (GPLv3)',
- 'Programming Language :: Python',
- 'Programming Language :: Python :: 3',
- 'Programming Language :: Python :: 3.6',
- 'Programming Language :: Python :: 3.7',
- 'Programming Language :: Python :: 3.8',
- 'Topic :: Communications :: Email',
- 'Topic :: Software Development :: Libraries :: Python Modules',
- ],
- packages=['rss2email', 'rss2email.post_process'],
- scripts=['r2e'],
- provides=['rss2email'],
- install_requires=[
- 'feedparser>=6.0.5',
- 'html2text>=2020.1.16',
- ],
- )
+setuptools.setup()