[python-BeautifulSoup] Beautiful Soup 4 has been moved to package python-beautifulsoup4

[terjeros]

commit 30fb7aa03d1ee619a893eea7110355aa9a57d47f
Author: Terje Røsten <terje.rosten at ntnu.no>
Date:   Tue Jul 31 18:47:45 2012 +0200

    Beautiful Soup 4 has been moved to package python-beautifulsoup4

 .gitignore                |    2 -
 python-BeautifulSoup.spec |   77 ++------------------------------------------
 sources                   |    1 -
 3 files changed, 4 insertions(+), 76 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index f65361d..baf6d01 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,3 @@
 BeautifulSoup-3.0.8.1.tar.gz
 /BeautifulSoup-3.2.0.tar.gz
-/beautifulsoup4-4.0.0b3.tar.gz
-/beautifulsoup4-4.0.0b8.tar.gz
 /BeautifulSoup-3.2.1.tar.gz
diff --git a/python-BeautifulSoup.spec b/python-BeautifulSoup.spec
index 174ee3b..1476a7f 100644
--- a/python-BeautifulSoup.spec
+++ b/python-BeautifulSoup.spec
@@ -1,35 +1,17 @@
-#
-# Note: bs3 for py2 and bs4 for py3. Will soon switch to bs4 for py2 too.
-# 
-%global with_python3 1
 %global oname   BeautifulSoup
-%global bs4     4.0.0b8
 
 Name:           python-BeautifulSoup
 Epoch:          1
 Version:        3.2.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        HTML/XML parser for quick-turnaround applications like screen-scraping
-
 Group:          Development/Languages
 License:        BSD
 URL:            http://www.crummy.com/software/BeautifulSoup/
 Source0:        http://www.crummy.com/software/BeautifulSoup/download/3.x/BeautifulSoup-%{version}.tar.gz
-Source1:        http://www.crummy.com/software/BeautifulSoup/download/4.x/beautifulsoup4-%{bs4}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
 BuildArch:      noarch
 BuildRequires:  python-devel
-%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
@@ -49,73 +31,26 @@ 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-%{oname}
-Summary:        Monitor filesystem events with Python under Linux
-Group:          Development/Languages
-
-%description -n python3-%{oname}
-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 %{bs4}.
-
-%endif # if with_python3
-
 %prep
 %setup -q -n %{oname}-%{version}
-%setup -q -T -D -a 1 -n %{oname}-%{version}
 
 %build
 %{__python} setup.py build
 %{__python} -c 'import %{oname} as bs; print bs.__doc__' > COPYING
 touch -r %{oname}.py COPYING
 
-%if 0%{?with_python3}
-pushd beautifulsoup4-%{bs4}
-2to3 --write --nobackups .
-%{__python3} setup.py build
-%endif
-
 %install
 rm -rf %{buildroot}
 %{__python} setup.py install -O1 --skip-build --root %{buildroot}
-
 #Files installed by error
 rm -rf %{buildroot}%{_bindir}
 
-%if 0%{?with_python3}
-pushd beautifulsoup4-%{bs4}
-%{__python3} setup.py install -O1 --skip-build --root %{buildroot}
-%{__rm} -f %{buildroot}%{__prefix}/*.txt
-%endif
-
 %clean
 rm -rf %{buildroot}
 
 %check
 %{__python} BeautifulSoupTests.py
 
-%if 0%{?with_python3}
-pushd beautifulsoup4-%{bs4}
-%{__python3} -m unittest discover -s bs4 || :
-%endif
-
 %files
 %defattr(-, root, root, -)
 %doc COPYING
@@ -125,14 +60,10 @@ pushd beautifulsoup4-%{bs4}
 %{python_sitelib}/%{oname}-%{version}-py*.egg-info
 %endif
 
-%if 0%{?with_python3}
-%files -n python3-%{oname}
-%doc beautifulsoup4-%{bs4}/*.txt
-%{python3_sitelib}/beautifulsoup4-%{bs4}*.egg-info
-%{python3_sitelib}/bs4
-%endif
-
 %changelog
+* Tue Jul 31 2012 Terje Rosten <terje.rosten at ntnu.no> - 1:3.2.1-3
+- Beautiful Soup 4 has been moved to package python-beautifulsoup4
+
 * Sat Jul 21 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:3.2.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 
diff --git a/sources b/sources
index 6bd4bd3..2908b43 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-80843e51cf2c49d30ec2c5fc0b6d303f  beautifulsoup4-4.0.0b8.tar.gz
 5ad1a8550a19bfc945baac23eb8293ed  BeautifulSoup-3.2.1.tar.gz