[python-sphinx10/el6] Update to a newer upstream release needed for building many dependent packages.

[Toshio くらとみ]

commit 1e9efd69635bd2a372e6cc053ecb0f8e63b74945
Author: Toshio Kuratomi <toshio at fedoraproject.org>
Date:   Mon Nov 28 16:49:54 2011 -0800

    Update to a newer upstream release needed for building many dependent
    packages.

 .gitignore                    |    1 +
 Sphinx-1.0.4-localedirs.patch |   32 ++++++++++++++++++--------------
 python-sphinx10.spec          |   12 ++++++++++--
 sources                       |    2 +-
 4 files changed, 30 insertions(+), 17 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 4f1fd22..5a7e282 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /Sphinx-1.0.4.tar.gz
+/Sphinx-1.0.8.tar.gz
diff --git a/Sphinx-1.0.4-localedirs.patch b/Sphinx-1.0.4-localedirs.patch
index e96758c..73e9333 100644
--- a/Sphinx-1.0.4-localedirs.patch
+++ b/Sphinx-1.0.4-localedirs.patch
@@ -1,6 +1,8 @@
---- Sphinx-1.0.4/sphinx/locale/__init__.py.localedirs	2010-07-24 12:07:36.000000000 +0200
-+++ Sphinx-1.0.4/sphinx/locale/__init__.py	2010-11-02 09:17:40.113760722 +0100
-@@ -187,7 +187,7 @@
+Index: Sphinx-1.0.8/sphinx/locale/__init__.py
+===================================================================
+--- Sphinx-1.0.8.orig/sphinx/locale/__init__.py
++++ Sphinx-1.0.8/sphinx/locale/__init__.py
+@@ -187,7 +187,7 @@ def init(locale_dirs, language):
      has_translation = True
      for dir_ in locale_dirs:
          try:
@@ -9,14 +11,16 @@
                      languages=[language])
              if translator is None:
                  translator = trans
---- Sphinx-1.0.4/sphinx/builders/html.py.localedirs	2010-09-10 09:06:33.000000000 +0200
-+++ Sphinx-1.0.4/sphinx/builders/html.py	2010-11-02 09:17:22.481915903 +0100
-@@ -102,7 +102,7 @@
-         if self.config.language is not None:
-             jsfile_list = [path.join(package_dir, 'locale',
-                 self.config.language, 'LC_MESSAGES', 'sphinx.js'),
--                path.join(sys.prefix, 'share/sphinx/locale',
-+                path.join(sys.prefix, 'share/sphinx-1.0/locale',
-                     self.config.language, 'sphinx.js')]
- 
-             for jsfile in jsfile_list:
+Index: Sphinx-1.0.8/sphinx/builders/html.py
+===================================================================
+--- Sphinx-1.0.8.orig/sphinx/builders/html.py
++++ Sphinx-1.0.8/sphinx/builders/html.py
+@@ -108,7 +108,7 @@ class StandaloneHTMLBuilder(Builder):
+     def _get_translations_js(self):
+         candidates = [path.join(package_dir, 'locale', self.config.language,
+                                 'LC_MESSAGES', 'sphinx.js'),
+-                      path.join(sys.prefix, 'share/sphinx/locale',
++                      path.join(sys.prefix, 'share/sphinx-1.0/locale',
+                                 self.config.language, 'sphinx.js')] + \
+                      [path.join(dir, self.config.language,
+                                 'LC_MESSAGES', 'sphinx.js')
diff --git a/python-sphinx10.spec b/python-sphinx10.spec
index 49b4807..7d7489d 100644
--- a/python-sphinx10.spec
+++ b/python-sphinx10.spec
@@ -5,8 +5,8 @@
 %global upstream_name Sphinx
 
 Name:       python-sphinx10
-Version:    1.0.4
-Release:    4%{?dist}
+Version:    1.0.8
+Release:    1%{?dist}
 Summary:    Python documentation generator
 
 Group:      Development/Tools
@@ -20,6 +20,9 @@ URL:        http://sphinx.pocoo.org/
 Source0:    http://pypi.python.org/packages/source/S/%{upstream_name}/%{upstream_name}-%{version}.tar.gz
 Source1:    README.Fedora
 Patch0:     Sphinx-1.0.4-localedirs.patch
+# Backport of fixes to unittests for old docutils
+# https://bitbucket.org/birkenfeld/sphinx/changeset/78b462ee065d
+Patch1:     Sphinx-1.0.8-old-docutils.patch
 
 BuildArch:     noarch
 %if 0%{?rhel}
@@ -91,6 +94,7 @@ This package contains documentation in reST and HTML formats.
 %prep
 %setup -q -n %{upstream_name}-%{version}%{?prerel}
 %patch0 -p1 -b .localedirs
+%patch1 -p1 -b .olddocutils
 cp -p %{SOURCE1} .
 sed '1d' -i sphinx/pycode/pgen2/token.py
 
@@ -194,6 +198,10 @@ make test
 
 
 %changelog
+* Mon Nov 28 2011 Toshio Kuratomi <toshio at fedoraproject.org> - 1.0.8-1
+- Update to a newer upstream release needed for building many dependent
+  packages.
+
 * Sun Mar 13 2011 Michel Salim <salimma at fedoraproject.org> - 1.0.4-4
 - Build fix for EL-6: Use el5 build settings
 
diff --git a/sources b/sources
index 88e98e3..999fa26 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d4067e42e75525ecf108ece471ce97bb  Sphinx-1.0.4.tar.gz
+6f9aace3f7e523ce55514eafa2764c6f  Sphinx-1.0.8.tar.gz