Include patch for F-11 branch

.cvsignore

@@ -1 +1 @@
-Sphinx-0.5.tar.gz
+Sphinx-0.6.2.tar.gz

branch

@@ -0,0 +1 @@
+F-11

python-sphinx-setuptools.patch

@@ -0,0 +1,9 @@
+--- setup.py.orig	2009-06-05 07:42:36.000000000 -0400
++++ setup.py	2009-06-05 07:42:40.000000000 -0400
+@@ -1,6 +1,4 @@
+ # -*- coding: utf-8 -*-
+-import ez_setup
+-ez_setup.use_setuptools()
+ 
+ import os
+ import sys

python-sphinx.spec

@@ -4,7 +4,7 @@
 %define upstream_name Sphinx
 
 Name:           python-sphinx
-Version:        0.5
+Version:        0.6.2
 Release:        1%{?dist}
 Summary:        Python documentation generator
 
@@ -12,11 +12,12 @@ Group:          Development/Tools
 License:        BSD
 URL:            http://sphinx.pocoo.org/
 Source0:        http://pypi.python.org/packages/source/S/%{upstream_name}/%{upstream_name}-%{version}.tar.gz
+Patch0:         %{name}-setuptools.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
-BuildRequires:  python-devel python-docutils python-jinja python-setuptools
-Requires:       python-docutils python-jinja python-pygments
+BuildRequires:  python-devel python-docutils python-jinja2 python-setuptools
+Requires:       python-docutils python-jinja2 python-pygments
 
 
 %description
@@ -68,6 +69,7 @@ This package contains documentation in rST and HTML formats
 
 %prep
 %setup -q -n %{upstream_name}-%{version}
+%patch0 -p0 -b .setuptools
 
 
 %build
@@ -107,6 +109,24 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Aug 17 2009 Toshio Kuratomi <toshio@fedoraproject.org> - 0.6.2-1
+- Update to 0.6.2 -- upstream bugfix requested inside bz#512438
+
+* Fri Jun 05 2009 Luke Macken <lmacken@redhat.com> - 0.6.1-2
+- Add a patch to use our own setuptools package
+
+* Fri Apr 17 2009 Michel Salim <salimma@fedoraproject.org> - 0.6.1-1
+- Update to 0.6.1
+
+* Thu Feb 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.5.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Fri Jan  2 2009 Michel Salim <salimma@fedoraproject.org> - 0.5.1-1
+- Update to 0.5.1
+
+* Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm@gmail.com> - 0.5-2
+- Rebuild for Python 2.6
+
 * Mon Nov 24 2008 Michel Salim <salimma@fedoraproject.org> - 0.5-1
 - Update to 0.5
 

sources

@@ -1 +1 @@
-55a33cc13b5096c8763cd4a933b30ddc  Sphinx-0.5.tar.gz
+c8f79e171addc73342cc2e775dc78880  Sphinx-0.6.2.tar.gz