[python-repoze-who] Update to 2.1, add a python3 subpackage, and remove the setuptools patch

[Luke Macken]

commit 061a1a5b4fd96c88b890312af5142e2c280293f0
Author: Luke Macken <lmacken at redhat.com>
Date:   Fri Apr 5 16:34:00 2013 -0400

    Update to 2.1, add a python3 subpackage, and remove the setuptools patch

 .gitignore                    |    1 +
 python-repoze-who-setup.patch |   13 -----
 python-repoze-who.spec        |   99 ++++++++++++++++++++++++++++++++++-------
 sources                       |    2 +-
 4 files changed, 84 insertions(+), 31 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 726dfa9..84a67fd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 repoze.who-1.0.18.tar.gz
+/repoze.who-2.1.tar.gz
diff --git a/python-repoze-who.spec b/python-repoze-who.spec
index c38d126..5b15868 100644
--- a/python-repoze-who.spec
+++ b/python-repoze-who.spec
@@ -1,24 +1,43 @@
-%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%if 0%{?fedora} > 12
+%global with_python3 1
+%endif
+
+%global modname repoze.who
 
 Name:           python-repoze-who
-Version:        1.0.18
-Release:        8%{?dist}
+Version:        2.1
+Release:        1%{?dist}
 Summary:        An identification and authentication framework for WSGI
 
 Group:          Development/Languages
 License:        BSD
-URL:            http://pypi.python.org/pypi/repoze.who
-Source0:        http://pypi.python.org/packages/source/r/repoze.who/repoze.who-%{version}.tar.gz
-Patch0:         %{name}-setup.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+URL:            http://pypi.python.org/pypi/%{modname}
+Source0:        http://pypi.python.org/packages/source/r/%{modname}/%{modname}-%{version}.tar.gz
 BuildArch:      noarch
 
-BuildRequires:  python-devel python-setuptools-devel
-BuildRequires:  python-nose python-paste python-zope-interface
+BuildRequires:  python2-devel
+BuildRequires:  python-setuptools
+BuildRequires:  python-nose
+BuildRequires:  python-zope-interface
 BuildRequires:  python-coverage
-Requires:       python-paste
+BuildRequires:  python-webob
+
 Requires:       python-setuptools
 Requires:       python-zope-interface
+Requires:       python-webob
+
+%if 0%{?with_python3}
+BuildRequires:      python3-devel
+BuildRequires:      python3-nose
+BuildRequires:      python3-coverage
+BuildRequires:      python3-zope-interface
+BuildRequires:      python3-webob
+
+Requires:           python3-setuptools
+Requires:           python3-zope-interface
+Requires:           python3-webob
+%endif
+
 
 %description
 repoze.who is an identification and authentication framework for arbitrary WSGI
@@ -31,33 +50,79 @@ user can or cannot perform the operation implied by the request).  This is
 considered to be the domain of the WSGI application.
 
 
+%if 0%{?with_python3}
+%package -n python3-repoze-who
+Summary:        An identification and authentication framework for WSGI
+Group:          Development/Languages
+
+%description -n python3-repoze-who
+repoze.who is an identification and authentication framework for arbitrary WSGI
+applications.  It acts as WSGI middleware.
+
+repoze.who is inspired by Zope 2's Pluggable Authentication Service (PAS) (but
+repoze.who is not dependent on Zope in any way; it is useful for any WSGI
+application).  It provides no facility for authorization (ensuring whether a
+user can or cannot perform the operation implied by the request).  This is
+considered to be the domain of the WSGI application.
+%endif
+
 %prep
-%setup -q -n repoze.who-%{version}
-%patch0 -p1 -b .setup
+%setup -q -n %{modname}-%{version}
 
+# Remove bundled egg-info in case it exists
+rm -rf %{modname}.egg-info
+
+%if 0%{?with_python3}
+rm -rf %{py3dir}
+cp -a . %{py3dir}
+%endif
 
 %build
 %{__python} setup.py build
+%if 0%{?with_python3}
+pushd %{py3dir}
+%{__python3} setup.py build
+popd
+%endif
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
-%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
+%{__python} setup.py install -O1 --skip-build --root=%{buildroot}
+%if 0%{?with_python3}
+pushd %{py3dir}
+%{__python3} setup.py install -O1 --skip-build --root=%{buildroot}
+popd
+%endif
 
 %check
-PYTHONPATH=$(pwd) nosetests
+%{__python} setup.py test
+%if 0%{?with_python3}
+%{__python3} setup.py test
+%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 
 %files
-%defattr(-,root,root,-)
 %doc README.txt COPYRIGHT.txt LICENSE.txt
-%{python_sitelib}/*
+%{python_sitelib}/repoze/who/
+%{python_sitelib}/%{modname}-*
+
+%if 0%{?with_python3}
+%files -n python3-repoze-who
+%doc README.txt COPYRIGHT.txt LICENSE.txt
+%{python3_sitelib}/repoze/who/
+%{python3_sitelib}/%{modname}-*
+%endif
 
 
 %changelog
+* Thu Apr 04 2013 Luke Macken <lmacken at redhat.com> - 2.1-1
+- Update to 2.1
+- Add a python3 subpackage
+- Remove setuptools patch
+
 * Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.18-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 
diff --git a/sources b/sources
index 1fd27a2..b041e1f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0e8a94e5f5f92785b9a01c561588479b  repoze.who-1.0.18.tar.gz
+186bcb1594edb2418f5cef5ba660a5b1  repoze.who-2.1.tar.gz