[python-beaker] Update to 1.5.4 Fix for python3 module and anydbm Tried enabling unittests on python3 -- still no jo

[Toshio くらとみ]

commit ae6145ff8d3eedd73d60d411abf05cd716a0f3db
Author: Toshio Kuratomi <toshio at fedoraproject.org>
Date:   Wed Sep 7 14:01:53 2011 -0700

    Update to 1.5.4
    Fix for python3 module and anydbm
    Tried enabling unittests on python3 -- still no joy

 .gitignore         |    1 +
 python-beaker.spec |   38 +++++++++++++++++++++++++++++---------
 sources            |    2 +-
 3 files changed, 31 insertions(+), 10 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b22e668..3c7cd12 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 Beaker-1.5.3.tar.gz
+/Beaker-1.5.4.tar.gz
diff --git a/python-beaker.spec b/python-beaker.spec
index 7b565d6..7cfe365 100644
--- a/python-beaker.spec
+++ b/python-beaker.spec
@@ -1,12 +1,16 @@
-%if 0%{?fedora} > 12 || 0%{?rhel} > 6
+%if 0%{?fedora} || 0%{?rhel} > 6
 %global with_python3 1
 %else
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 %endif
 
+%if 0%{?fedora} <= 16
+%{!?python3_version: %global python3_version %(%{__python3} -c 'import sys ; sys.stdout.write("%s.%s" % sys.version_info[:2])')}
+%endif
+
 Name: python-beaker
-Version: 1.5.3
-Release: 9%{?dist}
+Version: 1.5.4
+Release: 1%{?dist}
 Summary: WSGI middleware layer to provide sessions
 
 Group: Development/Languages
@@ -15,15 +19,14 @@ URL: http://beaker.groovie.org/
 Source0: http://pypi.python.org/packages/source/B/Beaker/Beaker-%{version}.tar.gz
 Patch0: beaker-use-system-paste.patch
 Patch1: beaker-disable-badtest.patch
+Patch2: beaker-anydbm.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
-%if 0%{?fedora} > 12 || 0%{?rhel}
+BuildRequires: python2-devel
 BuildRequires: python-setuptools
-%else
-BuildRequires: python-setuptools-devel
-%endif
 # Needed for the test suite
-BuildRequires: python-nose python python-webtest
+BuildRequires: python-nose
+BuildRequires: python-webtest
 Requires: python-paste
 %if 0%{?fedora}
 Requires: pycryptopp
@@ -32,9 +35,14 @@ Requires: python-crypto
 %endif
 
 %if 0%{?with_python3}
+BuildRequires: /usr/bin/2to3
 BuildRequires: python3-devel
 BuildRequires: python3-setuptools
-BuildRequires: /usr/bin/2to3
+# Needed for complete test suite
+#BuildRequires: python3-webtest
+%if 0%{?fedora} > 14
+BuildRequires: python3-nose
+%endif
 %endif # if with_python3
 
 %description
@@ -69,6 +77,7 @@ manage Session objects and signed cookies.
 %setup -q -n Beaker-%{version}
 %patch0 -p1 -b .system
 %patch1 -p1 -b .badtest
+%patch2 -p1 -b .anydbm
 
 %if 0%{?with_python3}
 rm -rf %{py3dir}
@@ -100,6 +109,12 @@ popd
 %check
 PYTHONPATH=$(pwd) nosetests
 
+#%%if 0%{?with_python3} && 0%{?fedora} > 14
+#pushd %{py3dir}
+#PYTHONPATH=$(pwd) nosetests-%{python3_version}
+#popd
+#%%endif
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -119,6 +134,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Sep 6 2011 Toshio Kuratomi <toshio at fedoraproject.org> - 1.5.4-1
+- Update to 1.5.4
+- Fix for python3 module and anydbm
+- Tried enabling unittests on python3 -- still no joy
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.5.3-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
diff --git a/sources b/sources
index 03c7b19..e46079a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b465f1919dbbed4917febc91318c8e0f  Beaker-1.5.3.tar.gz
+de84e7511119dc0b8eb4ac177d3e2512  Beaker-1.5.4.tar.gz