Merge branch 'master' into f13

Conflicts:
	.gitignore

python-docutils.spec

@@ -6,7 +6,7 @@
 %global srcname docutils
 
 Name:           python-%{srcname}
-Version:        0.6
+Version:        0.7
 Release:        1%{?dist}
 Summary:        System for processing plaintext documentation
 
@@ -18,8 +18,8 @@ Source0:        http://downloads.sourceforge.net/docutils/%{srcname}-%{version}.
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:       noarch
 
-BuildRequires:  python-devel
+BuildRequires:  python2-devel
-BuildRequires: python-setuptools-devel
+BuildRequires: python-setuptools
 
 Requires: python-imaging
 Provides: docutils = %{version}-%{release}
@@ -79,6 +79,12 @@ rm -rf %{buildroot}
 %{python_sitelib}/*egg-info
 
 %changelog
+* Sun Aug 1 2010 Toshio Kuratomi <toshio@fedoraproject.org> - 0.7-1
+- Update for 0.7 release
+
+* Thu Jul 22 2010 David Malcolm <dmalcolm@redhat.com> - 0.6-2
+- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild
+
 * Tue Jan 19 2010 Toshio Kuratomi <toshio@fedoraproject.org> - 0.6-1
 - Update for 0.6 release.
 - Switch from setuptools installed egg-info to distutils egg-info.  Note that

sources

@@ -1 +1 @@
-5c615479a965bc773892f585e0e08119  docutils-0.6.tar.gz
+9aec716baf15d06b5aa57cf8d5591c15  docutils-0.7.tar.gz