diff --git a/py2.patch b/py2.patch deleted file mode 100644 index f1cd7c7..0000000 --- a/py2.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff --git a/setup.py b/setup.py -index fdc9b53..5db7014 100755 ---- a/setup.py -+++ b/setup.py -@@ -3,9 +3,11 @@ - from setuptools import setup - - # read the contents of your README file --from os import path --this_directory = path.abspath(path.dirname(__file__)) --with open(path.join(this_directory, 'README.md'), encoding='utf-8') as f: -+import os.path -+import io -+ -+this_directory = os.path.abspath(os.path.dirname(__file__)) -+with io.open(os.path.join(this_directory, 'README.md'), encoding='utf-8') as f: - long_description = f.read() - - setup( diff --git a/python-screenplain.changes b/python-screenplain.changes index 98b1890..7245e00 100644 --- a/python-screenplain.changes +++ b/python-screenplain.changes @@ -3,6 +3,7 @@ Thu Dec 03 21:34:14 UTC 2020 - mcepl@cepl.eu - Update to version 0.9.0+git.1597423678.4e34d1f: * Don't use open, but more compatible io.open +- Remove py2.patch, which has been included upstream. ------------------------------------------------------------------- Fri Aug 14 16:29:32 UTC 2020 - mcepl@cepl.eu diff --git a/python-screenplain.spec b/python-screenplain.spec index 7dabac0..843b625 100644 --- a/python-screenplain.spec +++ b/python-screenplain.spec @@ -32,9 +32,6 @@ URL: http://www.screenplain.com/ # Source: https://files.pythonhosted.org/packages/source/s/screenplain/screenplain-%%{version}.tar.gz # Tarball generated from gh#vilcans/screenplain#62 Source: screenplain-%{version}.tar.gz -# PATCH-FIX-UPSTREAM py2.patch mcepl@suse.com -# Don't use open(), but more compatible io.open() -Patch0: py2.patch BuildRequires: %{python_module pycodestyle} BuildRequires: %{python_module pytest} BuildRequires: %{python_module reportlab}