Accepting request 834371 from home:benoit_monin:branches:devel:languages:python

- update to version 6.0.0
- build the package only for python3
- drop py37.patch: fixed upstream
- drop non-ascii-entity-hiding.patch: fixed upstream
- drop catch-gzip-error.patch: fixed upstream
- fix build requires for chardet and sgmllib3k
- remove chmod on all source files: fixed upstream
- drop moving around source files: reworked upstream
- run the tests as described by upstream
- fix the list of packaged files

OBS-URL: https://build.opensuse.org/request/show/834371
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-feedparser?expand=0&rev=42

python-feedparser.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package python-feedparser
 #
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,35 +16,25 @@
 #
 
 
+%define skip_python2 1
 %{?!python_module:%define python_module() python-%{**} python3-%{**}}
 Name:           python-feedparser
-Version:        5.2.1
+Version:        6.0.0
 Release:        0
 Summary:        Universal Feed Parser Module for Python
 License:        BSD-2-Clause
 Group:          Development/Libraries/Python
 URL:            https://github.com/kurtmckee/feedparser
-Source:         https://files.pythonhosted.org/packages/source/f/feedparser/feedparser-%{version}.tar.bz2
-Patch0:         py37.patch
-Patch1:         non-ascii-entity-hiding.patch
-# Similar to https://github.com/kurtmckee/feedparser/commit/b3d9463.patch
-# However the "gets overwritten as xml.sax.SAXException later" is not
-# happening in version 5.2.1.
-Patch2:         catch-gzip-error.patch
+Source:         https://files.pythonhosted.org/packages/source/f/feedparser/feedparser-%{version}.tar.gz
+BuildRequires:  %{python_module chardet}
 BuildRequires:  %{python_module setuptools}
+BuildRequires:  %{python_module sgmllib3k}
 BuildRequires:  %{python_module xml}
 BuildRequires:  fdupes
 BuildRequires:  python-rpm-macros
-BuildRequires:  python3-sgmllib3k
-# Tests fail in Python 2 and 3 when chardet is installed
-#BuildRequires:  python3-chardet
 Requires:       python-xml
-# chardet is an optional dependency, but some tests fail when it is present
 Recommends:     python-chardet
-%ifpython3
-# If sgmllib is not available, the parser can fail with undefined local variable
-Requires:       python3-sgmllib3k
-%endif
+Requires:       python-sgmllib3k
 BuildArch:      noarch
 %python_subpackages
 
@@ -54,17 +44,6 @@ A universal feed parser module for Python that handles RSS 0.9x, RSS 1.0, RSS
 
 %prep
 %setup -q -n feedparser-%{version}
-%autopatch -p1
-
-find . -type f -exec chmod 0644 {} \;  # 5.2.1 had executable bit set on almost all files
-
-# In version 5.2.1, it contains only test data, so move it out of install
-mv feedparser/tests .
-
-# Move the test module out of the runtime install, into top level directory
-# so it can find the test data, and manually run 2to3.
-python3 -m lib2to3 -w -n -o . --add-suffix=-%{python3_bin_suffix} --no-diffs feedparser/feedparsertest.py
-mv feedparser/feedparsertest.py feedparsertest.py-%{python2_bin_suffix}
 
 %build
 %python_build
@@ -75,17 +54,13 @@ mv feedparser/feedparsertest.py feedparsertest.py-%{python2_bin_suffix}
 
 %check
 %{python_expand export PYTHONPATH=%{buildroot}%{$python_sitelib}:${PWD}
-cp feedparsertest.py-%{$python_bin_suffix} feedparsertest.py
-$python -c 'import feedparser; assert feedparser._XML_AVAILABLE == 1; assert feedparser._SGML_AVAILABLE == 1'
-$python -c 'import feedparsertest; assert feedparsertest._UTF32_AVAILABLE == 1'
-$python feedparsertest.py
+$python tests/runtests.py
 }
 
 %files %{python_files}
 %license LICENSE
 %doc NEWS README.rst
-%{python_sitelib}/feedparser.py*
-%pycache_only %{python_sitelib}/__pycache__/feedparser.*.py*
-%{python_sitelib}/feedparser-%{version}-py*.egg-info
+%{python_sitelib}/feedparser/
+%{python_sitelib}/feedparser-%{version}-py%{python_version}.egg-info
 
 %changelog