- Minor cleanups

- Upgrade to 3.2.0

.cvsignore

@@ -1 +1 @@
-decorator-3.1.2.tar.gz
+decorator-3.2.0.tar.gz

python-decorator.spec

@@ -1,21 +1,28 @@
 # sitelib for noarch packages, sitearch for others (remove the unneeded one)
-%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%if 0%{?fedora} > 12 || 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
 
 Name:           python-decorator
-Version:        3.1.2
-Release:        2%{?dist}
+Version:        3.2.0
+Release:        1%{?dist}
 Summary:        Module to simplify usage of decorators
 
 Group:          Development/Languages
 License:        BSD
 URL:            http://www.phyast.pitt.edu/~micheles/python/documentation.html
 Source0:        http://pypi.python.org/packages/source/d/decorator/decorator-%{version}.tar.gz
-Patch0:         decorator-3.0.1-doctest.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
-BuildRequires:  python-devel
+BuildRequires:  python2-devel
+%if 0%{?fedora} && 0%{?fedora} < 13
 BuildRequires:  python-setuptools-devel
+%else
+BuildRequires:  python-setuptools
+%endif
 BuildRequires:  python-nose
 
 %description
@@ -26,7 +33,7 @@ etc.  The core of this module is a decorator factory called decorator.
 
 %prep
 %setup -q -n decorator-%{version}
-%patch0 -p1 -b .doctest
+
 chmod a-x *.txt *.py
 %{__sed} -i 's/\r//' README.txt
 
@@ -43,7 +50,7 @@ rm -rf $RPM_BUILD_ROOT
 %check
 # Until we get the python-multiprocessing backport packaged
 %if 0%{?fedora} >= 11 || 0%{?rhel} > 5
-nosetests --with-doctest
+nosetests --with-doctest -e documentation3
 %endif
 
 %files
@@ -52,6 +59,10 @@ nosetests --with-doctest
 %{python_sitelib}/*
 
 %changelog
+* Wed Jun 30 2010 Toshio Kuratomi <toshio@fedoraproject.org> - 3.2.0-1
+- Minor cleanups
+- Upgrade to 3.2.0
+
 * Tue Oct 6 2009 Toshio Kuratomi <toshio@fedoraproject.org> - 3.1.2-2
 - Really include the new source tarball
 

sources

@@ -1 +1 @@
-9ebbe8d0f0c42495561b8e79fd0d8e56  decorator-3.1.2.tar.gz
+6208cd51365083c168ab3a04426a646b  decorator-3.2.0.tar.gz