From 2bcfd6f6edc6e6e6744cf92570f0d9c0603f53dc Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 15 Jul 2012 02:41:02 +0000 Subject: [PATCH 01/74] Initial setup of the repo --- .gitignore | 0 sources | 0 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 .gitignore create mode 100644 sources diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..e69de29 diff --git a/sources b/sources new file mode 100644 index 0000000..e69de29 From 4b0ce86dc2eae5ede708058c871e920debcf2806 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Terje=20R=F8sten?= Date: Mon, 16 Jul 2012 08:53:02 +0200 Subject: [PATCH 02/74] Importing --- .gitignore | 1 + python-beautifulsoup4.spec | 142 +++++++++++++++++++++++++++++++++++++ sources | 1 + 3 files changed, 144 insertions(+) create mode 100644 python-beautifulsoup4.spec diff --git a/.gitignore b/.gitignore index e69de29..c497346 100644 --- a/.gitignore +++ b/.gitignore @@ -0,0 +1 @@ +/beautifulsoup4-4.1.1.tar.gz diff --git a/python-beautifulsoup4.spec b/python-beautifulsoup4.spec new file mode 100644 index 0000000..5578f52 --- /dev/null +++ b/python-beautifulsoup4.spec @@ -0,0 +1,142 @@ +%global with_python3 1 +%global oname beautifulsoup4 + +Name: python-beautifulsoup4 +Version: 4.1.1 +Release: 2%{?dist} +Summary: HTML/XML parser for quick-turnaround applications like screen-scraping +Group: Development/Languages +License: MIT +URL: http://www.crummy.com/software/BeautifulSoup/ +Source0: http://www.crummy.com/software/BeautifulSoup/bs4/download/4.1/beautifulsoup4-%{version}.tar.gz +BuildArch: noarch +BuildRequires: python-devel +BuildRequires: python-html5lib +BuildRequires: python-lxml +BuildRequires: python-devel +BuildRequires: python-setuptools +Requires: python-html5lib +Requires: python-lxml +%if 0%{?with_python3} +BuildRequires: python-tools +BuildRequires: python3-html5lib +BuildRequires: python3-lxml +BuildRequires: python3-devel +BuildRequires: python3-setuptools +Requires: python3-html5lib +Requires: python3-lxml +%endif + +%description +Beautiful Soup is a Python HTML/XML parser designed for quick +turnaround projects like screen-scraping. Three features make it +powerful: + +Beautiful Soup won't choke if you give it bad markup. + +Beautiful Soup provides a few simple methods and Pythonic idioms for +navigating, searching, and modifying a parse tree. + +Beautiful Soup automatically converts incoming documents to Unicode +and outgoing documents to UTF-8. + +Beautiful Soup parses anything you give it. + +Valuable data that was once locked up in poorly-designed websites is +now within your reach. Projects that would have taken hours take only +minutes with Beautiful Soup. + +%if 0%{?with_python3} +%package -n python3-beautifulsoup4 +Summary: HTML/XML parser for quick-turnaround applications like screen-scraping +Group: Development/Languages +Obsoletes: python3-BeautifulSoup < 1:3.2.1-2 + +%description -n python3-beautifulsoup4 +Beautiful Soup is a Python HTML/XML parser designed for quick +turnaround projects like screen-scraping. Three features make it +powerful: + +Beautiful Soup won't choke if you give it bad markup. + +Beautiful Soup provides a few simple methods and Pythonic idioms for +navigating, searching, and modifying a parse tree. + +Beautiful Soup automatically converts incoming documents to Unicode +and outgoing documents to UTF-8. + +Beautiful Soup parses anything you give it. + +Valuable data that was once locked up in poorly-designed websites is +now within your reach. Projects that would have taken hours take only +minutes with Beautiful Soup. + +This is the Python 3 build of Beautiful Soup. + +%endif # if with_python3 + +%prep +%setup -q -n %{oname}-%{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 + +%if 0%{?with_python3} +rm -rf %{py3dir} +cp -a . %{py3dir} +%endif + +%build +%{__python} setup.py build + +%if 0%{?with_python3} +pushd %{py3dir} +2to3 --write --nobackups . +%{__python3} setup.py build +%endif + +%install +%{__python} setup.py install -O1 --skip-build --root %{buildroot} + +%if 0%{?with_python3} +pushd %{py3dir} +%{__python3} setup.py install -O1 --skip-build --root %{buildroot} +%endif + +%check +%{__python} -m unittest discover -s bs4 + +%if 0%{?with_python3} +pushd %{py3dir} +# Some tests fails +%{__python3} -m unittest discover -s bs4 || : +%endif + +%files +%doc *.txt +%{python_sitelib}/beautifulsoup4-%{version}*.egg-info +%{python_sitelib}/bs4 + +%if 0%{?with_python3} +%files -n python3-beautifulsoup4 +%doc *.txt +%{python3_sitelib}/beautifulsoup4-%{version}*.egg-info +%{python3_sitelib}/bs4 +%endif + +%changelog +* Tue Jul 10 2012 Terje Rosten - 4.1.1-2 +- License is MIT +- Remove old cruft +- Fix obsolete + +* Mon Jul 09 2012 Terje Rosten - 4.1.1-1 +- 4.1.1 +- Obsolete the old py3-bs4 from bs3 package + +* Mon May 28 2012 Terje Rosten - 4.0.5-1 +- 4.0.5 + +* Sat Mar 24 2012 Terje Rosten - 4.0.1-1 +- initial package based on python-BeautifulSoup. + diff --git a/sources b/sources index e69de29..ca48a49 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +fccee58b4d914fb489385d672fe89f43 beautifulsoup4-4.1.1.tar.gz From 169f6ee1e23fca00e33b2f36e309a36642774b28 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 21 Jul 2012 00:07:59 -0500 Subject: [PATCH 03/74] - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild --- python-beautifulsoup4.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-beautifulsoup4.spec b/python-beautifulsoup4.spec index 5578f52..550bacd 100644 --- a/python-beautifulsoup4.spec +++ b/python-beautifulsoup4.spec @@ -3,7 +3,7 @@ Name: python-beautifulsoup4 Version: 4.1.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: HTML/XML parser for quick-turnaround applications like screen-scraping Group: Development/Languages License: MIT @@ -125,6 +125,9 @@ pushd %{py3dir} %endif %changelog +* Sat Jul 21 2012 Fedora Release Engineering - 4.1.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + * Tue Jul 10 2012 Terje Rosten - 4.1.1-2 - License is MIT - Remove old cruft From 1d970af2e87e7dd10afad5e403aad1837332fea9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Terje=20R=F8sten?= Date: Sun, 22 Jul 2012 20:00:55 +0200 Subject: [PATCH 04/74] Move python3 req to sub package --- python-beautifulsoup4.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/python-beautifulsoup4.spec b/python-beautifulsoup4.spec index 550bacd..6c124b9 100644 --- a/python-beautifulsoup4.spec +++ b/python-beautifulsoup4.spec @@ -3,7 +3,7 @@ Name: python-beautifulsoup4 Version: 4.1.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: HTML/XML parser for quick-turnaround applications like screen-scraping Group: Development/Languages License: MIT @@ -23,8 +23,6 @@ BuildRequires: python3-html5lib BuildRequires: python3-lxml BuildRequires: python3-devel BuildRequires: python3-setuptools -Requires: python3-html5lib -Requires: python3-lxml %endif %description @@ -50,6 +48,8 @@ minutes with Beautiful Soup. %package -n python3-beautifulsoup4 Summary: HTML/XML parser for quick-turnaround applications like screen-scraping Group: Development/Languages +Requires: python3-html5lib +Requires: python3-lxml Obsoletes: python3-BeautifulSoup < 1:3.2.1-2 %description -n python3-beautifulsoup4 @@ -125,6 +125,9 @@ pushd %{py3dir} %endif %changelog +* Sun Jul 22 2012 Terje Rosten - 4.1.1-4 +- Move python3 req to sub package + * Sat Jul 21 2012 Fedora Release Engineering - 4.1.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild From 5ded84ec230900d31219ccf96bbc909cb1630919 Mon Sep 17 00:00:00 2001 From: David Malcolm Date: Sat, 4 Aug 2012 06:38:28 -0400 Subject: [PATCH 05/74] rebuild for https://fedoraproject.org/wiki/Features/Python_3.3 --- python-beautifulsoup4.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-beautifulsoup4.spec b/python-beautifulsoup4.spec index 6c124b9..83b3b19 100644 --- a/python-beautifulsoup4.spec +++ b/python-beautifulsoup4.spec @@ -3,7 +3,7 @@ Name: python-beautifulsoup4 Version: 4.1.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: HTML/XML parser for quick-turnaround applications like screen-scraping Group: Development/Languages License: MIT @@ -125,6 +125,9 @@ pushd %{py3dir} %endif %changelog +* Sat Aug 04 2012 David Malcolm - 4.1.1-5 +- rebuild for https://fedoraproject.org/wiki/Features/Python_3.3 + * Sun Jul 22 2012 Terje Rosten - 4.1.1-4 - Move python3 req to sub package From 5b392d012150d92a53017cb58649f1dfba60469b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Terje=20R=F8sten?= Date: Mon, 3 Dec 2012 14:44:37 +0100 Subject: [PATCH 06/74] 4.1.3 --- .gitignore | 1 + python-beautifulsoup4.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index c497346..5590f37 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /beautifulsoup4-4.1.1.tar.gz +/beautifulsoup4-4.1.3.tar.gz diff --git a/python-beautifulsoup4.spec b/python-beautifulsoup4.spec index 83b3b19..0bb8eb0 100644 --- a/python-beautifulsoup4.spec +++ b/python-beautifulsoup4.spec @@ -2,13 +2,13 @@ %global oname beautifulsoup4 Name: python-beautifulsoup4 -Version: 4.1.1 -Release: 5%{?dist} +Version: 4.1.3 +Release: 1%{?dist} Summary: HTML/XML parser for quick-turnaround applications like screen-scraping Group: Development/Languages License: MIT URL: http://www.crummy.com/software/BeautifulSoup/ -Source0: http://www.crummy.com/software/BeautifulSoup/bs4/download/4.1/beautifulsoup4-%{version}.tar.gz +Source0: http://www.crummy.com/software/BeautifulSoup/bs4/download/beautifulsoup4-%{version}.tar.gz BuildArch: noarch BuildRequires: python-devel BuildRequires: python-html5lib @@ -125,6 +125,9 @@ pushd %{py3dir} %endif %changelog +* Mon Dec 03 2012 Terje Rosten - 4.1.3-1 +- 4.1.3 + * Sat Aug 04 2012 David Malcolm - 4.1.1-5 - rebuild for https://fedoraproject.org/wiki/Features/Python_3.3 diff --git a/sources b/sources index ca48a49..707c839 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -fccee58b4d914fb489385d672fe89f43 beautifulsoup4-4.1.1.tar.gz +5aece3c0b8a080658155958111fa2fa9 beautifulsoup4-4.1.3.tar.gz From 3e6bc10e07063be2e00f8d4f29ace5e7b9ab82ad Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 14 Feb 2013 13:01:45 -0600 Subject: [PATCH 07/74] - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild --- python-beautifulsoup4.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-beautifulsoup4.spec b/python-beautifulsoup4.spec index 0bb8eb0..c3f7091 100644 --- a/python-beautifulsoup4.spec +++ b/python-beautifulsoup4.spec @@ -3,7 +3,7 @@ Name: python-beautifulsoup4 Version: 4.1.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: HTML/XML parser for quick-turnaround applications like screen-scraping Group: Development/Languages License: MIT @@ -125,6 +125,9 @@ pushd %{py3dir} %endif %changelog +* Thu Feb 14 2013 Fedora Release Engineering - 4.1.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + * Mon Dec 03 2012 Terje Rosten - 4.1.3-1 - 4.1.3 From b1931e0f6de0511bf62cc5bf5a00ee955f9b0c68 Mon Sep 17 00:00:00 2001 From: Ralph Bean Date: Tue, 19 Mar 2013 16:58:53 -0400 Subject: [PATCH 08/74] Get tests to pass on el6. --- python-beautifulsoup4.spec | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/python-beautifulsoup4.spec b/python-beautifulsoup4.spec index c3f7091..8624746 100644 --- a/python-beautifulsoup4.spec +++ b/python-beautifulsoup4.spec @@ -1,9 +1,11 @@ +%if 0%{?fedora} > 1 %global with_python3 1 +%endif %global oname beautifulsoup4 Name: python-beautifulsoup4 Version: 4.1.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: HTML/XML parser for quick-turnaround applications like screen-scraping Group: Development/Languages License: MIT @@ -12,11 +14,20 @@ Source0: http://www.crummy.com/software/BeautifulSoup/bs4/download/beauti BuildArch: noarch BuildRequires: python-devel BuildRequires: python-html5lib -BuildRequires: python-lxml BuildRequires: python-devel BuildRequires: python-setuptools +%if 0%{?rhel} && 0%{?rhel} <= 6 +BuildRequires: python-unittest2 +BuildRequires: python-nose +%endif + Requires: python-html5lib + +%if 0%{?fedora} +BuildRequires: python-lxml Requires: python-lxml +%endif + %if 0%{?with_python3} BuildRequires: python-tools BuildRequires: python3-html5lib @@ -104,7 +115,11 @@ pushd %{py3dir} %endif %check +%if 0%{?rhel} && 0%{?rhel} <= 6 +PYTHONPATH=$(pwd) nosetests +%else %{__python} -m unittest discover -s bs4 +%endif %if 0%{?with_python3} pushd %{py3dir} @@ -125,6 +140,10 @@ pushd %{py3dir} %endif %changelog +* Tue Mar 19 2013 Ralph Bean - 4.1.3-3 +- Don't include python-lxml for el6. +- Conditionalize python3 support. + * Thu Feb 14 2013 Fedora Release Engineering - 4.1.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild From 9ec42eb0d556f57509041883ca910cdbc8a04b43 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Terje=20R=C3=B8sten?= Date: Mon, 27 May 2013 10:59:29 +0200 Subject: [PATCH 09/74] 4.2.0 --- .gitignore | 1 + python-beautifulsoup4.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 5590f37..e5e8779 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /beautifulsoup4-4.1.1.tar.gz /beautifulsoup4-4.1.3.tar.gz +/beautifulsoup4-4.2.0.tar.gz diff --git a/python-beautifulsoup4.spec b/python-beautifulsoup4.spec index 8624746..be356cb 100644 --- a/python-beautifulsoup4.spec +++ b/python-beautifulsoup4.spec @@ -4,13 +4,13 @@ %global oname beautifulsoup4 Name: python-beautifulsoup4 -Version: 4.1.3 -Release: 3%{?dist} +Version: 4.2.0 +Release: 1%{?dist} Summary: HTML/XML parser for quick-turnaround applications like screen-scraping Group: Development/Languages License: MIT URL: http://www.crummy.com/software/BeautifulSoup/ -Source0: http://www.crummy.com/software/BeautifulSoup/bs4/download/beautifulsoup4-%{version}.tar.gz +Source0: http://www.crummy.com/software/BeautifulSoup/bs4/download/4.2/beautifulsoup4-%{version}.tar.gz BuildArch: noarch BuildRequires: python-devel BuildRequires: python-html5lib @@ -140,6 +140,9 @@ pushd %{py3dir} %endif %changelog +* Mon Jun 27 2013 Terje Rosten - 4.2.0-1 +- 4.2.0 + * Tue Mar 19 2013 Ralph Bean - 4.1.3-3 - Don't include python-lxml for el6. - Conditionalize python3 support. diff --git a/sources b/sources index 707c839..e96985d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5aece3c0b8a080658155958111fa2fa9 beautifulsoup4-4.1.3.tar.gz +3e709c68b7705b49635dca0c551a4362 beautifulsoup4-4.2.0.tar.gz From ac5f43a6b6061e4f65e29ddd6d56a1236fab02cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Terje=20R=C3=B8sten?= Date: Sat, 29 Jun 2013 14:02:27 +0200 Subject: [PATCH 10/74] 4.2.1 --- .gitignore | 1 + python-beautifulsoup4.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index e5e8779..4e8b4e7 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /beautifulsoup4-4.1.1.tar.gz /beautifulsoup4-4.1.3.tar.gz /beautifulsoup4-4.2.0.tar.gz +/beautifulsoup4-4.2.1.tar.gz diff --git a/python-beautifulsoup4.spec b/python-beautifulsoup4.spec index be356cb..59a08e5 100644 --- a/python-beautifulsoup4.spec +++ b/python-beautifulsoup4.spec @@ -4,7 +4,7 @@ %global oname beautifulsoup4 Name: python-beautifulsoup4 -Version: 4.2.0 +Version: 4.2.1 Release: 1%{?dist} Summary: HTML/XML parser for quick-turnaround applications like screen-scraping Group: Development/Languages @@ -140,7 +140,10 @@ pushd %{py3dir} %endif %changelog -* Mon Jun 27 2013 Terje Rosten - 4.2.0-1 +* Sat Jun 29 2013 Terje Rosten - 4.2.1-1 +- 4.2.1 + +* Mon May 27 2013 Terje Rosten - 4.2.0-1 - 4.2.0 * Tue Mar 19 2013 Ralph Bean - 4.1.3-3 diff --git a/sources b/sources index e96985d..64a8e3b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -3e709c68b7705b49635dca0c551a4362 beautifulsoup4-4.2.0.tar.gz +91ea70ce16a5f1f43e58f2ef05651679 beautifulsoup4-4.2.1.tar.gz From 5b7d00d2c1a09932dbf84c526430e11761b2d772 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sun, 4 Aug 2013 01:31:01 -0500 Subject: [PATCH 11/74] - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild --- python-beautifulsoup4.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-beautifulsoup4.spec b/python-beautifulsoup4.spec index 59a08e5..34f82ed 100644 --- a/python-beautifulsoup4.spec +++ b/python-beautifulsoup4.spec @@ -5,7 +5,7 @@ Name: python-beautifulsoup4 Version: 4.2.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: HTML/XML parser for quick-turnaround applications like screen-scraping Group: Development/Languages License: MIT @@ -140,6 +140,9 @@ pushd %{py3dir} %endif %changelog +* Sun Aug 04 2013 Fedora Release Engineering - 4.2.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + * Sat Jun 29 2013 Terje Rosten - 4.2.1-1 - 4.2.1 From 30dfb1c8f92759225c74cc605c86824ece78c0a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Terje=20R=C3=B8sten?= Date: Mon, 19 Aug 2013 20:18:15 +0200 Subject: [PATCH 12/74] 4.3.1 --- .gitignore | 1 + python-beautifulsoup4.spec | 12 ++++++++---- sources | 2 +- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 4e8b4e7..68e09de 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /beautifulsoup4-4.1.3.tar.gz /beautifulsoup4-4.2.0.tar.gz /beautifulsoup4-4.2.1.tar.gz +/beautifulsoup4-4.3.1.tar.gz diff --git a/python-beautifulsoup4.spec b/python-beautifulsoup4.spec index 34f82ed..d9db1e3 100644 --- a/python-beautifulsoup4.spec +++ b/python-beautifulsoup4.spec @@ -4,13 +4,13 @@ %global oname beautifulsoup4 Name: python-beautifulsoup4 -Version: 4.2.1 -Release: 2%{?dist} +Version: 4.3.1 +Release: 1%{?dist} Summary: HTML/XML parser for quick-turnaround applications like screen-scraping Group: Development/Languages License: MIT URL: http://www.crummy.com/software/BeautifulSoup/ -Source0: http://www.crummy.com/software/BeautifulSoup/bs4/download/4.2/beautifulsoup4-%{version}.tar.gz +Source0: http://www.crummy.com/software/BeautifulSoup/bs4/download/4.3/beautifulsoup4-%{version}.tar.gz BuildArch: noarch BuildRequires: python-devel BuildRequires: python-html5lib @@ -118,7 +118,8 @@ pushd %{py3dir} %if 0%{?rhel} && 0%{?rhel} <= 6 PYTHONPATH=$(pwd) nosetests %else -%{__python} -m unittest discover -s bs4 +# Some tests fails +%{__python} -m unittest discover -s bs4 || : %endif %if 0%{?with_python3} @@ -140,6 +141,9 @@ pushd %{py3dir} %endif %changelog +* Mon Aug 19 2013 Terje Rosten - 4.3.1-1 +- 4.3.1 + * Sun Aug 04 2013 Fedora Release Engineering - 4.2.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild diff --git a/sources b/sources index 64a8e3b..a805993 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -91ea70ce16a5f1f43e58f2ef05651679 beautifulsoup4-4.2.1.tar.gz +508095f2784c64114e06856edc1dafed beautifulsoup4-4.3.1.tar.gz From a1216f4611f67bdeb485cc41d8fc18f301655619 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Terje=20R=C3=B8sten?= Date: Mon, 21 Oct 2013 15:22:31 +0200 Subject: [PATCH 13/74] 4.3.2 --- .gitignore | 1 + python-beautifulsoup4.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 68e09de..ce03e4b 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /beautifulsoup4-4.2.0.tar.gz /beautifulsoup4-4.2.1.tar.gz /beautifulsoup4-4.3.1.tar.gz +/beautifulsoup4-4.3.2.tar.gz diff --git a/python-beautifulsoup4.spec b/python-beautifulsoup4.spec index d9db1e3..49c4bfe 100644 --- a/python-beautifulsoup4.spec +++ b/python-beautifulsoup4.spec @@ -4,13 +4,13 @@ %global oname beautifulsoup4 Name: python-beautifulsoup4 -Version: 4.3.1 +Version: 4.3.2 Release: 1%{?dist} Summary: HTML/XML parser for quick-turnaround applications like screen-scraping Group: Development/Languages License: MIT URL: http://www.crummy.com/software/BeautifulSoup/ -Source0: http://www.crummy.com/software/BeautifulSoup/bs4/download/4.3/beautifulsoup4-%{version}.tar.gz +Source0: https://pypi.python.org/packages/source/b/beautifulsoup4/beautifulsoup4-%{version}.tar.gz BuildArch: noarch BuildRequires: python-devel BuildRequires: python-html5lib @@ -141,6 +141,9 @@ pushd %{py3dir} %endif %changelog +* Tue Oct 17 2013 Terje Rosten - 4.3.2-1 +- 4.3.2 + * Mon Aug 19 2013 Terje Rosten - 4.3.1-1 - 4.3.1 diff --git a/sources b/sources index a805993..8fa3116 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -508095f2784c64114e06856edc1dafed beautifulsoup4-4.3.1.tar.gz +b8d157a204d56512a4cc196e53e7d8ee beautifulsoup4-4.3.2.tar.gz From e8c2c5fa8aa5e01c916986da8bb338f989b74d0d Mon Sep 17 00:00:00 2001 From: Slavek Kabrda Date: Thu, 15 May 2014 17:23:03 +0200 Subject: [PATCH 14/74] Rebuilt for https://fedoraproject.org/wiki/Changes/Python_3.4 --- python-beautifulsoup4.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-beautifulsoup4.spec b/python-beautifulsoup4.spec index 49c4bfe..ce6b775 100644 --- a/python-beautifulsoup4.spec +++ b/python-beautifulsoup4.spec @@ -5,7 +5,7 @@ Name: python-beautifulsoup4 Version: 4.3.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: HTML/XML parser for quick-turnaround applications like screen-scraping Group: Development/Languages License: MIT @@ -141,6 +141,9 @@ pushd %{py3dir} %endif %changelog +* Wed May 14 2014 Bohuslav Kabrda - 4.3.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Changes/Python_3.4 + * Tue Oct 17 2013 Terje Rosten - 4.3.2-1 - 4.3.2 From 20f25abbaf26ddb2199a0f97d405f739b6e43e1a Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 7 Jun 2014 13:48:15 -0500 Subject: [PATCH 15/74] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- python-beautifulsoup4.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-beautifulsoup4.spec b/python-beautifulsoup4.spec index ce6b775..8cc0e01 100644 --- a/python-beautifulsoup4.spec +++ b/python-beautifulsoup4.spec @@ -5,7 +5,7 @@ Name: python-beautifulsoup4 Version: 4.3.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: HTML/XML parser for quick-turnaround applications like screen-scraping Group: Development/Languages License: MIT @@ -141,6 +141,9 @@ pushd %{py3dir} %endif %changelog +* Sat Jun 07 2014 Fedora Release Engineering - 4.3.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + * Wed May 14 2014 Bohuslav Kabrda - 4.3.2-2 - Rebuilt for https://fedoraproject.org/wiki/Changes/Python_3.4 From 08a75c1cae8b6f1ba90010e2f5a8fb93814c0fea Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 18 Jun 2015 18:36:24 +0000 Subject: [PATCH 16/74] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- python-beautifulsoup4.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-beautifulsoup4.spec b/python-beautifulsoup4.spec index 8cc0e01..1a32a2e 100644 --- a/python-beautifulsoup4.spec +++ b/python-beautifulsoup4.spec @@ -5,7 +5,7 @@ Name: python-beautifulsoup4 Version: 4.3.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: HTML/XML parser for quick-turnaround applications like screen-scraping Group: Development/Languages License: MIT @@ -141,6 +141,9 @@ pushd %{py3dir} %endif %changelog +* Thu Jun 18 2015 Fedora Release Engineering - 4.3.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Sat Jun 07 2014 Fedora Release Engineering - 4.3.2-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild From fc4710252f2641ba1c8b312ae334f577de9b1843 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Terje=20R=C3=B8sten?= Date: Sat, 4 Jul 2015 16:27:25 +0200 Subject: [PATCH 17/74] 4.4.0 --- .gitignore | 1 + python-beautifulsoup4.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index ce03e4b..a5c35b8 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /beautifulsoup4-4.2.1.tar.gz /beautifulsoup4-4.3.1.tar.gz /beautifulsoup4-4.3.2.tar.gz +/beautifulsoup4-4.4.0.tar.gz diff --git a/python-beautifulsoup4.spec b/python-beautifulsoup4.spec index 1a32a2e..e7a9919 100644 --- a/python-beautifulsoup4.spec +++ b/python-beautifulsoup4.spec @@ -4,8 +4,8 @@ %global oname beautifulsoup4 Name: python-beautifulsoup4 -Version: 4.3.2 -Release: 4%{?dist} +Version: 4.4.0 +Release: 1%{?dist} Summary: HTML/XML parser for quick-turnaround applications like screen-scraping Group: Development/Languages License: MIT @@ -141,6 +141,9 @@ pushd %{py3dir} %endif %changelog +* Sat Jul 04 2015 Terje Rosten - 4.4.0-1 +- 4.4.0 + * Thu Jun 18 2015 Fedora Release Engineering - 4.3.2-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild diff --git a/sources b/sources index 8fa3116..05e79fb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b8d157a204d56512a4cc196e53e7d8ee beautifulsoup4-4.3.2.tar.gz +63d1f33e6524f408cb6efbc5da1ae8a5 beautifulsoup4-4.4.0.tar.gz From 4a5759618b9ef27090d5a22a4a3a9468e70c18d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Terje=20R=C3=B8sten?= Date: Sat, 3 Oct 2015 16:27:09 +0200 Subject: [PATCH 18/74] 4.4.1 --- .gitignore | 1 + python-beautifulsoup4.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index a5c35b8..a0f7dd6 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /beautifulsoup4-4.3.1.tar.gz /beautifulsoup4-4.3.2.tar.gz /beautifulsoup4-4.4.0.tar.gz +/beautifulsoup4-4.4.1.tar.gz diff --git a/python-beautifulsoup4.spec b/python-beautifulsoup4.spec index e7a9919..73db2aa 100644 --- a/python-beautifulsoup4.spec +++ b/python-beautifulsoup4.spec @@ -4,7 +4,7 @@ %global oname beautifulsoup4 Name: python-beautifulsoup4 -Version: 4.4.0 +Version: 4.4.1 Release: 1%{?dist} Summary: HTML/XML parser for quick-turnaround applications like screen-scraping Group: Development/Languages @@ -141,6 +141,9 @@ pushd %{py3dir} %endif %changelog +* Sat Oct 03 2015 Terje Rosten - 4.4.1-1 +- 4.4.1 + * Sat Jul 04 2015 Terje Rosten - 4.4.0-1 - 4.4.0 @@ -153,7 +156,7 @@ pushd %{py3dir} * Wed May 14 2014 Bohuslav Kabrda - 4.3.2-2 - Rebuilt for https://fedoraproject.org/wiki/Changes/Python_3.4 -* Tue Oct 17 2013 Terje Rosten - 4.3.2-1 +* Thu Oct 17 2013 Terje Rosten - 4.3.2-1 - 4.3.2 * Mon Aug 19 2013 Terje Rosten - 4.3.1-1 diff --git a/sources b/sources index 05e79fb..2e76913 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -63d1f33e6524f408cb6efbc5da1ae8a5 beautifulsoup4-4.4.0.tar.gz +8fbd9a7cac0704645fa20d1419036815 beautifulsoup4-4.4.1.tar.gz From 32558983dfcb8e25e0884be6c764c2acf6bc6579 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Tue, 10 Nov 2015 15:17:33 +0000 Subject: [PATCH 19/74] - Rebuilt for https://fedoraproject.org/wiki/Changes/python3.5 --- python-beautifulsoup4.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-beautifulsoup4.spec b/python-beautifulsoup4.spec index 73db2aa..ead7137 100644 --- a/python-beautifulsoup4.spec +++ b/python-beautifulsoup4.spec @@ -5,7 +5,7 @@ Name: python-beautifulsoup4 Version: 4.4.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: HTML/XML parser for quick-turnaround applications like screen-scraping Group: Development/Languages License: MIT @@ -141,6 +141,9 @@ pushd %{py3dir} %endif %changelog +* Tue Nov 10 2015 Fedora Release Engineering - 4.4.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Changes/python3.5 + * Sat Oct 03 2015 Terje Rosten - 4.4.1-1 - 4.4.1 From 44f29775b8f33c893564441c9d36686085f1143c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 4 Feb 2016 19:05:26 +0000 Subject: [PATCH 20/74] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- python-beautifulsoup4.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-beautifulsoup4.spec b/python-beautifulsoup4.spec index ead7137..ed8bc58 100644 --- a/python-beautifulsoup4.spec +++ b/python-beautifulsoup4.spec @@ -5,7 +5,7 @@ Name: python-beautifulsoup4 Version: 4.4.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: HTML/XML parser for quick-turnaround applications like screen-scraping Group: Development/Languages License: MIT @@ -141,6 +141,9 @@ pushd %{py3dir} %endif %changelog +* Thu Feb 04 2016 Fedora Release Engineering - 4.4.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Tue Nov 10 2015 Fedora Release Engineering - 4.4.1-2 - Rebuilt for https://fedoraproject.org/wiki/Changes/python3.5 From a91c5dcefba02bba9ee0e265555da70dc726960a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 19 Jul 2016 09:04:05 +0000 Subject: [PATCH 21/74] - https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages --- python-beautifulsoup4.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-beautifulsoup4.spec b/python-beautifulsoup4.spec index ed8bc58..f0e7e2b 100644 --- a/python-beautifulsoup4.spec +++ b/python-beautifulsoup4.spec @@ -5,7 +5,7 @@ Name: python-beautifulsoup4 Version: 4.4.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: HTML/XML parser for quick-turnaround applications like screen-scraping Group: Development/Languages License: MIT @@ -141,6 +141,9 @@ pushd %{py3dir} %endif %changelog +* Tue Jul 19 2016 Fedora Release Engineering - 4.4.1-4 +- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages + * Thu Feb 04 2016 Fedora Release Engineering - 4.4.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild From 38d5e982d7eaa39e4ed822a05572dd450e0905f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Tue, 26 Jul 2016 20:34:10 +0300 Subject: [PATCH 22/74] Don't require html5lib if lxml is required, require lxml on EL7 https://bugzilla.redhat.com/show_bug.cgi?id=1360436 --- python-beautifulsoup4.spec | 35 ++++++++++++++++++++++------------- 1 file changed, 22 insertions(+), 13 deletions(-) diff --git a/python-beautifulsoup4.spec b/python-beautifulsoup4.spec index f0e7e2b..361f19a 100644 --- a/python-beautifulsoup4.spec +++ b/python-beautifulsoup4.spec @@ -1,3 +1,9 @@ +%if 0%{?fedora} || 0%{?rhel} > 6 +%bcond_without lxml +%else +%bcond_with lxml +%endif + %if 0%{?fedora} > 1 %global with_python3 1 %endif @@ -20,20 +26,11 @@ BuildRequires: python-setuptools BuildRequires: python-unittest2 BuildRequires: python-nose %endif - -Requires: python-html5lib - -%if 0%{?fedora} +%if %{with lxml} BuildRequires: python-lxml Requires: python-lxml -%endif - -%if 0%{?with_python3} -BuildRequires: python-tools -BuildRequires: python3-html5lib -BuildRequires: python3-lxml -BuildRequires: python3-devel -BuildRequires: python3-setuptools +%else +Requires: python-html5lib %endif %description @@ -59,8 +56,16 @@ minutes with Beautiful Soup. %package -n python3-beautifulsoup4 Summary: HTML/XML parser for quick-turnaround applications like screen-scraping Group: Development/Languages -Requires: python3-html5lib +BuildRequires: python-tools +BuildRequires: python3-html5lib +BuildRequires: python3-devel +BuildRequires: python3-setuptools +%if %{with lxml} +BuildRequires: python3-lxml Requires: python3-lxml +%else +Requires: python3-html5lib +%endif Obsoletes: python3-BeautifulSoup < 1:3.2.1-2 %description -n python3-beautifulsoup4 @@ -141,6 +146,10 @@ pushd %{py3dir} %endif %changelog +* Tue Jul 26 2016 Ville Skyttä +- Don't require html5lib if lxml is required +- Require lxml on EL7 + * Tue Jul 19 2016 Fedora Release Engineering - 4.4.1-4 - https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages From ea41e8aa96e083f99a54977c445a3e99b219cda0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Tue, 26 Jul 2016 21:13:43 +0300 Subject: [PATCH 23/74] Mark COPYING.txt as %%license --- python-beautifulsoup4.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/python-beautifulsoup4.spec b/python-beautifulsoup4.spec index 361f19a..e9e6657 100644 --- a/python-beautifulsoup4.spec +++ b/python-beautifulsoup4.spec @@ -134,19 +134,22 @@ pushd %{py3dir} %endif %files -%doc *.txt +%license COPYING.txt +%doc AUTHORS.txt NEWS.txt README.txt TODO.txt %{python_sitelib}/beautifulsoup4-%{version}*.egg-info %{python_sitelib}/bs4 %if 0%{?with_python3} %files -n python3-beautifulsoup4 -%doc *.txt +%license COPYING.txt +%doc AUTHORS.txt NEWS.txt README.txt TODO.txt %{python3_sitelib}/beautifulsoup4-%{version}*.egg-info %{python3_sitelib}/bs4 %endif %changelog * Tue Jul 26 2016 Ville Skyttä +- Mark COPYING.txt as %%license - Don't require html5lib if lxml is required - Require lxml on EL7 From a71652ddac8d94a109cf6b2b402995f291497d21 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Tue, 26 Jul 2016 21:14:05 +0300 Subject: [PATCH 24/74] Drop duplicate python-devel BR --- python-beautifulsoup4.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/python-beautifulsoup4.spec b/python-beautifulsoup4.spec index e9e6657..0f1f416 100644 --- a/python-beautifulsoup4.spec +++ b/python-beautifulsoup4.spec @@ -20,7 +20,6 @@ Source0: https://pypi.python.org/packages/source/b/beautifulsoup4/beautif BuildArch: noarch BuildRequires: python-devel BuildRequires: python-html5lib -BuildRequires: python-devel BuildRequires: python-setuptools %if 0%{?rhel} && 0%{?rhel} <= 6 BuildRequires: python-unittest2 From d5b40e66078c578abce157bfa570e695439cbe54 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Tue, 26 Jul 2016 21:18:49 +0300 Subject: [PATCH 25/74] Update to 4.5.0, fixes #1358273 --- .gitignore | 9 +-------- python-beautifulsoup4.spec | 11 ++++++----- sources | 2 +- 3 files changed, 8 insertions(+), 14 deletions(-) diff --git a/.gitignore b/.gitignore index a0f7dd6..dafa321 100644 --- a/.gitignore +++ b/.gitignore @@ -1,8 +1 @@ -/beautifulsoup4-4.1.1.tar.gz -/beautifulsoup4-4.1.3.tar.gz -/beautifulsoup4-4.2.0.tar.gz -/beautifulsoup4-4.2.1.tar.gz -/beautifulsoup4-4.3.1.tar.gz -/beautifulsoup4-4.3.2.tar.gz -/beautifulsoup4-4.4.0.tar.gz -/beautifulsoup4-4.4.1.tar.gz +/*.tar.* diff --git a/python-beautifulsoup4.spec b/python-beautifulsoup4.spec index 0f1f416..fffac47 100644 --- a/python-beautifulsoup4.spec +++ b/python-beautifulsoup4.spec @@ -10,15 +10,15 @@ %global oname beautifulsoup4 Name: python-beautifulsoup4 -Version: 4.4.1 -Release: 4%{?dist} +Version: 4.5.0 +Release: 1%{?dist} Summary: HTML/XML parser for quick-turnaround applications like screen-scraping Group: Development/Languages License: MIT URL: http://www.crummy.com/software/BeautifulSoup/ -Source0: https://pypi.python.org/packages/source/b/beautifulsoup4/beautifulsoup4-%{version}.tar.gz +Source0: https://files.pythonhosted.org/packages/source/b/%{oname}/%{oname}-%{version}.tar.gz BuildArch: noarch -BuildRequires: python-devel +BuildRequires: python-devel >= 2.7 BuildRequires: python-html5lib BuildRequires: python-setuptools %if 0%{?rhel} && 0%{?rhel} <= 6 @@ -147,7 +147,8 @@ pushd %{py3dir} %endif %changelog -* Tue Jul 26 2016 Ville Skyttä +* Tue Jul 26 2016 Ville Skyttä - 4.5.0-1 +- Update to 4.5.0 - Mark COPYING.txt as %%license - Don't require html5lib if lxml is required - Require lxml on EL7 diff --git a/sources b/sources index 2e76913..62c8767 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8fbd9a7cac0704645fa20d1419036815 beautifulsoup4-4.4.1.tar.gz +2b3805e0078a2033b269ecea2403acf1 beautifulsoup4-4.5.0.tar.gz From bf42a99e0aa0816173ec61b349a7d38027aa7efd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Tue, 26 Jul 2016 21:19:06 +0300 Subject: [PATCH 26/74] Don't allow tests to fail --- python-beautifulsoup4.spec | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/python-beautifulsoup4.spec b/python-beautifulsoup4.spec index fffac47..991d1a8 100644 --- a/python-beautifulsoup4.spec +++ b/python-beautifulsoup4.spec @@ -122,14 +122,12 @@ pushd %{py3dir} %if 0%{?rhel} && 0%{?rhel} <= 6 PYTHONPATH=$(pwd) nosetests %else -# Some tests fails -%{__python} -m unittest discover -s bs4 || : +%{__python} -m unittest discover -s bs4 %endif %if 0%{?with_python3} pushd %{py3dir} -# Some tests fails -%{__python3} -m unittest discover -s bs4 || : +%{__python3} -m unittest discover -s bs4 %endif %files From 1039efd977b44c16c33a3b03545c95d823685d94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Tue, 26 Jul 2016 21:27:49 +0300 Subject: [PATCH 27/74] Clean up no longer needed conditionals Python >= 2.7 is now required, so EL < 7 is out as well. --- python-beautifulsoup4.spec | 29 ++++------------------------- 1 file changed, 4 insertions(+), 25 deletions(-) diff --git a/python-beautifulsoup4.spec b/python-beautifulsoup4.spec index 991d1a8..706d78f 100644 --- a/python-beautifulsoup4.spec +++ b/python-beautifulsoup4.spec @@ -1,9 +1,3 @@ -%if 0%{?fedora} || 0%{?rhel} > 6 -%bcond_without lxml -%else -%bcond_with lxml -%endif - %if 0%{?fedora} > 1 %global with_python3 1 %endif @@ -19,18 +13,11 @@ URL: http://www.crummy.com/software/BeautifulSoup/ Source0: https://files.pythonhosted.org/packages/source/b/%{oname}/%{oname}-%{version}.tar.gz BuildArch: noarch BuildRequires: python-devel >= 2.7 +# html5lib BR just for test coverage BuildRequires: python-html5lib BuildRequires: python-setuptools -%if 0%{?rhel} && 0%{?rhel} <= 6 -BuildRequires: python-unittest2 -BuildRequires: python-nose -%endif -%if %{with lxml} BuildRequires: python-lxml Requires: python-lxml -%else -Requires: python-html5lib -%endif %description Beautiful Soup is a Python HTML/XML parser designed for quick @@ -56,15 +43,12 @@ minutes with Beautiful Soup. Summary: HTML/XML parser for quick-turnaround applications like screen-scraping Group: Development/Languages BuildRequires: python-tools +# html5lib BR just for test coverage BuildRequires: python3-html5lib BuildRequires: python3-devel BuildRequires: python3-setuptools -%if %{with lxml} BuildRequires: python3-lxml Requires: python3-lxml -%else -Requires: python3-html5lib -%endif Obsoletes: python3-BeautifulSoup < 1:3.2.1-2 %description -n python3-beautifulsoup4 @@ -119,12 +103,7 @@ pushd %{py3dir} %endif %check -%if 0%{?rhel} && 0%{?rhel} <= 6 -PYTHONPATH=$(pwd) nosetests -%else %{__python} -m unittest discover -s bs4 -%endif - %if 0%{?with_python3} pushd %{py3dir} %{__python3} -m unittest discover -s bs4 @@ -148,8 +127,8 @@ pushd %{py3dir} * Tue Jul 26 2016 Ville Skyttä - 4.5.0-1 - Update to 4.5.0 - Mark COPYING.txt as %%license -- Don't require html5lib if lxml is required -- Require lxml on EL7 +- Don't require html5lib +- Require lxml on EL too * Tue Jul 19 2016 Fedora Release Engineering - 4.4.1-4 - https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages From ddc26f434e9e754b58a9bec822abc1bb62bc3e74 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Terje=20R=C3=B8sten?= Date: Tue, 9 Aug 2016 19:25:33 +0200 Subject: [PATCH 28/74] 4.5.1 --- python-beautifulsoup4.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-beautifulsoup4.spec b/python-beautifulsoup4.spec index 706d78f..3884973 100644 --- a/python-beautifulsoup4.spec +++ b/python-beautifulsoup4.spec @@ -4,7 +4,7 @@ %global oname beautifulsoup4 Name: python-beautifulsoup4 -Version: 4.5.0 +Version: 4.5.1 Release: 1%{?dist} Summary: HTML/XML parser for quick-turnaround applications like screen-scraping Group: Development/Languages @@ -124,6 +124,9 @@ pushd %{py3dir} %endif %changelog +* Tue Aug 09 2016 Terje Rosten - 4.5.1-1 +- 4.5.1 + * Tue Jul 26 2016 Ville Skyttä - 4.5.0-1 - Update to 4.5.0 - Mark COPYING.txt as %%license From 4864c3a6bcb6971fa127cbc5d471ca352d95369c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Terje=20R=C3=B8sten?= Date: Tue, 9 Aug 2016 19:34:09 +0200 Subject: [PATCH 29/74] Add new sources --- sources | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources b/sources index 62c8767..9b7c13d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2b3805e0078a2033b269ecea2403acf1 beautifulsoup4-4.5.0.tar.gz +994abd90e691beaf7d42c00ffb2f3a67 beautifulsoup4-4.5.1.tar.gz From 955da989480d369fb334e85dc4682a8e9580da30 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Mon, 19 Dec 2016 18:20:37 +0100 Subject: [PATCH 30/74] Rebuild for Python 3.6 --- python-beautifulsoup4.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-beautifulsoup4.spec b/python-beautifulsoup4.spec index 3884973..d61ab00 100644 --- a/python-beautifulsoup4.spec +++ b/python-beautifulsoup4.spec @@ -5,7 +5,7 @@ Name: python-beautifulsoup4 Version: 4.5.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: HTML/XML parser for quick-turnaround applications like screen-scraping Group: Development/Languages License: MIT @@ -124,6 +124,9 @@ pushd %{py3dir} %endif %changelog +* Mon Dec 19 2016 Miro Hrončok - 4.5.1-2 +- Rebuild for Python 3.6 + * Tue Aug 09 2016 Terje Rosten - 4.5.1-1 - 4.5.1 From c4e2abc24ad772cf07d4cc52e696661209daf7ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Tue, 20 Dec 2016 00:35:20 +0100 Subject: [PATCH 31/74] Bootstrap for Python 3.6 --- python-beautifulsoup4.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/python-beautifulsoup4.spec b/python-beautifulsoup4.spec index d61ab00..981891c 100644 --- a/python-beautifulsoup4.spec +++ b/python-beautifulsoup4.spec @@ -44,10 +44,10 @@ Summary: HTML/XML parser for quick-turnaround applications like screen-sc Group: Development/Languages BuildRequires: python-tools # html5lib BR just for test coverage -BuildRequires: python3-html5lib +#BuildRequires: python3-html5lib BuildRequires: python3-devel BuildRequires: python3-setuptools -BuildRequires: python3-lxml +#BuildRequires: python3-lxml Requires: python3-lxml Obsoletes: python3-BeautifulSoup < 1:3.2.1-2 @@ -106,7 +106,7 @@ pushd %{py3dir} %{__python} -m unittest discover -s bs4 %if 0%{?with_python3} pushd %{py3dir} -%{__python3} -m unittest discover -s bs4 +#{__python3} -m unittest discover -s bs4 %endif %files From 77140e52ce6359b6a3dac96f6456be33a401bd48 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Tue, 20 Dec 2016 00:52:49 +0100 Subject: [PATCH 32/74] Un-bootstrap for Python 3.6 This reverts commit c4e2abc24ad772cf07d4cc52e696661209daf7ab. --- python-beautifulsoup4.spec | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/python-beautifulsoup4.spec b/python-beautifulsoup4.spec index 981891c..5b6a558 100644 --- a/python-beautifulsoup4.spec +++ b/python-beautifulsoup4.spec @@ -5,7 +5,7 @@ Name: python-beautifulsoup4 Version: 4.5.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: HTML/XML parser for quick-turnaround applications like screen-scraping Group: Development/Languages License: MIT @@ -44,10 +44,10 @@ Summary: HTML/XML parser for quick-turnaround applications like screen-sc Group: Development/Languages BuildRequires: python-tools # html5lib BR just for test coverage -#BuildRequires: python3-html5lib +BuildRequires: python3-html5lib BuildRequires: python3-devel BuildRequires: python3-setuptools -#BuildRequires: python3-lxml +BuildRequires: python3-lxml Requires: python3-lxml Obsoletes: python3-BeautifulSoup < 1:3.2.1-2 @@ -106,7 +106,7 @@ pushd %{py3dir} %{__python} -m unittest discover -s bs4 %if 0%{?with_python3} pushd %{py3dir} -#{__python3} -m unittest discover -s bs4 +%{__python3} -m unittest discover -s bs4 %endif %files @@ -124,6 +124,9 @@ pushd %{py3dir} %endif %changelog +* Mon Dec 19 2016 Miro Hrončok - 4.5.1-3 +- Un-bootstrap for Python 3.6 + * Mon Dec 19 2016 Miro Hrončok - 4.5.1-2 - Rebuild for Python 3.6 From 007c679378f28f05194f9aa61ee84edcae325fcd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Terje=20R=C3=B8sten?= Date: Wed, 4 Jan 2017 20:43:42 +0100 Subject: [PATCH 33/74] 4.5.3 --- python-beautifulsoup4.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/python-beautifulsoup4.spec b/python-beautifulsoup4.spec index 5b6a558..a6be30e 100644 --- a/python-beautifulsoup4.spec +++ b/python-beautifulsoup4.spec @@ -4,8 +4,8 @@ %global oname beautifulsoup4 Name: python-beautifulsoup4 -Version: 4.5.1 -Release: 3%{?dist} +Version: 4.5.3 +Release: 1%{?dist} Summary: HTML/XML parser for quick-turnaround applications like screen-scraping Group: Development/Languages License: MIT @@ -124,6 +124,9 @@ pushd %{py3dir} %endif %changelog +* Wed Jan 04 2017 Terje Rosten - 4.5.3-1 +- 4.5.3 + * Mon Dec 19 2016 Miro Hrončok - 4.5.1-3 - Un-bootstrap for Python 3.6 diff --git a/sources b/sources index 9b7c13d..937a008 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -994abd90e691beaf7d42c00ffb2f3a67 beautifulsoup4-4.5.1.tar.gz +SHA512 (beautifulsoup4-4.5.3.tar.gz) = d31db0e3bb778a78c37882fcd55dc580eb5eeadfd48744eae6e2e0d0ef5983b216a4682af84a4971611b05fb99c45012ce094475f2d7c39a5b90dad99906ec84 From 44ae2b095df8c1289fbd6ca3c42c9b863277b33e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 11 Feb 2017 08:27:11 +0000 Subject: [PATCH 34/74] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- python-beautifulsoup4.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-beautifulsoup4.spec b/python-beautifulsoup4.spec index a6be30e..963e888 100644 --- a/python-beautifulsoup4.spec +++ b/python-beautifulsoup4.spec @@ -5,7 +5,7 @@ Name: python-beautifulsoup4 Version: 4.5.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: HTML/XML parser for quick-turnaround applications like screen-scraping Group: Development/Languages License: MIT @@ -124,6 +124,9 @@ pushd %{py3dir} %endif %changelog +* Sat Feb 11 2017 Fedora Release Engineering - 4.5.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Wed Jan 04 2017 Terje Rosten - 4.5.3-1 - 4.5.3 From 4a1cfc3aa5c1275cecd48114d2bc61184b798349 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Terje=20R=C3=B8sten?= Date: Mon, 8 May 2017 18:56:58 +0200 Subject: [PATCH 35/74] 4.6.0 --- python-beautifulsoup4.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/python-beautifulsoup4.spec b/python-beautifulsoup4.spec index 963e888..5199e50 100644 --- a/python-beautifulsoup4.spec +++ b/python-beautifulsoup4.spec @@ -4,8 +4,8 @@ %global oname beautifulsoup4 Name: python-beautifulsoup4 -Version: 4.5.3 -Release: 2%{?dist} +Version: 4.6.0 +Release: 1%{?dist} Summary: HTML/XML parser for quick-turnaround applications like screen-scraping Group: Development/Languages License: MIT @@ -124,6 +124,9 @@ pushd %{py3dir} %endif %changelog +* Mon May 08 2017 Terje Rosten - 4.6.0-1 +- 4.6.0 + * Sat Feb 11 2017 Fedora Release Engineering - 4.5.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild diff --git a/sources b/sources index 937a008..141b31b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (beautifulsoup4-4.5.3.tar.gz) = d31db0e3bb778a78c37882fcd55dc580eb5eeadfd48744eae6e2e0d0ef5983b216a4682af84a4971611b05fb99c45012ce094475f2d7c39a5b90dad99906ec84 +SHA512 (beautifulsoup4-4.6.0.tar.gz) = 1a7eee4218e58cc3852e71fe4f0892f673bb46a851941264766a38eff8ef05d612d88b4641fcb478ce8f66ac50dc987ca039923c4bbb11867c74813289f7e578 From a4e29d986c399069785532dca571cdad799ff78c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 27 Jul 2017 09:43:47 +0000 Subject: [PATCH 36/74] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- python-beautifulsoup4.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-beautifulsoup4.spec b/python-beautifulsoup4.spec index 5199e50..f64d494 100644 --- a/python-beautifulsoup4.spec +++ b/python-beautifulsoup4.spec @@ -5,7 +5,7 @@ Name: python-beautifulsoup4 Version: 4.6.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: HTML/XML parser for quick-turnaround applications like screen-scraping Group: Development/Languages License: MIT @@ -124,6 +124,9 @@ pushd %{py3dir} %endif %changelog +* Thu Jul 27 2017 Fedora Release Engineering - 4.6.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Mon May 08 2017 Terje Rosten - 4.6.0-1 - 4.6.0 From 7855e07c931fdf9cc3cda985e09f83b827db860b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Sat, 19 Aug 2017 09:39:42 -0400 Subject: [PATCH 37/74] Python 2 binary package renamed to python2-beautifulsoup4 --- python-beautifulsoup4.spec | 48 ++++++++++++++++++++++++-------------- 1 file changed, 30 insertions(+), 18 deletions(-) diff --git a/python-beautifulsoup4.spec b/python-beautifulsoup4.spec index f64d494..37b5557 100644 --- a/python-beautifulsoup4.spec +++ b/python-beautifulsoup4.spec @@ -5,7 +5,7 @@ Name: python-beautifulsoup4 Version: 4.6.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: HTML/XML parser for quick-turnaround applications like screen-scraping Group: Development/Languages License: MIT @@ -17,26 +17,34 @@ BuildRequires: python-devel >= 2.7 BuildRequires: python-html5lib BuildRequires: python-setuptools BuildRequires: python-lxml -Requires: python-lxml - -%description -Beautiful Soup is a Python HTML/XML parser designed for quick -turnaround projects like screen-scraping. Three features make it -powerful: -Beautiful Soup won't choke if you give it bad markup. - -Beautiful Soup provides a few simple methods and Pythonic idioms for -navigating, searching, and modifying a parse tree. +%global _description\ +Beautiful Soup is a Python HTML/XML parser designed for quick\ +turnaround projects like screen-scraping. Three features make it\ +powerful:\ +\ +Beautiful Soup won't choke if you give it bad markup.\ +\ +Beautiful Soup provides a few simple methods and Pythonic idioms for\ +navigating, searching, and modifying a parse tree.\ +\ +Beautiful Soup automatically converts incoming documents to Unicode\ +and outgoing documents to UTF-8.\ +\ +Beautiful Soup parses anything you give it.\ +\ +Valuable data that was once locked up in poorly-designed websites is\ +now within your reach. Projects that would have taken hours take only\ +minutes with Beautiful Soup. -Beautiful Soup automatically converts incoming documents to Unicode -and outgoing documents to UTF-8. +%description %_description -Beautiful Soup parses anything you give it. +%package -n python2-beautifulsoup4 +Summary: %summary +Requires: python-lxml +%{?python_provide:%python_provide python2-beautifulsoup4} -Valuable data that was once locked up in poorly-designed websites is -now within your reach. Projects that would have taken hours take only -minutes with Beautiful Soup. +%description -n python2-beautifulsoup4 %_description %if 0%{?with_python3} %package -n python3-beautifulsoup4 @@ -109,7 +117,7 @@ pushd %{py3dir} %{__python3} -m unittest discover -s bs4 %endif -%files +%files -n python2-beautifulsoup4 %license COPYING.txt %doc AUTHORS.txt NEWS.txt README.txt TODO.txt %{python_sitelib}/beautifulsoup4-%{version}*.egg-info @@ -124,6 +132,10 @@ pushd %{py3dir} %endif %changelog +* Sat Aug 19 2017 Zbigniew Jędrzejewski-Szmek - 4.6.0-3 +- Python 2 binary package renamed to python2-beautifulsoup4 + See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3 + * Thu Jul 27 2017 Fedora Release Engineering - 4.6.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From 27053ba6b8f44f9da20936bde2609fdad485daae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Sat, 19 Aug 2017 18:09:24 -0400 Subject: [PATCH 38/74] 2to3 is necessary --- python-beautifulsoup4.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/python-beautifulsoup4.spec b/python-beautifulsoup4.spec index 37b5557..baf3cc3 100644 --- a/python-beautifulsoup4.spec +++ b/python-beautifulsoup4.spec @@ -17,6 +17,7 @@ BuildRequires: python-devel >= 2.7 BuildRequires: python-html5lib BuildRequires: python-setuptools BuildRequires: python-lxml +BuildRequires: /usr/bin/2to3 %global _description\ Beautiful Soup is a Python HTML/XML parser designed for quick\ From 1ae18f91db72bf681afc03f85bd230cad1e5051b Mon Sep 17 00:00:00 2001 From: Troy Dawson Date: Fri, 29 Sep 2017 07:36:47 -0700 Subject: [PATCH 39/74] Cleanup spec file conditionals --- python-beautifulsoup4.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/python-beautifulsoup4.spec b/python-beautifulsoup4.spec index baf3cc3..14974a2 100644 --- a/python-beautifulsoup4.spec +++ b/python-beautifulsoup4.spec @@ -1,11 +1,11 @@ -%if 0%{?fedora} > 1 +%if 0%{?fedora} || 0%{?rhel} > 7 %global with_python3 1 %endif %global oname beautifulsoup4 Name: python-beautifulsoup4 Version: 4.6.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: HTML/XML parser for quick-turnaround applications like screen-scraping Group: Development/Languages License: MIT @@ -133,6 +133,9 @@ pushd %{py3dir} %endif %changelog +* Fri Sep 29 2017 Troy Dawson - 4.6.0-4 +- Cleanup spec file conditionals + * Sat Aug 19 2017 Zbigniew Jędrzejewski-Szmek - 4.6.0-3 - Python 2 binary package renamed to python2-beautifulsoup4 See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3 From 6039a020277fb1d591d52c8ccc08460d4a15828f Mon Sep 17 00:00:00 2001 From: Iryna Shcherbina Date: Wed, 7 Feb 2018 09:26:17 +0100 Subject: [PATCH 40/74] Update Python 2 dependency declarations to new packaging standards --- python-beautifulsoup4.spec | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/python-beautifulsoup4.spec b/python-beautifulsoup4.spec index 14974a2..0dd404c 100644 --- a/python-beautifulsoup4.spec +++ b/python-beautifulsoup4.spec @@ -5,18 +5,18 @@ Name: python-beautifulsoup4 Version: 4.6.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: HTML/XML parser for quick-turnaround applications like screen-scraping Group: Development/Languages License: MIT URL: http://www.crummy.com/software/BeautifulSoup/ Source0: https://files.pythonhosted.org/packages/source/b/%{oname}/%{oname}-%{version}.tar.gz BuildArch: noarch -BuildRequires: python-devel >= 2.7 +BuildRequires: python2-devel >= 2.7 # html5lib BR just for test coverage -BuildRequires: python-html5lib -BuildRequires: python-setuptools -BuildRequires: python-lxml +BuildRequires: python2-html5lib +BuildRequires: python2-setuptools +BuildRequires: python2-lxml BuildRequires: /usr/bin/2to3 %global _description\ @@ -42,7 +42,7 @@ minutes with Beautiful Soup. %package -n python2-beautifulsoup4 Summary: %summary -Requires: python-lxml +Requires: python2-lxml %{?python_provide:%python_provide python2-beautifulsoup4} %description -n python2-beautifulsoup4 %_description @@ -51,7 +51,7 @@ Requires: python-lxml %package -n python3-beautifulsoup4 Summary: HTML/XML parser for quick-turnaround applications like screen-scraping Group: Development/Languages -BuildRequires: python-tools +BuildRequires: python2-tools # html5lib BR just for test coverage BuildRequires: python3-html5lib BuildRequires: python3-devel @@ -133,6 +133,10 @@ pushd %{py3dir} %endif %changelog +* Wed Feb 07 2018 Iryna Shcherbina - 4.6.0-5 +- Update Python 2 dependency declarations to new packaging standards + (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3) + * Fri Sep 29 2017 Troy Dawson - 4.6.0-4 - Cleanup spec file conditionals From 86151b0dd88c0b1a5a78ddc248bbb4fd793dab41 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Terje=20R=C3=B8sten?= Date: Wed, 7 Feb 2018 18:51:46 +0100 Subject: [PATCH 41/74] Clean up --- python-beautifulsoup4.spec | 93 +++++++++++--------------------------- 1 file changed, 26 insertions(+), 67 deletions(-) diff --git a/python-beautifulsoup4.spec b/python-beautifulsoup4.spec index 0dd404c..277b248 100644 --- a/python-beautifulsoup4.spec +++ b/python-beautifulsoup4.spec @@ -1,16 +1,11 @@ -%if 0%{?fedora} || 0%{?rhel} > 7 -%global with_python3 1 -%endif -%global oname beautifulsoup4 - Name: python-beautifulsoup4 Version: 4.6.0 -Release: 5%{?dist} +Release: 6%{?dist} Summary: HTML/XML parser for quick-turnaround applications like screen-scraping Group: Development/Languages License: MIT URL: http://www.crummy.com/software/BeautifulSoup/ -Source0: https://files.pythonhosted.org/packages/source/b/%{oname}/%{oname}-%{version}.tar.gz +Source0: https://files.pythonhosted.org/packages/source/b/beautifulsoup4/beautifulsoup4-%{version}.tar.gz BuildArch: noarch BuildRequires: python2-devel >= 2.7 # html5lib BR just for test coverage @@ -18,13 +13,19 @@ BuildRequires: python2-html5lib BuildRequires: python2-setuptools BuildRequires: python2-lxml BuildRequires: /usr/bin/2to3 +BuildRequires: python2-tools +# html5lib BR just for test coverage +BuildRequires: python3-html5lib +BuildRequires: python3-devel +BuildRequires: python3-setuptools +BuildRequires: python3-lxml %global _description\ Beautiful Soup is a Python HTML/XML parser designed for quick\ turnaround projects like screen-scraping. Three features make it\ powerful:\ \ -Beautiful Soup won't choke if you give it bad markup.\ +Beautiful Soup wont choke if you give it bad markup.\ \ Beautiful Soup provides a few simple methods and Pythonic idioms for\ navigating, searching, and modifying a parse tree.\ @@ -40,99 +41,57 @@ minutes with Beautiful Soup. %description %_description -%package -n python2-beautifulsoup4 -Summary: %summary +%package -n python2-beautifulsoup4 +Summary: %summary Requires: python2-lxml %{?python_provide:%python_provide python2-beautifulsoup4} - %description -n python2-beautifulsoup4 %_description -%if 0%{?with_python3} -%package -n python3-beautifulsoup4 -Summary: HTML/XML parser for quick-turnaround applications like screen-scraping -Group: Development/Languages -BuildRequires: python2-tools -# html5lib BR just for test coverage -BuildRequires: python3-html5lib -BuildRequires: python3-devel -BuildRequires: python3-setuptools -BuildRequires: python3-lxml +%package -n python3-beautifulsoup4 +Summary: %summary Requires: python3-lxml Obsoletes: python3-BeautifulSoup < 1:3.2.1-2 - -%description -n python3-beautifulsoup4 -Beautiful Soup is a Python HTML/XML parser designed for quick -turnaround projects like screen-scraping. Three features make it -powerful: - -Beautiful Soup won't choke if you give it bad markup. - -Beautiful Soup provides a few simple methods and Pythonic idioms for -navigating, searching, and modifying a parse tree. - -Beautiful Soup automatically converts incoming documents to Unicode -and outgoing documents to UTF-8. - -Beautiful Soup parses anything you give it. - -Valuable data that was once locked up in poorly-designed websites is -now within your reach. Projects that would have taken hours take only -minutes with Beautiful Soup. - -This is the Python 3 build of Beautiful Soup. - -%endif # if with_python3 +%description -n python3-beautifulsoup4 %_description %prep -%setup -q -n %{oname}-%{version} +%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 - -%if 0%{?with_python3} -rm -rf %{py3dir} -cp -a . %{py3dir} -%endif +rm -rf %{py3dir} && cp -a . %{py3dir} %build -%{__python} setup.py build - -%if 0%{?with_python3} +%{py2_build} pushd %{py3dir} 2to3 --write --nobackups . -%{__python3} setup.py build -%endif +%{py3_build} %install -%{__python} setup.py install -O1 --skip-build --root %{buildroot} - -%if 0%{?with_python3} +%{py2_install} pushd %{py3dir} -%{__python3} setup.py install -O1 --skip-build --root %{buildroot} -%endif +%{py3_install} %check -%{__python} -m unittest discover -s bs4 -%if 0%{?with_python3} +%{__python2} -m unittest discover -s bs4 pushd %{py3dir} %{__python3} -m unittest discover -s bs4 -%endif %files -n python2-beautifulsoup4 %license COPYING.txt %doc AUTHORS.txt NEWS.txt README.txt TODO.txt -%{python_sitelib}/beautifulsoup4-%{version}*.egg-info -%{python_sitelib}/bs4 +%{python2_sitelib}/beautifulsoup4-%{version}*.egg-info +%{python2_sitelib}/bs4 -%if 0%{?with_python3} %files -n python3-beautifulsoup4 %license COPYING.txt %doc AUTHORS.txt NEWS.txt README.txt TODO.txt %{python3_sitelib}/beautifulsoup4-%{version}*.egg-info %{python3_sitelib}/bs4 -%endif %changelog +* Wed Feb 07 2018 Terje Rosten - 4.6.0-6 +- Clean up + * Wed Feb 07 2018 Iryna Shcherbina - 4.6.0-5 - Update Python 2 dependency declarations to new packaging standards (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3) From f769c126fe9be04e257552b7ca3628d8edd2cd92 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Sun, 17 Jun 2018 22:45:45 +0200 Subject: [PATCH 42/74] Rebuilt for Python 3.7 --- python-beautifulsoup4.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-beautifulsoup4.spec b/python-beautifulsoup4.spec index 277b248..12198f4 100644 --- a/python-beautifulsoup4.spec +++ b/python-beautifulsoup4.spec @@ -1,6 +1,6 @@ Name: python-beautifulsoup4 Version: 4.6.0 -Release: 6%{?dist} +Release: 7%{?dist} Summary: HTML/XML parser for quick-turnaround applications like screen-scraping Group: Development/Languages License: MIT @@ -89,6 +89,9 @@ pushd %{py3dir} %{python3_sitelib}/bs4 %changelog +* Sun Jun 17 2018 Miro Hrončok - 4.6.0-7 +- Rebuilt for Python 3.7 + * Wed Feb 07 2018 Terje Rosten - 4.6.0-6 - Clean up From 64340e654cfb12347d0216a77b887a13dcc9fe66 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 13 Jul 2018 23:35:42 +0000 Subject: [PATCH 43/74] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- python-beautifulsoup4.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-beautifulsoup4.spec b/python-beautifulsoup4.spec index 12198f4..4a59c71 100644 --- a/python-beautifulsoup4.spec +++ b/python-beautifulsoup4.spec @@ -1,6 +1,6 @@ Name: python-beautifulsoup4 Version: 4.6.0 -Release: 7%{?dist} +Release: 8%{?dist} Summary: HTML/XML parser for quick-turnaround applications like screen-scraping Group: Development/Languages License: MIT @@ -89,6 +89,9 @@ pushd %{py3dir} %{python3_sitelib}/bs4 %changelog +* Fri Jul 13 2018 Fedora Release Engineering - 4.6.0-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Sun Jun 17 2018 Miro Hrončok - 4.6.0-7 - Rebuilt for Python 3.7 From 9481d6851ef7f800a658eab06986422648ec7610 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Terje=20R=C3=B8sten?= Date: Mon, 30 Jul 2018 13:28:09 +0200 Subject: [PATCH 44/74] 4.6.1 --- python-beautifulsoup4.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/python-beautifulsoup4.spec b/python-beautifulsoup4.spec index 4a59c71..b37863b 100644 --- a/python-beautifulsoup4.spec +++ b/python-beautifulsoup4.spec @@ -1,6 +1,6 @@ Name: python-beautifulsoup4 -Version: 4.6.0 -Release: 8%{?dist} +Version: 4.6.1 +Release: 1%{?dist} Summary: HTML/XML parser for quick-turnaround applications like screen-scraping Group: Development/Languages License: MIT @@ -89,6 +89,9 @@ pushd %{py3dir} %{python3_sitelib}/bs4 %changelog +* Mon Jul 30 2018 Terje Rosten - 4.6.1-1 +- 4.6.1 + * Fri Jul 13 2018 Fedora Release Engineering - 4.6.0-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From 3c68233012c15b7d71330c38ec753e272d64f87a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Terje=20R=C3=B8sten?= Date: Mon, 30 Jul 2018 13:32:59 +0200 Subject: [PATCH 45/74] Add sources --- sources | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources b/sources index 141b31b..b059114 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (beautifulsoup4-4.6.0.tar.gz) = 1a7eee4218e58cc3852e71fe4f0892f673bb46a851941264766a38eff8ef05d612d88b4641fcb478ce8f66ac50dc987ca039923c4bbb11867c74813289f7e578 +SHA512 (beautifulsoup4-4.6.1.tar.gz) = 598f6be620d6c656bdab6d0d6e767a1ffc695a790dc5e3e8cc0f411555de1c52ef1972c93d0916135375c74e5272dd112f00e5ed2fb12a12c90d5d30d852e91c From e9152e558cab39d9ed3071ebbf6ae12ab3b883f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Terje=20R=C3=B8sten?= Date: Mon, 27 Aug 2018 18:53:14 +0200 Subject: [PATCH 46/74] 4.6.3 --- python-beautifulsoup4.spec | 9 ++++++--- sources | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/python-beautifulsoup4.spec b/python-beautifulsoup4.spec index b37863b..7986417 100644 --- a/python-beautifulsoup4.spec +++ b/python-beautifulsoup4.spec @@ -1,5 +1,5 @@ Name: python-beautifulsoup4 -Version: 4.6.1 +Version: 4.6.3 Release: 1%{?dist} Summary: HTML/XML parser for quick-turnaround applications like screen-scraping Group: Development/Languages @@ -78,17 +78,20 @@ pushd %{py3dir} %files -n python2-beautifulsoup4 %license COPYING.txt -%doc AUTHORS.txt NEWS.txt README.txt TODO.txt +%doc AUTHORS.txt NEWS.txt TODO.txt %{python2_sitelib}/beautifulsoup4-%{version}*.egg-info %{python2_sitelib}/bs4 %files -n python3-beautifulsoup4 %license COPYING.txt -%doc AUTHORS.txt NEWS.txt README.txt TODO.txt +%doc AUTHORS.txt NEWS.txt TODO.txt %{python3_sitelib}/beautifulsoup4-%{version}*.egg-info %{python3_sitelib}/bs4 %changelog +* Mon Aug 27 2018 Terje Rosten - 4.6.3-1 +- 4.6.3 + * Mon Jul 30 2018 Terje Rosten - 4.6.1-1 - 4.6.1 diff --git a/sources b/sources index b059114..5adec4a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (beautifulsoup4-4.6.1.tar.gz) = 598f6be620d6c656bdab6d0d6e767a1ffc695a790dc5e3e8cc0f411555de1c52ef1972c93d0916135375c74e5272dd112f00e5ed2fb12a12c90d5d30d852e91c +SHA512 (beautifulsoup4-4.6.3.tar.gz) = 0cacae77843326ebee87d108b6706a7ca6943684bcccc62554d2ae5d77dfd181c97435ceca9d3e2e51962b024bbe52bc08d7f0dc516311aa87b3a1f87fb4ae23 From 6c747681c80864e2f474940a6649e5725a7b1c15 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 28 Jan 2019 20:18:14 +0100 Subject: [PATCH 47/74] Remove obsolete Group tag References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag --- python-beautifulsoup4.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/python-beautifulsoup4.spec b/python-beautifulsoup4.spec index 7986417..4828b67 100644 --- a/python-beautifulsoup4.spec +++ b/python-beautifulsoup4.spec @@ -2,7 +2,6 @@ Name: python-beautifulsoup4 Version: 4.6.3 Release: 1%{?dist} Summary: HTML/XML parser for quick-turnaround applications like screen-scraping -Group: Development/Languages License: MIT URL: http://www.crummy.com/software/BeautifulSoup/ Source0: https://files.pythonhosted.org/packages/source/b/beautifulsoup4/beautifulsoup4-%{version}.tar.gz From 0ca65a3785531a67596b28bf7a7b8d93220bb7fd Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 2 Feb 2019 05:48:42 +0000 Subject: [PATCH 48/74] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- python-beautifulsoup4.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-beautifulsoup4.spec b/python-beautifulsoup4.spec index 4828b67..cafec22 100644 --- a/python-beautifulsoup4.spec +++ b/python-beautifulsoup4.spec @@ -1,6 +1,6 @@ Name: python-beautifulsoup4 Version: 4.6.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: HTML/XML parser for quick-turnaround applications like screen-scraping License: MIT URL: http://www.crummy.com/software/BeautifulSoup/ @@ -88,6 +88,9 @@ pushd %{py3dir} %{python3_sitelib}/bs4 %changelog +* Sat Feb 02 2019 Fedora Release Engineering - 4.6.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Mon Aug 27 2018 Terje Rosten - 4.6.3-1 - 4.6.3 From 63e5c2ba507839aa9f47e145f4d4cd24bdb4d363 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 26 Jul 2019 12:22:37 +0000 Subject: [PATCH 49/74] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- python-beautifulsoup4.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-beautifulsoup4.spec b/python-beautifulsoup4.spec index cafec22..ae1ae89 100644 --- a/python-beautifulsoup4.spec +++ b/python-beautifulsoup4.spec @@ -1,6 +1,6 @@ Name: python-beautifulsoup4 Version: 4.6.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: HTML/XML parser for quick-turnaround applications like screen-scraping License: MIT URL: http://www.crummy.com/software/BeautifulSoup/ @@ -88,6 +88,9 @@ pushd %{py3dir} %{python3_sitelib}/bs4 %changelog +* Fri Jul 26 2019 Fedora Release Engineering - 4.6.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Sat Feb 02 2019 Fedora Release Engineering - 4.6.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From 72e2b31e1d8bb21ff6aa66657be2631bda37ce9c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Sat, 17 Aug 2019 02:22:30 +0200 Subject: [PATCH 50/74] Rebuilt for Python 3.8 --- python-beautifulsoup4.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-beautifulsoup4.spec b/python-beautifulsoup4.spec index ae1ae89..cff13d6 100644 --- a/python-beautifulsoup4.spec +++ b/python-beautifulsoup4.spec @@ -1,6 +1,6 @@ Name: python-beautifulsoup4 Version: 4.6.3 -Release: 3%{?dist} +Release: 4%{?dist} Summary: HTML/XML parser for quick-turnaround applications like screen-scraping License: MIT URL: http://www.crummy.com/software/BeautifulSoup/ @@ -88,6 +88,9 @@ pushd %{py3dir} %{python3_sitelib}/bs4 %changelog +* Sat Aug 17 2019 Miro Hrončok - 4.6.3-4 +- Rebuilt for Python 3.8 + * Fri Jul 26 2019 Fedora Release Engineering - 4.6.3-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From 6f91d1c1400550c5fac5d914699089f04a8c0089 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Terje=20R=C3=B8sten?= Date: Mon, 19 Aug 2019 22:56:10 +0200 Subject: [PATCH 51/74] 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 - 4.8.0-1 +- 4.8.0 + * Sat Aug 17 2019 Miro Hrončok - 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 From f2fed727219108ad30304cbe59964546e30fa7e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Wed, 12 Jun 2019 14:11:19 +0200 Subject: [PATCH 52/74] Use %{expand} and add missing %{python_provide} --- python-beautifulsoup4.spec | 39 ++++++++++++++++++++------------------ 1 file changed, 21 insertions(+), 18 deletions(-) diff --git a/python-beautifulsoup4.spec b/python-beautifulsoup4.spec index 3c0fe66..8135c8a 100644 --- a/python-beautifulsoup4.spec +++ b/python-beautifulsoup4.spec @@ -27,24 +27,24 @@ BuildRequires: python3-setuptools BuildRequires: python3-soupsieve BuildRequires: python3-lxml -%global _description\ -Beautiful Soup is a Python HTML/XML parser designed for quick\ -turnaround projects like screen-scraping. Three features make it\ -powerful:\ -\ -Beautiful Soup wont choke if you give it bad markup.\ -\ -Beautiful Soup provides a few simple methods and Pythonic idioms for\ -navigating, searching, and modifying a parse tree.\ -\ -Beautiful Soup automatically converts incoming documents to Unicode\ -and outgoing documents to UTF-8.\ -\ -Beautiful Soup parses anything you give it.\ -\ -Valuable data that was once locked up in poorly-designed websites is\ -now within your reach. Projects that would have taken hours take only\ -minutes with Beautiful Soup. +%global _description %{expand: +Beautiful Soup is a Python HTML/XML parser designed for quick +turnaround projects like screen-scraping. Three features make it +powerful: + +Beautiful Soup won't choke if you give it bad markup. + +Beautiful Soup provides a few simple methods and Pythonic idioms for +navigating, searching, and modifying a parse tree. + +Beautiful Soup automatically converts incoming documents to Unicode +and outgoing documents to UTF-8. + +Beautiful Soup parses anything you give it. + +Valuable data that was once locked up in poorly-designed websites is +now within your reach. Projects that would have taken hours take only +minutes with Beautiful Soup.} %description %_description @@ -54,6 +54,7 @@ Summary: %summary Requires: python2-lxml Requires: python2-soupsieve %{?python_provide:%python_provide python2-beautifulsoup4} + %description -n python2-beautifulsoup4 %_description %endif @@ -62,6 +63,8 @@ Summary: %summary Requires: python3-lxml Requires: python3-soupsieve Obsoletes: python3-BeautifulSoup < 1:3.2.1-2 +%{?python_provide:%python_provide python3-beautifulsoup4} + %description -n python3-beautifulsoup4 %_description %prep From d3d897c7f1d0460c2379b9c293f8b60f7bea3b46 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Mon, 19 Aug 2019 23:18:37 +0200 Subject: [PATCH 53/74] Rebuilt for Python 3.8 (again) --- python-beautifulsoup4.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-beautifulsoup4.spec b/python-beautifulsoup4.spec index 8135c8a..e944560 100644 --- a/python-beautifulsoup4.spec +++ b/python-beautifulsoup4.spec @@ -4,7 +4,7 @@ Name: python-beautifulsoup4 Version: 4.8.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: HTML/XML parser for quick-turnaround applications like screen-scraping License: MIT URL: http://www.crummy.com/software/BeautifulSoup/ @@ -102,6 +102,9 @@ pushd %{py3dir} %{python3_sitelib}/bs4 %changelog +* Mon Aug 19 2019 Zbigniew Jędrzejewski-Szmek - 4.8.0-2 +- Rebuilt for Python 3.8 (again) + * Sun Aug 18 2019 Terje Rosten - 4.8.0-1 - 4.8.0 From 38627f410d8aa2b785bb3fa772c9c63d19262384 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 3 Sep 2019 18:57:29 +0200 Subject: [PATCH 54/74] Subpackage python2-beautifulsoup4 has been removed --- python-beautifulsoup4.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/python-beautifulsoup4.spec b/python-beautifulsoup4.spec index e944560..a26b382 100644 --- a/python-beautifulsoup4.spec +++ b/python-beautifulsoup4.spec @@ -1,10 +1,10 @@ -%if 0%{?fedora} < 33 +%if 0%{?fedora} < 32 %global py2 1 %endif Name: python-beautifulsoup4 Version: 4.8.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: HTML/XML parser for quick-turnaround applications like screen-scraping License: MIT URL: http://www.crummy.com/software/BeautifulSoup/ @@ -102,6 +102,9 @@ pushd %{py3dir} %{python3_sitelib}/bs4 %changelog +* Tue Sep 3 2019 Zbigniew Jędrzejewski-Szmek - 4.8.0-3 +- Subpackage python2-beautifulsoup4 has been removed (#1748299) + * Mon Aug 19 2019 Zbigniew Jędrzejewski-Szmek - 4.8.0-2 - Rebuilt for Python 3.8 (again) From 491b027bf65ae3a089882a09dec1adaf97320580 Mon Sep 17 00:00:00 2001 From: Terje Rosten Date: Mon, 2 Dec 2019 20:21:35 +0100 Subject: [PATCH 55/74] 4.8.1 --- python-beautifulsoup4.spec | 9 ++++++--- sources | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/python-beautifulsoup4.spec b/python-beautifulsoup4.spec index a26b382..fe82b3e 100644 --- a/python-beautifulsoup4.spec +++ b/python-beautifulsoup4.spec @@ -3,8 +3,8 @@ %endif Name: python-beautifulsoup4 -Version: 4.8.0 -Release: 3%{?dist} +Version: 4.8.1 +Release: 1%{?dist} Summary: HTML/XML parser for quick-turnaround applications like screen-scraping License: MIT URL: http://www.crummy.com/software/BeautifulSoup/ @@ -102,7 +102,10 @@ pushd %{py3dir} %{python3_sitelib}/bs4 %changelog -* Tue Sep 3 2019 Zbigniew Jędrzejewski-Szmek - 4.8.0-3 +* Mon Dec 02 2019 Terje Rosten - 4.8.1-1 +- 4.8.1 + +* Tue Sep 03 2019 Zbigniew Jędrzejewski-Szmek - 4.8.0-3 - Subpackage python2-beautifulsoup4 has been removed (#1748299) * Mon Aug 19 2019 Zbigniew Jędrzejewski-Szmek - 4.8.0-2 diff --git a/sources b/sources index de61859..c709570 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (beautifulsoup4-4.8.0.tar.gz) = 00e157f8031dbb0e30e49158ca30f9e9207647dd3355edf23c2906b9d0c8b93250669edf5b20372e62546501a0cd2d7e87b793faf30bc122b5544f9358c1a4db +SHA512 (beautifulsoup4-4.8.1.tar.gz) = 7abc5e84cb8da5428dafc6b473418d0cc72b518cb1a73d4ae58b8dad3ec985e5778629dc1d7c8374dfb223be981983c745a1dbb55a98078b4cfe7ba5ce25539b From 3bde180387b6f7ebbcffd7110ca4efc8ca5599fc Mon Sep 17 00:00:00 2001 From: Terje Rosten Date: Sun, 19 Jan 2020 12:32:49 +0100 Subject: [PATCH 56/74] 4.8.2 --- python-beautifulsoup4.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/python-beautifulsoup4.spec b/python-beautifulsoup4.spec index fe82b3e..1fe30d2 100644 --- a/python-beautifulsoup4.spec +++ b/python-beautifulsoup4.spec @@ -3,7 +3,7 @@ %endif Name: python-beautifulsoup4 -Version: 4.8.1 +Version: 4.8.2 Release: 1%{?dist} Summary: HTML/XML parser for quick-turnaround applications like screen-scraping License: MIT @@ -102,6 +102,9 @@ pushd %{py3dir} %{python3_sitelib}/bs4 %changelog +* Sun Jan 19 2020 Terje Rosten - 4.8.2-1 +- 4.8.2 + * Mon Dec 02 2019 Terje Rosten - 4.8.1-1 - 4.8.1 diff --git a/sources b/sources index c709570..76294e6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (beautifulsoup4-4.8.1.tar.gz) = 7abc5e84cb8da5428dafc6b473418d0cc72b518cb1a73d4ae58b8dad3ec985e5778629dc1d7c8374dfb223be981983c745a1dbb55a98078b4cfe7ba5ce25539b +SHA512 (beautifulsoup4-4.8.2.tar.gz) = aab90eb22614e9a2fb47792389a951b3ad7faf9791e15984a6c27a38be6f3d0ccbf3a9753d9afb5c70105097ac1a9c5f9e07206e12c6d4cb7a7f6d4e90ec18c2 From 849e48d077d8564abf8fecb3dddc7bfc4d5c6e2e Mon Sep 17 00:00:00 2001 From: yatinkarel Date: Mon, 27 Jan 2020 12:32:03 +0530 Subject: [PATCH 57/74] Fix py2 condition for rhel < 8 py2 build for rhel < 8 is not needed. --- python-beautifulsoup4.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python-beautifulsoup4.spec b/python-beautifulsoup4.spec index 1fe30d2..cabeb31 100644 --- a/python-beautifulsoup4.spec +++ b/python-beautifulsoup4.spec @@ -1,4 +1,4 @@ -%if 0%{?fedora} < 32 +%if 0%{?fedora} < 32 && 0%{?rhel} < 8 %global py2 1 %endif From 54d13d717dfa4ab042f28d3f1f3fe8df8d531fc5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 30 Jan 2020 10:52:09 +0000 Subject: [PATCH 58/74] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- python-beautifulsoup4.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-beautifulsoup4.spec b/python-beautifulsoup4.spec index cabeb31..8dd0852 100644 --- a/python-beautifulsoup4.spec +++ b/python-beautifulsoup4.spec @@ -4,7 +4,7 @@ Name: python-beautifulsoup4 Version: 4.8.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: HTML/XML parser for quick-turnaround applications like screen-scraping License: MIT URL: http://www.crummy.com/software/BeautifulSoup/ @@ -102,6 +102,9 @@ pushd %{py3dir} %{python3_sitelib}/bs4 %changelog +* Thu Jan 30 2020 Fedora Release Engineering - 4.8.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Sun Jan 19 2020 Terje Rosten - 4.8.2-1 - 4.8.2 From da714771a378957c6660aa6d5a44ccd1b1d90d18 Mon Sep 17 00:00:00 2001 From: Terje Rosten Date: Mon, 13 Apr 2020 10:43:14 +0200 Subject: [PATCH 59/74] 4.9.0 --- python-beautifulsoup4.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/python-beautifulsoup4.spec b/python-beautifulsoup4.spec index 8dd0852..61e1042 100644 --- a/python-beautifulsoup4.spec +++ b/python-beautifulsoup4.spec @@ -3,8 +3,8 @@ %endif Name: python-beautifulsoup4 -Version: 4.8.2 -Release: 2%{?dist} +Version: 4.9.0 +Release: 1%{?dist} Summary: HTML/XML parser for quick-turnaround applications like screen-scraping License: MIT URL: http://www.crummy.com/software/BeautifulSoup/ @@ -102,6 +102,9 @@ pushd %{py3dir} %{python3_sitelib}/bs4 %changelog +* Mon Apr 13 2020 Terje Rosten - 4.9.0-1 +- 4.9.0 + * Thu Jan 30 2020 Fedora Release Engineering - 4.8.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/sources b/sources index 76294e6..0742dbf 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (beautifulsoup4-4.8.2.tar.gz) = aab90eb22614e9a2fb47792389a951b3ad7faf9791e15984a6c27a38be6f3d0ccbf3a9753d9afb5c70105097ac1a9c5f9e07206e12c6d4cb7a7f6d4e90ec18c2 +SHA512 (beautifulsoup4-4.9.0.tar.gz) = 8c8d3c23f9e76955e465c6d343addb5165480f59d785755f6550aa3e77e8efe0c3dd4a2f310d485162dc046b05f797a8a6aee96a515d59659c820993e0ee37d7 From 7e87f0ee2bfec5cd81bb80bce363b10e7ae3452f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Sat, 23 May 2020 22:27:02 +0200 Subject: [PATCH 60/74] Rebuilt for Python 3.9 --- python-beautifulsoup4.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-beautifulsoup4.spec b/python-beautifulsoup4.spec index 61e1042..5bc9764 100644 --- a/python-beautifulsoup4.spec +++ b/python-beautifulsoup4.spec @@ -4,7 +4,7 @@ Name: python-beautifulsoup4 Version: 4.9.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: HTML/XML parser for quick-turnaround applications like screen-scraping License: MIT URL: http://www.crummy.com/software/BeautifulSoup/ @@ -102,6 +102,9 @@ pushd %{py3dir} %{python3_sitelib}/bs4 %changelog +* Sat May 23 2020 Miro Hrončok - 4.9.0-2 +- Rebuilt for Python 3.9 + * Mon Apr 13 2020 Terje Rosten - 4.9.0-1 - 4.9.0 From 06e499825a2a935397dddb6bd7451c75c4f57f11 Mon Sep 17 00:00:00 2001 From: Terje Rosten Date: Sun, 7 Jun 2020 15:54:33 +0200 Subject: [PATCH 61/74] 4.9.1 --- python-beautifulsoup4.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/python-beautifulsoup4.spec b/python-beautifulsoup4.spec index 5bc9764..705d8be 100644 --- a/python-beautifulsoup4.spec +++ b/python-beautifulsoup4.spec @@ -3,8 +3,8 @@ %endif Name: python-beautifulsoup4 -Version: 4.9.0 -Release: 2%{?dist} +Version: 4.9.1 +Release: 1%{?dist} Summary: HTML/XML parser for quick-turnaround applications like screen-scraping License: MIT URL: http://www.crummy.com/software/BeautifulSoup/ @@ -102,6 +102,9 @@ pushd %{py3dir} %{python3_sitelib}/bs4 %changelog +* Sun Jun 07 2020 Terje Rosten - 4.9.1-1 +- 4.9.1 + * Sat May 23 2020 Miro Hrončok - 4.9.0-2 - Rebuilt for Python 3.9 diff --git a/sources b/sources index 0742dbf..5eb3e7c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (beautifulsoup4-4.9.0.tar.gz) = 8c8d3c23f9e76955e465c6d343addb5165480f59d785755f6550aa3e77e8efe0c3dd4a2f310d485162dc046b05f797a8a6aee96a515d59659c820993e0ee37d7 +SHA512 (beautifulsoup4-4.9.1.tar.gz) = a1fe9cbfe8616d2ff25cc836769ff02d51ed86b06ca9a37366867b145440b7f64b866346600ed74820f0407c8e70eaac3d58700766a99b5ff7433cb736a57b3c From 1594464c943e4c82a26411c77603889719908c2d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jul 2020 23:54:04 +0000 Subject: [PATCH 62/74] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- python-beautifulsoup4.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-beautifulsoup4.spec b/python-beautifulsoup4.spec index 705d8be..09933da 100644 --- a/python-beautifulsoup4.spec +++ b/python-beautifulsoup4.spec @@ -4,7 +4,7 @@ Name: python-beautifulsoup4 Version: 4.9.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: HTML/XML parser for quick-turnaround applications like screen-scraping License: MIT URL: http://www.crummy.com/software/BeautifulSoup/ @@ -102,6 +102,9 @@ pushd %{py3dir} %{python3_sitelib}/bs4 %changelog +* Tue Jul 28 2020 Fedora Release Engineering - 4.9.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Sun Jun 07 2020 Terje Rosten - 4.9.1-1 - 4.9.1 From a2e7bc4b1f63640733df91ac4f07ec0d6e7d3bba Mon Sep 17 00:00:00 2001 From: Terje Rosten Date: Sun, 11 Oct 2020 12:07:54 +0200 Subject: [PATCH 63/74] 4.9.3 --- python-beautifulsoup4.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/python-beautifulsoup4.spec b/python-beautifulsoup4.spec index 09933da..3a43a87 100644 --- a/python-beautifulsoup4.spec +++ b/python-beautifulsoup4.spec @@ -3,8 +3,8 @@ %endif Name: python-beautifulsoup4 -Version: 4.9.1 -Release: 2%{?dist} +Version: 4.9.3 +Release: 1%{?dist} Summary: HTML/XML parser for quick-turnaround applications like screen-scraping License: MIT URL: http://www.crummy.com/software/BeautifulSoup/ @@ -102,6 +102,9 @@ pushd %{py3dir} %{python3_sitelib}/bs4 %changelog +* Sun Oct 11 2020 Terje Rosten - 4.9.3-1 +- 4.9.3 + * Tue Jul 28 2020 Fedora Release Engineering - 4.9.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 2261dc4e7412aa8a3a63bd84325224226126adc8 Mon Sep 17 00:00:00 2001 From: Terje Rosten Date: Sun, 11 Oct 2020 12:14:13 +0200 Subject: [PATCH 64/74] Update sources --- sources | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources b/sources index 5eb3e7c..b06c3f1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (beautifulsoup4-4.9.1.tar.gz) = a1fe9cbfe8616d2ff25cc836769ff02d51ed86b06ca9a37366867b145440b7f64b866346600ed74820f0407c8e70eaac3d58700766a99b5ff7433cb736a57b3c +SHA512 (beautifulsoup4-4.9.3.tar.gz) = e3cb6258bd7c51f12128fa8ee5948fb3566163ae233fac2dda21bab7772ab8dbb384d920b0ea138ef9921307b48f89cee3a9bf6111dfc8903d917ee7af365f34 From 297afd82bf20dcb85d94f6beda3129909fd8370f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 27 Jan 2021 09:31:59 +0000 Subject: [PATCH 65/74] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- python-beautifulsoup4.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-beautifulsoup4.spec b/python-beautifulsoup4.spec index 3a43a87..4906fb8 100644 --- a/python-beautifulsoup4.spec +++ b/python-beautifulsoup4.spec @@ -4,7 +4,7 @@ Name: python-beautifulsoup4 Version: 4.9.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: HTML/XML parser for quick-turnaround applications like screen-scraping License: MIT URL: http://www.crummy.com/software/BeautifulSoup/ @@ -102,6 +102,9 @@ pushd %{py3dir} %{python3_sitelib}/bs4 %changelog +* Wed Jan 27 2021 Fedora Release Engineering - 4.9.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Sun Oct 11 2020 Terje Rosten - 4.9.3-1 - 4.9.3 From 02e5f2f966f9f58ad9c420210a2fd65d86be5901 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Thu, 3 Jun 2021 20:46:47 +0200 Subject: [PATCH 66/74] Rebuilt for Python 3.10 --- python-beautifulsoup4.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-beautifulsoup4.spec b/python-beautifulsoup4.spec index 4906fb8..7210dc8 100644 --- a/python-beautifulsoup4.spec +++ b/python-beautifulsoup4.spec @@ -4,7 +4,7 @@ Name: python-beautifulsoup4 Version: 4.9.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: HTML/XML parser for quick-turnaround applications like screen-scraping License: MIT URL: http://www.crummy.com/software/BeautifulSoup/ @@ -102,6 +102,9 @@ pushd %{py3dir} %{python3_sitelib}/bs4 %changelog +* Thu Jun 03 2021 Python Maint - 4.9.3-3 +- Rebuilt for Python 3.10 + * Wed Jan 27 2021 Fedora Release Engineering - 4.9.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 29e45ced536a1c3a45ca47460f4a04a0011bc359 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 05:17:52 +0000 Subject: [PATCH 67/74] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- python-beautifulsoup4.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-beautifulsoup4.spec b/python-beautifulsoup4.spec index 7210dc8..097302e 100644 --- a/python-beautifulsoup4.spec +++ b/python-beautifulsoup4.spec @@ -4,7 +4,7 @@ Name: python-beautifulsoup4 Version: 4.9.3 -Release: 3%{?dist} +Release: 4%{?dist} Summary: HTML/XML parser for quick-turnaround applications like screen-scraping License: MIT URL: http://www.crummy.com/software/BeautifulSoup/ @@ -102,6 +102,9 @@ pushd %{py3dir} %{python3_sitelib}/bs4 %changelog +* Fri Jul 23 2021 Fedora Release Engineering - 4.9.3-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Thu Jun 03 2021 Python Maint - 4.9.3-3 - Rebuilt for Python 3.10 From a62ca0fad1fc20a2040b9b2b793f894cd497e770 Mon Sep 17 00:00:00 2001 From: Terje Rosten Date: Thu, 9 Sep 2021 21:36:14 +0200 Subject: [PATCH 68/74] 4.10.0 --- python-beautifulsoup4.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/python-beautifulsoup4.spec b/python-beautifulsoup4.spec index 097302e..31dc7b7 100644 --- a/python-beautifulsoup4.spec +++ b/python-beautifulsoup4.spec @@ -3,8 +3,8 @@ %endif Name: python-beautifulsoup4 -Version: 4.9.3 -Release: 4%{?dist} +Version: 4.10.0 +Release: 1%{?dist} Summary: HTML/XML parser for quick-turnaround applications like screen-scraping License: MIT URL: http://www.crummy.com/software/BeautifulSoup/ @@ -102,6 +102,9 @@ pushd %{py3dir} %{python3_sitelib}/bs4 %changelog +* Thu Sep 09 2021 Terje Rosten - 4.10.0-1 +- 4.10.0 + * Fri Jul 23 2021 Fedora Release Engineering - 4.9.3-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild diff --git a/sources b/sources index b06c3f1..1809527 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (beautifulsoup4-4.9.3.tar.gz) = e3cb6258bd7c51f12128fa8ee5948fb3566163ae233fac2dda21bab7772ab8dbb384d920b0ea138ef9921307b48f89cee3a9bf6111dfc8903d917ee7af365f34 +SHA512 (beautifulsoup4-4.10.0.tar.gz) = 92be99ed0fd479b86519395143516e28f7b80f54a8251223d6e7b88dc98f8dfca9585079f5f1d89bfe68f577de3dff433711642486303203f46bc76754959a18 From aa4bafadd663a362c8d15ab5aae889032eda6c0d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 21 Jan 2022 10:47:12 +0000 Subject: [PATCH 69/74] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- python-beautifulsoup4.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-beautifulsoup4.spec b/python-beautifulsoup4.spec index 31dc7b7..0084bad 100644 --- a/python-beautifulsoup4.spec +++ b/python-beautifulsoup4.spec @@ -4,7 +4,7 @@ Name: python-beautifulsoup4 Version: 4.10.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: HTML/XML parser for quick-turnaround applications like screen-scraping License: MIT URL: http://www.crummy.com/software/BeautifulSoup/ @@ -102,6 +102,9 @@ pushd %{py3dir} %{python3_sitelib}/bs4 %changelog +* Fri Jan 21 2022 Fedora Release Engineering - 4.10.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Thu Sep 09 2021 Terje Rosten - 4.10.0-1 - 4.10.0 From ee9be21d72bbb11e1c84b3b257854142b287679c Mon Sep 17 00:00:00 2001 From: Steve Traylen Date: Tue, 8 Feb 2022 19:59:07 +0000 Subject: [PATCH 70/74] Add bcond flags to disable optional cirucular deps New bcond flag to disable/enable soupsieve dependency New bcond flag to disable/enable testing Test module loading in check section --- python-beautifulsoup4.spec | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/python-beautifulsoup4.spec b/python-beautifulsoup4.spec index 0084bad..c618fa8 100644 --- a/python-beautifulsoup4.spec +++ b/python-beautifulsoup4.spec @@ -1,10 +1,14 @@ +# Ciruclar dependency with soupsieve which must be disabled at times +%bcond_without soupsieve +%bcond_without tests + %if 0%{?fedora} < 32 && 0%{?rhel} < 8 %global py2 1 %endif Name: python-beautifulsoup4 Version: 4.10.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: HTML/XML parser for quick-turnaround applications like screen-scraping License: MIT URL: http://www.crummy.com/software/BeautifulSoup/ @@ -13,18 +17,26 @@ BuildArch: noarch %if 0%{?py2} BuildRequires: python2-devel >= 2.7 # html5lib BR just for test coverage +%if %{with tests} BuildRequires: python2-html5lib +%endif BuildRequires: python2-setuptools +%if %{with soupsieve} BuildRequires: python2-soupsieve +%endif BuildRequires: python2-lxml BuildRequires: /usr/bin/2to3 BuildRequires: python2-tools %endif # html5lib BR just for test coverage +%if %{with tests} BuildRequires: python3-html5lib +%endif BuildRequires: python3-devel BuildRequires: python3-setuptools +%if %{with soupsieve} BuildRequires: python3-soupsieve +%endif BuildRequires: python3-lxml %global _description %{expand: @@ -52,7 +64,9 @@ minutes with Beautiful Soup.} %package -n python2-beautifulsoup4 Summary: %summary Requires: python2-lxml +%if %{with soupsieve} Requires: python2-soupsieve +%endif %{?python_provide:%python_provide python2-beautifulsoup4} %description -n python2-beautifulsoup4 %_description @@ -61,7 +75,9 @@ Requires: python2-soupsieve %package -n python3-beautifulsoup4 Summary: %summary Requires: python3-lxml +%if %{with soupsieve} Requires: python3-soupsieve +%endif Obsoletes: python3-BeautifulSoup < 1:3.2.1-2 %{?python_provide:%python_provide python3-beautifulsoup4} @@ -83,9 +99,13 @@ pushd %{py3dir} %{py3_install} %check +%py3_check_import bs4 + +%if %{with tests} %{?py2:%{__python2} -m unittest discover -s bs4 || : } pushd %{py3dir} %{__python3} -m unittest discover -s bs4 || : +%endif %if 0%{?py2} %files -n python2-beautifulsoup4 @@ -102,6 +122,11 @@ pushd %{py3dir} %{python3_sitelib}/bs4 %changelog +* Tue Feb 08 2022 Steve Traylen - 4.10.0-3 +- New bcond flag to disable/enable soupsieve dependency +- New bcond flag to disable/enable testing +- Test module loading in check section + * Fri Jan 21 2022 Fedora Release Engineering - 4.10.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From 136d8d222b3fb3a25242ce1064c6648e5b9259e6 Mon Sep 17 00:00:00 2001 From: Terje Rosten Date: Sun, 13 Feb 2022 10:22:41 +0100 Subject: [PATCH 71/74] Rebuild to get fc36/rawhide split --- python-beautifulsoup4.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-beautifulsoup4.spec b/python-beautifulsoup4.spec index c618fa8..9a5d578 100644 --- a/python-beautifulsoup4.spec +++ b/python-beautifulsoup4.spec @@ -8,7 +8,7 @@ Name: python-beautifulsoup4 Version: 4.10.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: HTML/XML parser for quick-turnaround applications like screen-scraping License: MIT URL: http://www.crummy.com/software/BeautifulSoup/ @@ -122,6 +122,9 @@ pushd %{py3dir} %{python3_sitelib}/bs4 %changelog +* Sun Feb 13 2022 Terje Rosten - 4.10.0-4 +- Rebuild to get fc36/rawhide split + * Tue Feb 08 2022 Steve Traylen - 4.10.0-3 - New bcond flag to disable/enable soupsieve dependency - New bcond flag to disable/enable testing From e1a4e74d0d4357be229c4756710ef237d1cbb9c8 Mon Sep 17 00:00:00 2001 From: Steve Traylen Date: Mon, 14 Feb 2022 15:41:51 +0000 Subject: [PATCH 72/74] Build without soupsieve dependency to break circular dependency --- nosieve.patch | 11 +++++++++++ python-beautifulsoup4.spec | 15 ++++++++++++--- 2 files changed, 23 insertions(+), 3 deletions(-) create mode 100644 nosieve.patch diff --git a/nosieve.patch b/nosieve.patch new file mode 100644 index 0000000..ad2b8d2 --- /dev/null +++ b/nosieve.patch @@ -0,0 +1,11 @@ +diff -uNr beautifulsoup4-4.10.0.ORIG/setup.py beautifulsoup4-4.10.0/setup.py +--- beautifulsoup4-4.10.0.ORIG/setup.py 2022-02-14 15:37:56.703109224 +0000 ++++ beautifulsoup4-4.10.0/setup.py 2022-02-14 15:38:05.522210911 +0000 +@@ -19,7 +19,6 @@ + description="Screen-scraping library", + python_requires='>3.0.0', + install_requires=[ +- "soupsieve >1.2", + ], + long_description=long_description, + long_description_content_type="text/markdown", diff --git a/python-beautifulsoup4.spec b/python-beautifulsoup4.spec index 9a5d578..12beb08 100644 --- a/python-beautifulsoup4.spec +++ b/python-beautifulsoup4.spec @@ -1,6 +1,6 @@ # Ciruclar dependency with soupsieve which must be disabled at times -%bcond_without soupsieve -%bcond_without tests +%bcond_with soupsieve +%bcond_with tests %if 0%{?fedora} < 32 && 0%{?rhel} < 8 %global py2 1 @@ -8,11 +8,12 @@ Name: python-beautifulsoup4 Version: 4.10.0 -Release: 4%{?dist} +Release: 5%{?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 +Patch0: nosieve.patch BuildArch: noarch %if 0%{?py2} BuildRequires: python2-devel >= 2.7 @@ -85,8 +86,13 @@ Obsoletes: python3-BeautifulSoup < 1:3.2.1-2 %prep %setup -q -n beautifulsoup4-%{version} +%if %{without soupsieve} +%patch0 -p1 +%endif + rm -rf %{py3dir} && cp -a . %{py3dir} + %build %{?py2:%{py2_build}} pushd %{py3dir} @@ -122,6 +128,9 @@ pushd %{py3dir} %{python3_sitelib}/bs4 %changelog +* Mon Feb 14 2022 Steve Traylen - 4.10.0-5 +- Build without soupsieve dependency to break circular dependency + * Sun Feb 13 2022 Terje Rosten - 4.10.0-4 - Rebuild to get fc36/rawhide split From bec3902c8ba03b851f81d33fdc7cc66b94f65cbc Mon Sep 17 00:00:00 2001 From: Steve Traylen Date: Mon, 14 Feb 2022 16:18:53 +0000 Subject: [PATCH 73/74] Build with soupsieve dependency to close circular dependency --- python-beautifulsoup4.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/python-beautifulsoup4.spec b/python-beautifulsoup4.spec index 12beb08..cb8c42a 100644 --- a/python-beautifulsoup4.spec +++ b/python-beautifulsoup4.spec @@ -1,5 +1,5 @@ # Ciruclar dependency with soupsieve which must be disabled at times -%bcond_with soupsieve +%bcond_without soupsieve %bcond_with tests %if 0%{?fedora} < 32 && 0%{?rhel} < 8 @@ -8,7 +8,7 @@ Name: python-beautifulsoup4 Version: 4.10.0 -Release: 5%{?dist} +Release: 6%{?dist} Summary: HTML/XML parser for quick-turnaround applications like screen-scraping License: MIT URL: http://www.crummy.com/software/BeautifulSoup/ @@ -128,6 +128,9 @@ pushd %{py3dir} %{python3_sitelib}/bs4 %changelog +* Mon Feb 14 2022 Steve Traylen - 4.10.0-6 +- Build with soupsieve dependency to close circular dependency + * Mon Feb 14 2022 Steve Traylen - 4.10.0-5 - Build without soupsieve dependency to break circular dependency From 6ac43f5037263ed4d739811c9655bd2890fa1a5c Mon Sep 17 00:00:00 2001 From: MSVSphere Packaging Team Date: Mon, 30 Oct 2023 23:49:11 +0300 Subject: [PATCH 74/74] Remove unnecessary files --- sources | 1 - 1 file changed, 1 deletion(-) delete mode 100644 sources diff --git a/sources b/sources deleted file mode 100644 index 1809527..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -SHA512 (beautifulsoup4-4.10.0.tar.gz) = 92be99ed0fd479b86519395143516e28f7b80f54a8251223d6e7b88dc98f8dfca9585079f5f1d89bfe68f577de3dff433711642486303203f46bc76754959a18