rpms/python-docs/devel python-2.6-import_error.patch, NONE, 1.1 python-docs.spec, 1.20, 1.21

[Roman Rakus]

Author: rrakus

Update of /cvs/extras/rpms/python-docs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20983

Modified Files:
	python-docs.spec 
Added Files:
	python-2.6-import_error.patch 
Log Message:
Fix import error (#511647)

python-2.6-import_error.patch:
 pyspecific.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE python-2.6-import_error.patch ---
diff -up Python-2.6/Doc/tools/sphinxext/pyspecific.py.import_error Python-2.6/Doc/tools/sphinxext/pyspecific.py
--- Python-2.6/Doc/tools/sphinxext/pyspecific.py.import_error	2009-07-22 17:31:20.000000000 +0200
+++ Python-2.6/Doc/tools/sphinxext/pyspecific.py	2009-07-22 17:31:41.000000000 +0200
@@ -48,7 +48,7 @@ from pprint import pformat
 from docutils.io import StringOutput
 from docutils.utils import new_document
 from sphinx.builder import Builder
-from sphinx.textwriter import TextWriter
+from sphinx.writers.text import TextWriter
 
 class PydocTopicsBuilder(Builder):
     name = 'pydoc-topics'


Index: python-docs.spec
===================================================================
RCS file: /cvs/extras/rpms/python-docs/devel/python-docs.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- python-docs.spec	6 May 2009 12:10:21 -0000	1.20
+++ python-docs.spec	22 Jul 2009 16:01:10 -0000	1.21
@@ -13,7 +13,7 @@
 Summary: Documentation for the Python programming language
 Name: %{python}-docs
 Version: %{pybasever}
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: Python
 Group: Documentation
 Source: http://www.python.org/ftp/python/%{version}/Python-%{version}.tar.bz2
@@ -22,6 +22,10 @@ BuildArch: noarch
 Patch4: python-2.6-nowhatsnew.patch
 Patch18: python-2.6-extdocmodules.patch
 
+# False import makes python-docs to be unbuildable (#511647)
+# Is fixed in python-2.6.2, but we use python-2.6 so far
+Patch19: python-2.6-import_error.patch
+
 Requires: %{python} = %{version}
 %if %{main_python}
 Obsoletes: python2-docs
@@ -47,6 +51,7 @@ for the Python language.
 
 %patch4 -p1 -b .nowhatsnew
 %patch18 -p1 -b .extdocmodules
+%patch19 -p1 -b .import_error
 
 %build
 make -C Doc html
@@ -66,6 +71,9 @@ rm -fr $RPM_BUILD_ROOT
 %doc Misc/HISTORY Doc/build/html
 
 %changelog
+* Wed Jul 22 2009 Roman Rakus <rrakus at redhat.com> - 2.6-4
+- Fix import error (#511647)
+
 * Wed May 06 2009 Roman Rakus <rrakus at redhat.com> - 2.6-3
 - Spec file cleanup (#226341)