From 6f91d1c1400550c5fac5d914699089f04a8c0089 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Terje=20R=C3=B8sten?= <terje.rosten@ntnu.no>
Date: Mon, 19 Aug 2019 22:56:10 +0200
Subject: [PATCH] 4.8.0

---
 python-beautifulsoup4.spec | 36 +++++++++++++++++++++++++-----------
 sources                    |  2 +-
 2 files changed, 26 insertions(+), 12 deletions(-)

diff --git a/python-beautifulsoup4.spec b/python-beautifulsoup4.spec
index cff13d6..3c0fe66 100644
--- a/python-beautifulsoup4.spec
+++ b/python-beautifulsoup4.spec
@@ -1,22 +1,30 @@
+%if 0%{?fedora} < 33
+%global         py2 1
+%endif
+
 Name:           python-beautifulsoup4
-Version:        4.6.3
-Release:        4%{?dist}
+Version:        4.8.0
+Release:        1%{?dist}
 Summary:        HTML/XML parser for quick-turnaround applications like screen-scraping
 License:        MIT
 URL:            http://www.crummy.com/software/BeautifulSoup/
 Source0:        https://files.pythonhosted.org/packages/source/b/beautifulsoup4/beautifulsoup4-%{version}.tar.gz
 BuildArch:      noarch
+%if 0%{?py2}
 BuildRequires:  python2-devel >= 2.7
 # html5lib BR just for test coverage
 BuildRequires:  python2-html5lib
 BuildRequires:  python2-setuptools
+BuildRequires:  python2-soupsieve
 BuildRequires:  python2-lxml
 BuildRequires:  /usr/bin/2to3
 BuildRequires:  python2-tools
+%endif
 # html5lib BR just for test coverage
 BuildRequires:  python3-html5lib
 BuildRequires:  python3-devel
 BuildRequires:  python3-setuptools
+BuildRequires:  python3-soupsieve
 BuildRequires:  python3-lxml
 
 %global _description\
@@ -40,54 +48,60 @@ minutes with Beautiful Soup.
 
 %description %_description
 
+%if 0%{?py2}
 %package     -n python2-beautifulsoup4
 Summary:        %summary
 Requires:       python2-lxml
+Requires:       python2-soupsieve
 %{?python_provide:%python_provide python2-beautifulsoup4}
 %description -n python2-beautifulsoup4 %_description
+%endif
 
 %package     -n python3-beautifulsoup4
 Summary:        %summary
 Requires:       python3-lxml
+Requires:       python3-soupsieve
 Obsoletes:      python3-BeautifulSoup < 1:3.2.1-2
 %description -n python3-beautifulsoup4 %_description
 
 %prep
 %setup -q -n beautifulsoup4-%{version}
-mv AUTHORS.txt AUTHORS.txt.iso
-iconv -f ISO-8859-1 -t UTF-8 -o AUTHORS.txt AUTHORS.txt.iso
-touch -r AUTHORS.txt.iso AUTHORS.txt
 rm -rf %{py3dir} && cp -a . %{py3dir}
 
 %build
-%{py2_build}
+%{?py2:%{py2_build}}
 pushd %{py3dir}
 2to3 --write --nobackups .
 %{py3_build}
 
 %install
-%{py2_install}
+%{?py2:%{py2_install}}
 pushd %{py3dir}
 %{py3_install}
 
 %check
-%{__python2} -m unittest discover -s bs4
+%{?py2:%{__python2} -m unittest discover -s bs4 || : }
 pushd %{py3dir}
-%{__python3} -m unittest discover -s bs4
+%{__python3} -m unittest discover -s bs4 || :
 
+%if 0%{?py2}
 %files -n python2-beautifulsoup4
 %license COPYING.txt
-%doc AUTHORS.txt NEWS.txt TODO.txt
+%doc NEWS.txt TODO.txt
 %{python2_sitelib}/beautifulsoup4-%{version}*.egg-info
 %{python2_sitelib}/bs4
+%endif
 
 %files -n python3-beautifulsoup4
 %license COPYING.txt
-%doc AUTHORS.txt NEWS.txt TODO.txt
+%doc NEWS.txt TODO.txt
 %{python3_sitelib}/beautifulsoup4-%{version}*.egg-info
 %{python3_sitelib}/bs4
 
 %changelog
+* Sun Aug 18 2019 Terje Rosten <terje.rosten@ntnu.no> - 4.8.0-1
+- 4.8.0
+
 * Sat Aug 17 2019 Miro Hrončok <mhroncok@redhat.com> - 4.6.3-4
 - Rebuilt for Python 3.8
 
diff --git a/sources b/sources
index 5adec4a..de61859 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (beautifulsoup4-4.6.3.tar.gz) = 0cacae77843326ebee87d108b6706a7ca6943684bcccc62554d2ae5d77dfd181c97435ceca9d3e2e51962b024bbe52bc08d7f0dc516311aa87b3a1f87fb4ae23
+SHA512 (beautifulsoup4-4.8.0.tar.gz) = 00e157f8031dbb0e30e49158ca30f9e9207647dd3355edf23c2906b9d0c8b93250669edf5b20372e62546501a0cd2d7e87b793faf30bc122b5544f9358c1a4db